- ';
+ foreach($r as $rr) {
+ $dirname = dirname($rr['sid']);
+ $fname = basename($rr['sid']);
+ $fname = substr($fname,0,strrpos($fname,'.'));
+ $path = trim(substr($dirname,4),'/');
+
+ $o .= '
- ' . ucwords(str_replace('_',' ',notags($fname))) . '
' . + str_replace('$Projectname',\Zotlabs\Lib\System::get_platform_name(),substr($rr['text'],0,200)) . '... ';
+
+ }
+ $o .= '
' . t('Common connections') . '
'; + + $t = count_common_friends(\App::$profile['profile_uid'],$observer_hash); + + if(! $t) { + notice( t('No connections in common.') . EOL); + return $o; + } + + $r = common_friends(\App::$profile['profile_uid'],$observer_hash); + + if($r) { + + $tpl = get_markup_template('common_friends.tpl'); + + foreach($r as $rr) { + $o .= replace_macros($tpl,array( + '$url' => $rr['xchan_url'], + '$name' => $rr['xchan_name'], + '$photo' => $rr['xchan_photo_m'], + '$tags' => '' + )); + } + + $o .= cleardiv(); + } + + return $o; + } + +} diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php new file mode 100644 index 000000000..962c05cce --- /dev/null +++ b/Zotlabs/Module/Connect.php @@ -0,0 +1,131 @@ + 1) + $which = argv(1); + else { + notice( t('Requested profile is not available.') . EOL ); + \App::$error = 404; + return; + } + + $r = q("select * from channel where channel_address = '%s' limit 1", + dbesc($which) + ); + + if($r) + \App::$data['channel'] = $r[0]; + + profile_load($which,''); + } + + function post() { + + if(! array_key_exists('channel', \App::$data)) + return; + + $edit = ((local_channel() && (local_channel() == \App::$data['channel']['channel_id'])) ? true : false); + + if($edit) { + $has_premium = ((\App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0); + $premium = (($_POST['premium']) ? intval($_POST['premium']) : 0); + $text = escape_tags($_POST['text']); + + if($has_premium != $premium) { + $r = q("update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d", + db_getfunc('^'), + intval(PAGE_PREMIUM), + intval(local_channel()) + ); + + \Zotlabs\Daemon\Master::Summon(array('Notifier','refresh_all',\App::$data['channel']['channel_id'])); + } + set_pconfig(\App::$data['channel']['channel_id'],'system','selltext',$text); + // reload the page completely to get fresh data + goaway(z_root() . '/' . \App::$query_string); + + } + + $url = ''; + $observer = \App::get_observer(); + if(($observer) && ($_POST['submit'] === t('Continue'))) { + if($observer['xchan_follow']) + $url = sprintf($observer['xchan_follow'],urlencode(\App::$data['channel']['channel_address'] . '@' . \App::get_hostname())); + if(! $url) { + $r = q("select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1", + dbesc($observer['xchan_hash']) + ); + if($r) + $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(\App::$data['channel']['channel_address'] . '@' . \App::get_hostname()); + } + } + if($url) + goaway($url . '&confirm=1'); + else + notice('Unable to connect to your home hub location.'); + + } + + + + function get() { + + $edit = ((local_channel() && (local_channel() == \App::$data['channel']['channel_id'])) ? true : false); + + $text = get_pconfig(\App::$data['channel']['channel_id'],'system','selltext'); + + if($edit) { + + $o = replace_macros(get_markup_template('sellpage_edit.tpl'),array( + '$header' => t('Premium Channel Setup'), + '$address' => \App::$data['channel']['channel_address'], + '$premium' => array('premium', t('Enable premium channel connection restrictions'),((\App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''),''), + '$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'), + '$text' => $text, + '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), + '$lbl2' => t('Potential connections will then see the following text before proceeding:'), + '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'), + '$submit' => t('Submit'), + + + )); + return $o; + } + else { + if(! $text) + $text = t('(No specific instructions have been provided by the channel owner.)'); + + $submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array( + '$continue' => t('Continue'), + '$address' => \App::$data['channel']['channel_address'] + )); + + $o = replace_macros(get_markup_template('sellpage_view.tpl'),array( + '$header' => t('Restricted or Premium Channel'), + '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), + '$text' => prepare_text($text), + + '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'), + '$submit' => $submit, + + )); + + $arr = array('channel' => \App::$data['channel'],'observer' => \App::get_observer(), 'sellpage' => $o, 'submit' => $submit); + call_hooks('connect_premium', $arr); + $o = $arr['sellpage']; + + } + + return $o; + } +} diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php new file mode 100644 index 000000000..a412d16ae --- /dev/null +++ b/Zotlabs/Module/Connections.php @@ -0,0 +1,324 @@ + t('Suggestions'), + 'url' => z_root() . '/suggest', + 'sel' => '', + 'title' => t('Suggest new connections'), + ), + */ + + 'pending' => array( + 'label' => t('New Connections'), + 'url' => z_root() . '/connections/pending', + 'sel' => ($pending) ? 'active' : '', + 'title' => t('Show pending (new) connections'), + ), + + 'all' => array( + 'label' => t('All Connections'), + 'url' => z_root() . '/connections/all', + 'sel' => ($all) ? 'active' : '', + 'title' => t('Show all connections'), + ), + + /* + array( + 'label' => t('Unblocked'), + 'url' => z_root() . '/connections', + 'sel' => (($unblocked) && (! $search) && (! $nets)) ? 'active' : '', + 'title' => t('Only show unblocked connections'), + ), + */ + + 'blocked' => array( + 'label' => t('Blocked'), + 'url' => z_root() . '/connections/blocked', + 'sel' => ($blocked) ? 'active' : '', + 'title' => t('Only show blocked connections'), + ), + + 'ignored' => array( + 'label' => t('Ignored'), + 'url' => z_root() . '/connections/ignored', + 'sel' => ($ignored) ? 'active' : '', + 'title' => t('Only show ignored connections'), + ), + + 'archived' => array( + 'label' => t('Archived'), + 'url' => z_root() . '/connections/archived', + 'sel' => ($archived) ? 'active' : '', + 'title' => t('Only show archived connections'), + ), + + 'hidden' => array( + 'label' => t('Hidden'), + 'url' => z_root() . '/connections/hidden', + 'sel' => ($hidden) ? 'active' : '', + 'title' => t('Only show hidden connections'), + ), + + // array( + // 'label' => t('Unconnected'), + // 'url' => z_root() . '/connections/unconnected', + // 'sel' => ($unconnected) ? 'active' : '', + // 'title' => t('Only show one-way connections'), + // ), + + + ); + + //$tab_tpl = get_markup_template('common_tabs.tpl'); + //$t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); + + $searching = false; + if($search) { + $search_hdr = $search; + $search_txt = dbesc(protect_sprintf(preg_quote($search))); + $searching = true; + } + $sql_extra .= (($searching) ? protect_sprintf(" AND xchan_name like '%$search_txt%' ") : ""); + + if($_REQUEST['gid']) { + $sql_extra .= " and xchan_hash in ( select xchan from group_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) "; + } + + $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash + where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ", + intval(local_channel()) + ); + if($r) { + \App::set_pager_total($r[0]['total']); + $total = $r[0]['total']; + } + + $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash + WHERE abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d OFFSET %d ", + intval(local_channel()), + intval(\App::$pager['itemspage']), + intval(\App::$pager['start']) + ); + + $contacts = array(); + + if(count($r)) { + + foreach($r as $rr) { + if($rr['xchan_url']) { + + $status_str = ''; + $status = array( + ((intval($rr['abook_pending'])) ? t('Pending approval') : ''), + ((intval($rr['abook_archived'])) ? t('Archived') : ''), + ((intval($rr['abook_hidden'])) ? t('Hidden') : ''), + ((intval($rr['abook_ignored'])) ? t('Ignored') : ''), + ((intval($rr['abook_blocked'])) ? t('Blocked') : '') + ); + + foreach($status as $str) { + if(!$str) + continue; + $status_str .= $str; + $status_str .= ', '; + } + $status_str = rtrim($status_str, ', '); + + $contacts[] = array( + 'img_hover' => sprintf( t('%1$s [%2$s]'),$rr['xchan_name'],$rr['xchan_url']), + 'edit_hover' => t('Edit connection'), + 'delete_hover' => t('Delete connection'), + 'id' => $rr['abook_id'], + 'thumb' => $rr['xchan_photo_m'], + 'name' => $rr['xchan_name'], + 'classes' => (intval($rr['abook_archived']) ? 'archived' : ''), + 'link' => z_root() . '/connedit/' . $rr['abook_id'], + 'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop', + 'delete' => t('Delete'), + 'url' => chanlink_url($rr['xchan_url']), + 'webbie_label' => t('Channel address'), + 'webbie' => $rr['xchan_addr'], + 'network_label' => t('Network'), + 'network' => network_to_name($rr['xchan_network']), + 'public_forum' => ((intval($rr['xchan_pubforum'])) ? true : false), + 'status_label' => t('Status'), + 'status' => $status_str, + 'connected_label' => t('Connected'), + 'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c'), + 'approve_hover' => t('Approve connection'), + 'approve' => (($rr['abook_pending']) ? t('Approve') : false), + 'ignore_hover' => t('Ignore connection'), + 'ignore' => ((! $rr['abook_ignored']) ? t('Ignore') : false), + 'recent_label' => t('Recent activity'), + 'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id']) + ); + } + } + } + + + if($_REQUEST['aj']) { + if($contacts) { + $o = replace_macros(get_markup_template('contactsajax.tpl'),array( + '$contacts' => $contacts, + '$edit' => t('Edit'), + )); + } + else { + $o = ''; + } + echo $o; + killme(); + } + else { + $o .= ""; + $o .= replace_macros(get_markup_template('connections.tpl'),array( + '$header' => t('Connections') . (($head) ? ': ' . $head : ''), + '$tabs' => $tabs, + '$total' => $total, + '$search' => $search_hdr, + '$label' => t('Search'), + '$desc' => t('Search your connections'), + '$finding' => (($searching) ? t('Connections search') . ": '" . $search . "'" : ""), + '$submit' => t('Find'), + '$edit' => t('Edit'), + '$cmd' => \App::$cmd, + '$contacts' => $contacts, + '$paginate' => paginate($a), + + )); + } + + if(! $contacts) + $o .= ''; + + return $o; + } + +} diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php new file mode 100644 index 000000000..93ee30999 --- /dev/null +++ b/Zotlabs/Module/Connedit.php @@ -0,0 +1,807 @@ += 2) && intval(argv(1))) { + $r = q("SELECT abook.*, xchan.* + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d and abook_id = %d LIMIT 1", + intval(local_channel()), + intval(argv(1)) + ); + if($r) { + \App::$poi = $r[0]; + } + } + + $channel = \App::get_channel(); + if($channel) + head_set_icon($channel['xchan_photo_s']); + + } + + /* @brief Evaluate posted values and set changes + * + */ + + function post() { + + if(! local_channel()) + return; + + $contact_id = intval(argv(1)); + if(! $contact_id) + return; + + $channel = \App::get_channel(); + + // TODO if configured for hassle-free permissions, we'll post the form with ajax as soon as the + // connection enable is toggled to a special autopost url and set permissions immediately, leaving + // the other form elements alone pending a manual submit of the form. The downside is that there + // will be a window of opportunity when the permissions have been set but before you've had a chance + // to review and possibly restrict them. The upside is we won't have to warn you that your connection + // can't do anything until you save the bloody form. + + $autopost = (((argc() > 2) && (argv(2) === 'auto')) ? true : false); + + $orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", + intval($contact_id), + intval(local_channel()) + ); + + if(! $orig_record) { + notice( t('Could not access contact record.') . EOL); + goaway(z_root() . '/connections'); + return; // NOTREACHED + } + + call_hooks('contact_edit_post', $_POST); + + if(intval($orig_record[0]['abook_self'])) { + $autoperms = intval($_POST['autoperms']); + $is_self = true; + } + else { + $autoperms = null; + $is_self = false; + } + + + $profile_id = $_POST['profile_assign']; + if($profile_id) { + $r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND `uid` = %d LIMIT 1", + dbesc($profile_id), + intval(local_channel()) + ); + if(! count($r)) { + notice( t('Could not locate selected profile.') . EOL); + return; + } + } + + $abook_incl = escape_tags($_POST['abook_incl']); + $abook_excl = escape_tags($_POST['abook_excl']); + + $hidden = intval($_POST['hidden']); + + $priority = intval($_POST['poll']); + if($priority > 5 || $priority < 0) + $priority = 0; + + $closeness = intval($_POST['closeness']); + if($closeness < 0) + $closeness = 99; + + $rating = intval($_POST['rating']); + if($rating < (-10)) + $rating = (-10); + if($rating > 10) + $rating = 10; + + $rating_text = trim(escape_tags($_REQUEST['rating_text'])); + + $all_perms = \Zotlabs\Access\Permissions::Perms(); + + if($all_perms) { + foreach($all_perms as $perm => $desc) { + if(array_key_exists('perms_' . $perm, $_POST)) { + set_abconfig($channel['channel_id'],$orig_record[0]['abook_xchan'],'my_perms',$perm, + intval($_POST['perms_' . $perm])); + if($autoperms) { + set_pconfig($channel['channel_id'],'autoperms',$perm,intval($_POST['perms_' . $perm])); + } + } + else { + set_abconfig($channel['channel_id'],$orig_record[0]['abook_xchan'],'my_perms',$perm,0); + if($autoperms) { + set_pconfig($channel['channel_id'],'autoperms',$perm,0); + } + } + } + } + + if(! is_null($autoperms)) + set_pconfig($channel['channel_id'],'system','autoperms',$autoperms); + + $new_friend = false; + + if(! $is_self) { + + $signed = $orig_record[0]['abook_xchan'] . '.' . $rating . '.' . $rating_text; + + $sig = base64url_encode(rsa_sign($signed,$channel['channel_prvkey'])); + + $z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1", + dbesc($channel['channel_hash']), + dbesc($orig_record[0]['abook_xchan']) + ); + + if($z) { + $record = $z[0]['xlink_id']; + $w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s' + where xlink_id = %d", + intval($rating), + dbesc($rating_text), + dbesc($sig), + dbesc(datetime_convert()), + intval($record) + ); + } + else { + $w = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ", + dbesc($channel['channel_hash']), + dbesc($orig_record[0]['abook_xchan']), + intval($rating), + dbesc($rating_text), + dbesc($sig), + dbesc(datetime_convert()) + ); + $z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1", + dbesc($channel['channel_hash']), + dbesc($orig_record[0]['abook_xchan']) + ); + if($z) + $record = $z[0]['xlink_id']; + } + if($record) { + \Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record)); + } + } + + if(($_REQUEST['pending']) && intval($orig_record[0]['abook_pending'])) { + $new_friend = true; + + // @fixme it won't be common, but when you accept a new connection request + // the permissions will now be that of your permissions role and ignore + // any you may have set manually on the form. We'll probably see a bug if somebody + // tries to set the permissions *and* approve the connection in the same + // request. The workaround is to approve the connection, then go back and + // adjust permissions as desired. + + $abook_my_perms = get_channel_default_perms(local_channel()); + + $role = get_pconfig(local_channel(),'system','permissions_role'); + if($role) { + $x = \Zotlabs\Access\PermissionRoles::role_perms($role); + if($x['perms_connect']) { + $abook_my_perms = $x['perms_connect']; + } + } + + $filled_perms = \Zotlabs\Access\Permissions::FilledPerms($abook_my_perms); + foreach($filled_perms as $k => $v) { + set_abconfig($channel['channel_id'],$orig_record[0]['abook_xchan'],'my_perms',$k,$v); + } + + } + + $abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending']); + + $r = q("UPDATE abook SET abook_profile = '%s', abook_closeness = %d, abook_pending = %d, + abook_incl = '%s', abook_excl = '%s' + where abook_id = %d AND abook_channel = %d", + dbesc($profile_id), + intval($closeness), + intval($abook_pending), + dbesc($abook_incl), + dbesc($abook_excl), + intval($contact_id), + intval(local_channel()) + ); + + if($orig_record[0]['abook_profile'] != $profile_id) { + //Update profile photo permissions + + logger('A new profile was assigned - updating profile photos'); + profile_photo_set_profile_perms(local_channel(),$profile_id); + + } + + if($r) + info( t('Connection updated.') . EOL); + else + notice( t('Failed to update connection record.') . EOL); + + if(! intval(\App::$poi['abook_self'])) { + \Zotlabs\Daemon\Master::Summon( [ + 'Notifier', + (($new_friend) ? 'permission_create' : 'permission_update'), + $contact_id + ]); + } + + if($new_friend) { + $default_group = $channel['channel_default_group']; + if($default_group) { + require_once('include/group.php'); + $g = group_rec_byhash(local_channel(),$default_group); + if($g) + group_add_member(local_channel(),'',\App::$poi['abook_xchan'],$g['id']); + } + + // Check if settings permit ("post new friend activity" is allowed, and + // friends in general or this friend in particular aren't hidden) + // and send out a new friend activity + + $pr = q("select * from profile where uid = %d and is_default = 1 and hide_friends = 0", + intval($channel['channel_id']) + ); + if(($pr) && (! intval($orig_record[0]['abook_hidden'])) && (intval(get_pconfig($channel['channel_id'],'system','post_newfriend')))) { + $xarr = array(); + $xarr['verb'] = ACTIVITY_FRIEND; + $xarr['item_wall'] = 1; + $xarr['item_origin'] = 1; + $xarr['item_thread_top'] = 1; + $xarr['owner_xchan'] = $xarr['author_xchan'] = $channel['channel_hash']; + $xarr['allow_cid'] = $channel['channel_allow_cid']; + $xarr['allow_gid'] = $channel['channel_allow_gid']; + $xarr['deny_cid'] = $channel['channel_deny_cid']; + $xarr['deny_gid'] = $channel['channel_deny_gid']; + $xarr['item_private'] = (($xarr['allow_cid']||$xarr['allow_gid']||$xarr['deny_cid']||$xarr['deny_gid']) ? 1 : 0); + $obj = array( + 'type' => ACTIVITY_OBJ_PERSON, + 'title' => \App::$poi['xchan_name'], + 'id' => \App::$poi['xchan_hash'], + 'link' => array( + array('rel' => 'alternate', 'type' => 'text/html', 'href' => \App::$poi['xchan_url']), + array('rel' => 'photo', 'type' => \App::$poi['xchan_photo_mimetype'], 'href' => \App::$poi['xchan_photo_l']) + ), + ); + $xarr['obj'] = json_encode($obj); + $xarr['obj_type'] = ACTIVITY_OBJ_PERSON; + + $xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . \App::$poi['xchan_url'] . ']' . \App::$poi['xchan_name'] . '[/zrl]'; + + $xarr['body'] .= "\n\n\n" . '[zrl=' . \App::$poi['xchan_url'] . '][zmg=80x80]' . \App::$poi['xchan_photo_m'] . '[/zmg][/zrl]'; + + post_activity_item($xarr); + + } + + + // pull in a bit of content if there is any to pull in + \Zotlabs\Daemon\Master::Summon(array('Onepoll',$contact_id)); + + } + + // Refresh the structure in memory with the new data + + $r = q("SELECT abook.*, xchan.* + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d and abook_id = %d LIMIT 1", + intval(local_channel()), + intval($contact_id) + ); + if($r) { + \App::$poi = $r[0]; + } + + if($new_friend) { + $arr = array('channel_id' => local_channel(), 'abook' => \App::$poi); + call_hooks('accept_follow', $arr); + } + + if(! is_null($autoperms)) + set_pconfig(local_channel(),'system','autoperms',(($autoperms) ? $abook_my_perms : 0)); + + $this->connedit_clone($a); + + if(($_REQUEST['pending']) && (!$_REQUEST['done'])) + goaway(z_root() . '/connections/ifpending'); + + return; + + } + + /* @brief Clone connection + * + * + */ + + function connedit_clone(&$a) { + + if(! \App::$poi) + return; + + + $channel = \App::get_channel(); + + $r = q("SELECT abook.*, xchan.* + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d and abook_id = %d LIMIT 1", + intval(local_channel()), + intval(\App::$poi['abook_id']) + ); + if($r) { + \App::$poi = $r[0]; + } + + $clone = \App::$poi; + + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + + $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); + if($abconfig) + $clone['abconfig'] = $abconfig; + + build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); + } + + /* @brief Generate content of connection edit page + * + * + */ + + function get() { + + $sort_type = 0; + $o = ''; + + if(! local_channel()) { + notice( t('Permission denied.') . EOL); + return login(); + } + + $channel = \App::get_channel(); + $my_perms = get_channel_default_perms(local_channel()); + $role = get_pconfig(local_channel(),'system','permissions_role'); + if($role) { + $x = \Zotlabs\Access\PermissionRoles::role_perms($role); + if($x['perms_connect']) + $my_perms = $x['perms_connect']; + } + + $yes_no = array(t('No'),t('Yes')); + + if($my_perms) { + $o .= "\n"; + } + + if(argc() == 3) { + + $contact_id = intval(argv(1)); + if(! $contact_id) + return; + + $cmd = argv(2); + + $orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_id = %d AND abook_channel = %d AND abook_self = 0 LIMIT 1", + intval($contact_id), + intval(local_channel()) + ); + + if(! count($orig_record)) { + notice( t('Could not access address book record.') . EOL); + goaway(z_root() . '/connections'); + } + + if($cmd === 'update') { + // pull feed and consume it, which should subscribe to the hub. + \Zotlabs\Daemon\Master::Summon(array('Poller',$contact_id)); + goaway(z_root() . '/connedit/' . $contact_id); + + } + if($cmd === 'resetphoto') { + q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s' limit 1", + dbesc($orig_record[0]['xchan_hash']) + ); + $cmd = 'refresh'; + } + + if($cmd === 'refresh') { + if($orig_record[0]['xchan_network'] === 'zot') { + if(! zot_refresh($orig_record[0],\App::get_channel())) + notice( t('Refresh failed - channel is currently unavailable.') ); + } + else { + + // if you are on a different network we'll force a refresh of the connection basic info + \Zotlabs\Daemon\Master::Summon(array('Notifier','permission_update',$contact_id)); + } + goaway(z_root() . '/connedit/' . $contact_id); + } + + if($cmd === 'block') { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_BLOCKED)) { + $this->connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + goaway(z_root() . '/connedit/' . $contact_id); + } + + if($cmd === 'ignore') { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_IGNORED)) { + $this->connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + goaway(z_root() . '/connedit/' . $contact_id); + } + + if($cmd === 'archive') { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_ARCHIVED)) { + $this->connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + goaway(z_root() . '/connedit/' . $contact_id); + } + + if($cmd === 'hide') { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_HIDDEN)) { + $this->connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + goaway(z_root() . '/connedit/' . $contact_id); + } + + // We'll prevent somebody from unapproving an already approved contact. + // Though maybe somebody will want this eventually (??) + + if($cmd === 'approve') { + if(intval($orig_record[0]['abook_pending'])) { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_PENDING)) { + $this->connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + } + goaway(z_root() . '/connedit/' . $contact_id); + } + + + if($cmd === 'drop') { + + + // FIXME + // We need to send either a purge or a refresh packet to the other side (the channel being unfriended). + // The issue is that the abook DB record _may_ get destroyed when we call contact_remove. As the notifier runs + // in the background there could be a race condition preventing this packet from being sent in all cases. + // PLACEHOLDER + + contact_remove(local_channel(), $orig_record[0]['abook_id']); + build_sync_packet(0 /* use the current local_channel */, + array('abook' => array(array( + 'abook_xchan' => $orig_record[0]['abook_xchan'], + 'entry_deleted' => true)) + ) + ); + + info( t('Connection has been removed.') . EOL ); + if(x($_SESSION,'return_url')) + goaway(z_root() . '/' . $_SESSION['return_url']); + goaway(z_root() . '/contacts'); + + } + } + + if(\App::$poi) { + + $contact_id = \App::$poi['abook_id']; + $contact = \App::$poi; + + $tools = array( + + 'view' => array( + 'label' => t('View Profile'), + 'url' => chanlink_cid($contact['abook_id']), + 'sel' => '', + 'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']), + ), + + 'refresh' => array( + 'label' => t('Refresh Permissions'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/refresh', + 'sel' => '', + 'title' => t('Fetch updated permissions'), + ), + + 'recent' => array( + 'label' => t('Recent Activity'), + 'url' => z_root() . '/network/?f=&cid=' . $contact['abook_id'], + 'sel' => '', + 'title' => t('View recent posts and comments'), + ), + + 'block' => array( + 'label' => (intval($contact['abook_blocked']) ? t('Unblock') : t('Block')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/block', + 'sel' => (intval($contact['abook_blocked']) ? 'active' : ''), + 'title' => t('Block (or Unblock) all communications with this connection'), + 'info' => (intval($contact['abook_blocked']) ? t('This connection is blocked!') : ''), + ), + + 'ignore' => array( + 'label' => (intval($contact['abook_ignored']) ? t('Unignore') : t('Ignore')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/ignore', + 'sel' => (intval($contact['abook_ignored']) ? 'active' : ''), + 'title' => t('Ignore (or Unignore) all inbound communications from this connection'), + 'info' => (intval($contact['abook_ignored']) ? t('This connection is ignored!') : ''), + ), + + 'archive' => array( + 'label' => (intval($contact['abook_archived']) ? t('Unarchive') : t('Archive')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/archive', + 'sel' => (intval($contact['abook_archived']) ? 'active' : ''), + 'title' => t('Archive (or Unarchive) this connection - mark channel dead but keep content'), + 'info' => (intval($contact['abook_archived']) ? t('This connection is archived!') : ''), + ), + + 'hide' => array( + 'label' => (intval($contact['abook_hidden']) ? t('Unhide') : t('Hide')), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/hide', + 'sel' => (intval($contact['abook_hidden']) ? 'active' : ''), + 'title' => t('Hide or Unhide this connection from your other connections'), + 'info' => (intval($contact['abook_hidden']) ? t('This connection is hidden!') : ''), + ), + + 'delete' => array( + 'label' => t('Delete'), + 'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/drop', + 'sel' => '', + 'title' => t('Delete this connection'), + ), + + ); + + $self = false; + + if(intval($contact['abook_self'])) + $self = true; + + $tpl = get_markup_template("abook_edit.tpl"); + + if(feature_enabled(local_channel(),'affinity')) { + + $labels = array( + t('Me'), + t('Family'), + t('Friends'), + t('Acquaintances'), + t('All') + ); + call_hooks('affinity_labels',$labels); + $label_str = ''; + + if($labels) { + foreach($labels as $l) { + if($label_str) { + $label_str .= ", '|'"; + $label_str .= ", '" . $l . "'"; + } + else + $label_str .= "'" . $l . "'"; + } + } + + $slider_tpl = get_markup_template('contact_slider.tpl'); + $slide = replace_macros($slider_tpl,array( + '$min' => 1, + '$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99), + '$labels' => $label_str, + )); + } + + $rating_val = 0; + $rating_text = ''; + + $xl = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1", + dbesc($channel['channel_hash']), + dbesc($contact['xchan_hash']) + ); + + if($xl) { + $rating_val = intval($xl[0]['xlink_rating']); + $rating_text = $xl[0]['xlink_rating_text']; + } + + $poco_rating = get_config('system','poco_rating_enable'); + + // if unset default to enabled + if($poco_rating === false) + $poco_rating = true; + + if($poco_rating) { + $rating = replace_macros(get_markup_template('rating_slider.tpl'),array( + '$min' => -10, + '$val' => $rating_val + )); + } + else { + $rating = false; + } + + + $perms = array(); + $channel = \App::get_channel(); + + $global_perms = \Zotlabs\Access\Permissions::Perms(); + + $existing = get_all_perms(local_channel(),$contact['abook_xchan']); + + $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'),('Yes'))); + + $multiprofs = ((feature_enabled(local_channel(),'multi_profiles')) ? true : false); + + if($slide && !$multiprofs) + $affinity = t('Set Affinity'); + + if(!$slide && $multiprofs) + $affinity = t('Set Profile'); + + if($slide && $multiprofs) + $affinity = t('Set Affinity & Profile'); + + $theirs = q("select * from abconfig where chan = %d and xchan = '%s' and cat = 'their_perms'", + intval(local_channel()), + dbesc($contact['abook_xchan']) + ); + $their_perms = array(); + if($theirs) { + foreach($theirs as $t) { + $their_perms[$t['k']] = $t['v']; + } + } + + foreach($global_perms as $k => $v) { + $thisperm = get_abconfig(local_channel(),$contact['abook_xchan'],'my_perms',$k); +//fixme + + $checkinherited = \Zotlabs\Access\PermissionLimits::Get(local_channel(),$k); + + // For auto permissions (when $self is true) we don't want to look at existing + // permissions because they are enabled for the channel owner + if((! $self) && ($existing[$k])) + $thisperm = "1"; + + + + + $perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); + } + + $locstr = ''; + + $locs = q("select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' + and hubloc_deleted = 0 and site_dead = 0", + dbesc($contact['xchan_hash']) + ); + + if($locs) { + foreach($locs as $l) { + if(!($l['location'])) + continue; + if(strpos($locstr,$l['location']) !== false) + continue; + if(strlen($locstr)) + $locstr .= ', '; + $locstr .= $l['location']; + } + } + else + $locstr = t('none'); + + $o .= replace_macros($tpl,array( + + '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), + '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no), + '$addr' => $contact['xchan_addr'], + '$addr_text' => t('This connection\'s primary address is'), + '$loc_text' => t('Available locations:'), + '$locstr' => $locstr, + '$notself' => (($self) ? '' : '1'), + '$self' => (($self) ? '1' : ''), + '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), + '$tools_label' => t('Connection Tools'), + '$tools' => (($self) ? '' : $tools), + '$lbl_slider' => t('Slide to adjust your degree of friendship'), + '$lbl_rating' => t('Rating'), + '$lbl_rating_label' => t('Slide to adjust your rating'), + '$lbl_rating_txt' => t('Optionally explain your rating'), + '$connfilter' => feature_enabled(local_channel(),'connfilter'), + '$connfilter_label' => t('Custom Filter'), + '$incl' => array('abook_incl',t('Only import posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + '$excl' => array('abook_excl',t('Do not import posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + '$rating_text' => array('rating_text', t('Optionally explain your rating'),$rating_text,''), + '$rating_info' => t('This information is public!'), + '$rating' => $rating, + '$rating_val' => $rating_val, + '$slide' => $slide, + '$affinity' => $affinity, + '$pending_label' => t('Connection Pending Approval'), + '$is_pending' => (intval($contact['abook_pending']) ? 1 : ''), + '$unapproved' => $unapproved, + '$inherited' => t('inherited'), + '$submit' => t('Submit'), + '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']), + '$close' => $contact['abook_closeness'], + '$them' => t('Their Settings'), + '$me' => t('My Settings'), + '$perms' => $perms, + '$permlbl' => t('Individual Permissions'), + '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), + '$permnote_self' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes.'), + '$lastupdtext' => t('Last update:'), + '$last_update' => relative_date($contact['abook_connected']), + '$profile_select' => contact_profile_assign($contact['abook_profile']), + '$multiprofs' => $multiprofs, + '$contact_id' => $contact['abook_id'], + '$name' => $contact['xchan_name'], + + )); + + $arr = array('contact' => $contact,'output' => $o); + + call_hooks('contact_edit', $arr); + + return $arr['output']; + + } + + + } + +} diff --git a/Zotlabs/Module/Contactgroup.php b/Zotlabs/Module/Contactgroup.php new file mode 100644 index 000000000..bbe56b4ad --- /dev/null +++ b/Zotlabs/Module/Contactgroup.php @@ -0,0 +1,54 @@ + 2) && (intval(argv(1))) && (argv(2))) { + $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", + dbesc(base64url_decode(argv(2))), + intval(local_channel()) + ); + if($r) + $change = $r[0]['abook_xchan']; + } + + if((argc() > 1) && (intval(argv(1)))) { + + $r = q("SELECT * FROM `groups` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1", + intval(argv(1)), + intval(local_channel()) + ); + if(! $r) { + killme(); + } + + $group = $r[0]; + $members = group_get_members($group['id']); + $preselected = array(); + if(count($members)) { + foreach($members as $member) + $preselected[] = $member['xchan_hash']; + } + + if($change) { + if(in_array($change,$preselected)) { + group_rmv_member(local_channel(),$group['gname'],$change); + } + else { + group_add_member(local_channel(),$group['gname'],$change); + } + } + } + + killme(); + } +} diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php new file mode 100644 index 000000000..886958b37 --- /dev/null +++ b/Zotlabs/Module/Cover_photo.php @@ -0,0 +1,423 @@ +is_valid()) { + + // We are scaling and cropping the relative pixel locations to the original photo instead of the + // scaled photo we operated on. + + // First load the scaled photo to check its size. (Should probably pass this in the post form and save + // a query.) + + $g = q("select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3", + dbesc($image_id), + intval(local_channel()) + ); + + + $scaled_width = $g[0]['width']; + $scaled_height = $g[0]['height']; + + if((! $scaled_width) || (! $scaled_height)) { + logger('potential divide by zero scaling cover photo'); + return; + } + + // unset all other cover photos + + q("update photo set photo_usage = %d where photo_usage = %d and uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_COVER), + intval(local_channel()) + ); + + $orig_srcx = ( $r[0]['width'] / $scaled_width ) * $srcX; + $orig_srcy = ( $r[0]['height'] / $scaled_height ) * $srcY; + $orig_srcw = ( $srcW / $scaled_width ) * $r[0]['width']; + $orig_srch = ( $srcH / $scaled_height ) * $r[0]['height']; + + $im->cropImageRect(1200,435,$orig_srcx, $orig_srcy, $orig_srcw, $orig_srch); + + $aid = get_account_id(); + + $p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'], + 'filename' => $base_image['filename'], 'album' => t('Cover Photos')); + + $p['imgscale'] = 7; + $p['photo_usage'] = PHOTO_COVER; + + $r1 = $im->save($p); + + $im->doScaleImage(850,310); + $p['imgscale'] = 8; + + $r2 = $im->save($p); + + + $im->doScaleImage(425,160); + $p['imgscale'] = 9; + + $r3 = $im->save($p); + + if($r1 === false || $r2 === false || $r3 === false) { + // if one failed, delete them all so we can start over. + notice( t('Image resize failed.') . EOL ); + $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ", + dbesc($base_image['resource_id']), + local_channel() + ); + return; + } + + $channel = \App::get_channel(); + $this->send_cover_photo_activity($channel,$base_image,$profile); + + + } + else + notice( t('Unable to process image') . EOL); + } + + goaway(z_root() . '/channel/' . $channel['channel_address']); + + } + + + $hash = photo_new_resource(); + $smallest = 0; + + require_once('include/attach.php'); + + $res = attach_store(\App::get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash)); + + logger('attach_store: ' . print_r($res,true)); + + if($res && intval($res['data']['is_photo'])) { + $i = q("select * from photo where resource_id = '%s' and uid = %d and imgscale = 0", + dbesc($hash), + intval(local_channel()) + ); + + if(! $i) { + notice( t('Image upload failed.') . EOL ); + return; + } + $os_storage = false; + + foreach($i as $ii) { + $smallest = intval($ii['imgscale']); + $os_storage = intval($ii['os_storage']); + $imagedata = $ii['content']; + $filetype = $ii['mimetype']; + + } + } + + $imagedata = (($os_storage) ? @file_get_contents($imagedata) : $imagedata); + $ph = photo_factory($imagedata, $filetype); + + if(! $ph->is_valid()) { + notice( t('Unable to process image.') . EOL ); + return; + } + + return $this->cover_photo_crop_ui_head($a, $ph, $hash, $smallest); + + } + + function send_cover_photo_activity($channel,$photo,$profile) { + + $arr = array(); + $arr['item_thread_top'] = 1; + $arr['item_origin'] = 1; + $arr['item_wall'] = 1; + $arr['obj_type'] = ACTIVITY_OBJ_PHOTO; + $arr['verb'] = ACTIVITY_UPDATE; + + $arr['obj'] = json_encode(array( + 'type' => $arr['obj_type'], + 'id' => z_root() . '/photo/' . $photo['resource_id'] . '-7', + 'link' => array('rel' => 'photo', 'type' => $photo['mimetype'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7') + )); + + if($profile && stripos($profile['gender'],t('female')) !== false) + $t = t('%1$s updated her %2$s'); + elseif($profile && stripos($profile['gender'],t('male')) !== false) + $t = t('%1$s updated his %2$s'); + else + $t = t('%1$s updated their %2$s'); + + $ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('cover photo') . '[/zrl]'; + + $ltext = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-8[/zmg][/zrl]'; + + $arr['body'] = sprintf($t,$channel['channel_name'],$ptext) . "\n\n" . $ltext; + + $acl = new \Zotlabs\Access\AccessList($channel); + $x = $acl->get(); + $arr['allow_cid'] = $x['allow_cid']; + + $arr['allow_gid'] = $x['allow_gid']; + $arr['deny_cid'] = $x['deny_cid']; + $arr['deny_gid'] = $x['deny_gid']; + + $arr['uid'] = $channel['channel_id']; + $arr['aid'] = $channel['channel_account_id']; + + $arr['owner_xchan'] = $channel['channel_hash']; + $arr['author_xchan'] = $channel['channel_hash']; + + post_activity_item($arr); + + + } + + + /* @brief Generate content of profile-photo view + * + * @param $a Current application + * @return void + * + */ + + + function get() { + + if(! local_channel()) { + notice( t('Permission denied.') . EOL ); + return; + } + + $channel = \App::get_channel(); + + $newuser = false; + + if(argc() == 2 && argv(1) === 'new') + $newuser = true; + + if(argv(1) === 'use') { + if (argc() < 3) { + notice( t('Permission denied.') . EOL ); + return; + }; + + // check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo'); + + $resource_id = argv(2); + + $r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC", + intval(local_channel()), + dbesc($resource_id) + ); + if(! $r) { + notice( t('Photo not available.') . EOL ); + return; + } + $havescale = false; + foreach($r as $rr) { + if($rr['imgscale'] == 7) + $havescale = true; + } + + $r = q("SELECT `content`, `mimetype`, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", + intval($r[0]['id']), + intval(local_channel()) + + ); + if(! $r) { + notice( t('Photo not available.') . EOL ); + return; + } + + if(intval($r[0]['os_storage'])) + $data = @file_get_contents($r[0]['content']); + else + $data = dbunescbin($r[0]['content']); + + $ph = photo_factory($data, $r[0]['mimetype']); + $smallest = 0; + if($ph->is_valid()) { + // go ahead as if we have just uploaded a new photo to crop + $i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0", + dbesc($r[0]['resource_id']), + intval(local_channel()) + ); + + if($i) { + $hash = $i[0]['resource_id']; + foreach($i as $ii) { + $smallest = intval($ii['imgscale']); + } + } + } + + $this->cover_photo_crop_ui_head($a, $ph, $hash, $smallest); + } + + + if(! x(\App::$data,'imagecrop')) { + + $tpl = get_markup_template('cover_photo.tpl'); + + $o .= replace_macros($tpl,array( + '$user' => \App::$channel['channel_address'], + '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), + '$title' => t('Upload Cover Photo'), + '$submit' => t('Upload'), + '$profiles' => $profiles, + '$form_security_token' => get_form_security_token("cover_photo"), + // FIXME - yuk + '$select' => sprintf('%s %s', t('or'), ($newuser) ? '' . t('skip this step') . '' : '' . t('select a photo from your photo albums') . '') + )); + + call_hooks('cover_photo_content_end', $o); + + return $o; + } + else { + $filename = \App::$data['imagecrop'] . '-3'; + $resolution = 3; + $tpl = get_markup_template("cropcover.tpl"); + $o .= replace_macros($tpl,array( + '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), + '$resource' => \App::$data['imagecrop'] . '-3', + '$image_url' => z_root() . '/photo/' . $filename, + '$title' => t('Crop Image'), + '$desc' => t('Please adjust the image cropping for optimum viewing.'), + '$form_security_token' => get_form_security_token("cover_photo"), + '$done' => t('Done Editing') + )); + return $o; + } + + return; // NOTREACHED + } + + /* @brief Generate the UI for photo-cropping + * + * @param $a Current application + * @param $ph Photo-Factory + * @return void + * + */ + + + + function cover_photo_crop_ui_head(&$a, $ph, $hash, $smallest){ + + $max_length = get_config('system','max_image_length'); + if(! $max_length) + $max_length = MAX_IMAGE_LENGTH; + if($max_length > 0) + $ph->scaleImage($max_length); + + $width = $ph->getWidth(); + $height = $ph->getHeight(); + + if($width < 300 || $height < 300) { + $ph->scaleImageUp(240); + $width = $ph->getWidth(); + $height = $ph->getHeight(); + } + + + \App::$data['imagecrop'] = $hash; + \App::$data['imagecrop_resolution'] = $smallest; + \App::$page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array()); + return; + } + + +} diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php new file mode 100644 index 000000000..aaf69844c --- /dev/null +++ b/Zotlabs/Module/Dav.php @@ -0,0 +1,88 @@ + 1) + profile_load(argv(1),0); + + + $auth = new \Zotlabs\Storage\BasicAuth(); + $auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . ' ' . 'WebDAV'); + + $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth); + + // A SabreDAV server-object + $server = new SDAV\Server($rootDirectory); + + + $authPlugin = new \Sabre\DAV\Auth\Plugin($auth); + $server->addPlugin($authPlugin); + + + // prevent overwriting changes each other with a lock backend + $lockBackend = new SDAV\Locks\Backend\File('store/[data]/locks'); + $lockPlugin = new SDAV\Locks\Plugin($lockBackend); + + $server->addPlugin($lockPlugin); + + // provide a directory view for the cloud in Hubzilla + $browser = new \Zotlabs\Storage\Browser($auth); + $auth->setBrowserPlugin($browser); + + // Experimental QuotaPlugin + // require_once('Zotlabs/Storage/QuotaPlugin.php'); + // $server->addPlugin(new \Zotlabs\Storage\QuotaPlugin($auth)); + + // All we need to do now, is to fire up the server + $server->exec(); + + killme(); + } + +} diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php new file mode 100644 index 000000000..560038ffc --- /dev/null +++ b/Zotlabs/Module/Directory.php @@ -0,0 +1,425 @@ + 0) ? intval($numtags) : 50); + + if(get_config('system','disable_directory_keywords')) + $kw = 0; + + $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); + + if($token) + $query .= '&t=' . $token; + + if(! $globaldir) + $query .= '&hub=' . \App::get_hostname(); + + if($search) + $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); + if(strpos($search,'@')) + $query .= '&address=' . urlencode($search); + if($keywords) + $query .= '&keywords=' . urlencode($keywords); + if($advanced) + $query .= '&query=' . urlencode($advanced); + if(! is_null($pubforums)) + $query .= '&pubforums=' . intval($pubforums); + + $directory_sort_order = get_config('system','directory_sort_order'); + if(! $directory_sort_order) + $directory_sort_order = 'date'; + + $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : $directory_sort_order); + + if($sort_order) + $query .= '&order=' . urlencode($sort_order); + + if(\App::$pager['page'] != 1) + $query .= '&p=' . \App::$pager['page']; + + logger('mod_directory: query: ' . $query); + + $x = z_fetch_url($query); + logger('directory: return from upstream: ' . print_r($x,true), LOGGER_DATA); + + if($x['success']) { + $t = 0; + $j = json_decode($x['body'],true); + if($j) { + + if($j['results']) { + + $entries = array(); + + $photo = 'thumb'; + + foreach($j['results'] as $rr) { + + $profile_link = chanlink_url($rr['url']); + + $pdesc = (($rr['description']) ? $rr['description'] . '' : ''); + $connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); + + // Checking status is disabled ATM until someone checks the performance impact more carefully + //$online = remote_online_status($rr['address']); + $online = ''; + + if(in_array($rr['hash'],$contacts)) + $connect_link = ''; + + $location = ''; + if(strlen($rr['locale'])) + $location .= $rr['locale']; + if(strlen($rr['region'])) { + if(strlen($rr['locale'])) + $location .= ', '; + $location .= $rr['region']; + } + if(strlen($rr['country'])) { + if(strlen($location)) + $location .= ', '; + $location .= $rr['country']; + } + + $age = ''; + if(strlen($rr['birthday'])) { + if(($years = age($rr['birthday'],'UTC','')) != 0) + $age = $years; + } + + $page_type = ''; + + if($rr['total_ratings']) + $total_ratings = sprintf( tt("%d rating", "%d ratings", $rr['total_ratings']), $rr['total_ratings']); + else + $total_ratings = ''; + + $profile = $rr; + + if ((x($profile,'locale') == 1) + || (x($profile,'region') == 1) + || (x($profile,'postcode') == 1) + || (x($profile,'country') == 1)) + + $gender = ((x($profile,'gender') == 1) ? t('Gender: ') . $profile['gender']: False); + + $marital = ((x($profile,'marital') == 1) ? t('Status: ') . $profile['marital']: False); + + $homepage = ((x($profile,'homepage') == 1) ? t('Homepage: ') : False); + $homepageurl = ((x($profile,'homepage') == 1) ? $profile['homepage'] : ''); + + $hometown = ((x($profile,'hometown') == 1) ? $profile['hometown'] : False); + + $about = ((x($profile,'about') == 1) ? bbcode($profile['about']) : False); + + $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); + + $out = ''; + + if($keywords) { + $keywords = str_replace(',',' ', $keywords); + $keywords = str_replace(' ',' ', $keywords); + $karr = explode(' ', $keywords); + + if($karr) { + if(local_channel()) { + $r = q("select keywords from profile where uid = %d and is_default = 1 limit 1", + intval(local_channel()) + ); + if($r) { + $keywords = str_replace(',',' ', $r[0]['keywords']); + $keywords = str_replace(' ',' ', $keywords); + $marr = explode(' ', $keywords); + } + } + foreach($karr as $k) { + if(strlen($out)) + $out .= ', '; + if($marr && in_arrayi($k,$marr)) + $out .= '' . $k . ''; + else + $out .= $k; + } + } + + } + + $entry = array( + 'id' => ++$t, + 'profile_link' => $profile_link, + 'public_forum' => $rr['public_forum'], + 'photo' => $rr['photo'], + 'hash' => $rr['hash'], + 'alttext' => $rr['name'] . ((local_channel() || remote_channel()) ? ' ' . $rr['address'] : ''), + 'name' => $rr['name'], + 'age' => $age, + 'age_label' => t('Age:'), + 'profile' => $profile, + 'address' => $rr['address'], + 'nickname' => substr($rr['address'],0,strpos($rr['address'],'@')), + 'location' => $location, + 'location_label' => t('Location:'), + 'gender' => $gender, + 'total_ratings' => $total_ratings, + 'viewrate' => true, + 'canrate' => ((local_channel()) ? true : false), + 'pdesc' => $pdesc, + 'pdesc_label' => t('Description:'), + 'marital' => $marital, + 'homepage' => $homepage, + 'homepageurl' => linkify($homepageurl), + 'hometown' => $hometown, + 'hometown_label' => t('Hometown:'), + 'about' => $about, + 'about_label' => t('About:'), + 'conn_label' => t('Connect'), + 'forum_label' => t('Public Forum:'), + 'connect' => $connect_link, + 'online' => $online, + 'kw' => (($out) ? t('Keywords: ') : ''), + 'keywords' => $out, + 'ignlink' => $suggest ? z_root() . '/directory?ignore=' . $rr['hash'] : '', + 'ignore_label' => t('Don\'t suggest'), + 'common_friends' => (($common[$rr['address']]) ? intval($common[$rr['address']]) : ''), + 'common_label' => t('Common connections:'), + 'common_count' => intval($common[$rr['address']]), + 'safe' => $safe_mode + ); + + $arr = array('contact' => $rr, 'entry' => $entry); + + call_hooks('directory_item', $arr); + + unset($profile); + unset($location); + + if(! $arr['entry']) { + continue; + } + + if($sort_order == '' && $suggest) { + $entries[$addresses[$rr['address']]] = $arr['entry']; // Use the same indexes as originally to get the best suggestion first + } + + else { + $entries[] = $arr['entry']; + } + } + + ksort($entries); // Sort array by key so that foreach-constructs work as expected + + if($j['keywords']) { + \App::$data['directory_keywords'] = $j['keywords']; + } + + logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); + + + if($_REQUEST['aj']) { + if($entries) { + $o = replace_macros(get_markup_template('directajax.tpl'),array( + '$entries' => $entries + )); + } + else { + $o = ''; + } + echo $o; + killme(); + } + else { + $maxheight = 94; + + $dirtitle = (($globaldir) ? t('Global Directory') : t('Local Directory')); + + $o .= ""; + $o .= replace_macros($tpl, array( + '$search' => $search, + '$desc' => t('Find'), + '$finddsc' => t('Finding:'), + '$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'), + '$entries' => $entries, + '$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle, + '$submit' => t('Find'), + '$next' => alt_pager($a,$j['records'], t('next page'), t('previous page')), + '$sort' => t('Sort options'), + '$normal' => t('Alphabetic'), + '$reverse' => t('Reverse Alphabetic'), + '$date' => t('Newest to Oldest'), + '$reversedate' => t('Oldest to Newest'), + '$suggest' => $suggest ? '&suggest=1' : '' + )); + + + } + + } + else { + if($_REQUEST['aj']) { + $o = ''; + echo $o; + killme(); + } + if(\App::$pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) { + goaway(z_root() . '/chanview/?f=&address=' . $search); + } + info( t("No entries (some entries may be hidden).") . EOL); + } + } + } + } + return $o; + } + + +} diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php new file mode 100644 index 000000000..8f60910f1 --- /dev/null +++ b/Zotlabs/Module/Dirsearch.php @@ -0,0 +1,462 @@ + false); + + // logger('request: ' . print_r($_REQUEST,true)); + + + $dirmode = intval(get_config('system','directory_mode')); + + if($dirmode == DIRECTORY_MODE_NORMAL) { + $ret['message'] = t('This site is not a directory server'); + json_return_and_die($ret); + } + + $access_token = $_REQUEST['t']; + + $token = get_config('system','realm_token'); + if($token && $access_token != $token) { + $ret['message'] = t('This directory server requires an access token'); + json_return_and_die($ret); + } + + + if(argc() > 1 && argv(1) === 'sites') { + $ret = $this->list_public_sites(); + json_return_and_die($ret); + } + + $sql_extra = ''; + + + $tables = array('name','address','locale','region','postcode','country','gender','marital','sexual','keywords'); + + if($_REQUEST['query']) { + $advanced = $this->dir_parse_query($_REQUEST['query']); + if($advanced) { + foreach($advanced as $adv) { + if(in_array($adv['field'],$tables)) { + if($adv['field'] === 'name') + $sql_extra .= $this->dir_query_build($adv['logic'],'xchan_name',$adv['value']); + elseif($adv['field'] === 'address') + $sql_extra .= $this->dir_query_build($adv['logic'],'xchan_addr',$adv['value']); + else + $sql_extra .= $this->dir_query_build($adv['logic'],'xprof_' . $adv['field'],$adv['value']); + } + } + } + } + + $hash = ((x($_REQUEST['hash'])) ? $_REQUEST['hash'] : ''); + + $name = ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''); + $hub = ((x($_REQUEST,'hub')) ? $_REQUEST['hub'] : ''); + $address = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); + $locale = ((x($_REQUEST,'locale')) ? $_REQUEST['locale'] : ''); + $region = ((x($_REQUEST,'region')) ? $_REQUEST['region'] : ''); + $postcode = ((x($_REQUEST,'postcode')) ? $_REQUEST['postcode'] : ''); + $country = ((x($_REQUEST,'country')) ? $_REQUEST['country'] : ''); + $gender = ((x($_REQUEST,'gender')) ? $_REQUEST['gender'] : ''); + $marital = ((x($_REQUEST,'marital')) ? $_REQUEST['marital'] : ''); + $sexual = ((x($_REQUEST,'sexual')) ? $_REQUEST['sexual'] : ''); + $keywords = ((x($_REQUEST,'keywords')) ? $_REQUEST['keywords'] : ''); + $agege = ((x($_REQUEST,'agege')) ? intval($_REQUEST['agege']) : 0 ); + $agele = ((x($_REQUEST,'agele')) ? intval($_REQUEST['agele']) : 0 ); + $kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 ); + $forums = ((array_key_exists('pubforums',$_REQUEST)) ? intval($_REQUEST['pubforums']) : 0); + + if(get_config('system','disable_directory_keywords')) + $kw = 0; + + + // by default use a safe search + $safe = ((x($_REQUEST,'safe'))); // ? intval($_REQUEST['safe']) : 1 ); + if ($safe === false) + $safe = 1; + + if(array_key_exists('sync',$_REQUEST)) { + if($_REQUEST['sync']) + $sync = datetime_convert('UTC','UTC',$_REQUEST['sync']); + else + $sync = datetime_convert('UTC','UTC','2010-01-01 01:01:00'); + } + else + $sync = false; + + + if($hub) + $hub_query = " and xchan_hash in (select hubloc_hash from hubloc where hubloc_host = '" . protect_sprintf(dbesc($hub)) . "') "; + else + $hub_query = ''; + + $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); + + $joiner = ' OR '; + if($_REQUEST['and']) + $joiner = ' AND '; + + if($name) + $sql_extra .= $this->dir_query_build($joiner,'xchan_name',$name); + if($address) + $sql_extra .= $this->dir_query_build($joiner,'xchan_addr',$address); + if($city) + $sql_extra .= $this->dir_query_build($joiner,'xprof_locale',$city); + if($region) + $sql_extra .= $this->dir_query_build($joiner,'xprof_region',$region); + if($post) + $sql_extra .= $this->dir_query_build($joiner,'xprof_postcode',$post); + if($country) + $sql_extra .= $this->dir_query_build($joiner,'xprof_country',$country); + if($gender) + $sql_extra .= $this->dir_query_build($joiner,'xprof_gender',$gender); + if($marital) + $sql_extra .= $this->dir_query_build($joiner,'xprof_marital',$marital); + if($sexual) + $sql_extra .= $this->dir_query_build($joiner,'xprof_sexual',$sexual); + if($keywords) + $sql_extra .= $this->dir_query_build($joiner,'xprof_keywords',$keywords); + + + // we only support an age range currently. You must set both agege + // (greater than or equal) and agele (less than or equal) + + if($agele && $agege) { + $sql_extra .= " $joiner ( xprof_age <= " . intval($agele) . " "; + $sql_extra .= " AND xprof_age >= " . intval($agege) . ") "; + } + + + if($hash) { + $sql_extra = " AND xchan_hash like '" . dbesc($hash) . protect_sprintf('%') . "' "; + } + + + $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 60); + $page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0); + $startrec = (($page+1) * $perpage) - $perpage; + $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0); + $return_total = ((x($_REQUEST,'return_total')) ? intval($_REQUEST['return_total']) : 0); + + // mtime is not currently working + + $mtime = ((x($_REQUEST,'mtime')) ? datetime_convert('UTC','UTC',$_REQUEST['mtime']) : ''); + + // ok a separate tag table won't work. + // merge them into xprof + + $ret['success'] = true; + + // If &limit=n, return at most n entries + // If &return_total=1, we count matching entries and return that as 'total_items' for use in pagination. + // By default we return one page (default 80 items maximum) and do not count total entries + + $logic = ((strlen($sql_extra)) ? 'false' : 'true'); + + if($hash) + $logic = 'true'; + + if($dirmode == DIRECTORY_MODE_STANDALONE) { + $sql_extra .= " and xchan_addr like '%%" . \App::get_hostname() . "' "; + } + + $safesql = (($safe > 0) ? " and xchan_censored = 0 and xchan_selfcensored = 0 " : ''); + if($safe < 0) + $safesql = " and ( xchan_censored = 1 OR xchan_selfcensored = 1 ) "; + + if($forums) + $safesql .= " and xchan_pubforum = " . ((intval($forums)) ? '1 ' : '0 '); + + if($limit) + $qlimit = " LIMIT $limit "; + else { + $qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec); + if($return_total) { + $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql "); + if($r) { + $ret['total_items'] = $r[0]['total']; + } + } + } + + if($sort_order == 'normal') { + $order = " order by xchan_name asc "; + + // Start the alphabetic search at 'A' + // This will make a handful of channels whose names begin with + // punctuation un-searchable in this mode + + $safesql .= " and ascii(substring(xchan_name FROM 1 FOR 1)) > 64 "; + } + elseif($sort_order == 'reverse') + $order = " order by xchan_name desc "; + elseif($sort_order == 'reversedate') + $order = " order by xchan_name_date asc "; + else + $order = " order by xchan_name_date desc "; + + + if($sync) { + $spkt = array('transactions' => array()); + $r = q("select * from updates where ud_date >= '%s' and ud_guid != '' order by ud_date desc", + dbesc($sync) + ); + if($r) { + foreach($r as $rr) { + $flags = array(); + if($rr['ud_flags'] & UPDATE_FLAGS_DELETED) + $flags[] = 'deleted'; + if($rr['ud_flags'] & UPDATE_FLAGS_FORCED) + $flags[] = 'forced'; + + $spkt['transactions'][] = array( + 'hash' => $rr['ud_hash'], + 'address' => $rr['ud_addr'], + 'transaction_id' => $rr['ud_guid'], + 'timestamp' => $rr['ud_date'], + 'flags' => $flags + ); + } + } + $r = q("select * from xlink where xlink_static = 1 and xlink_updated >= '%s' ", + dbesc($sync) + ); + if($r) { + $spkt['ratings'] = array(); + foreach($r as $rr) { + $spkt['ratings'][] = array( + 'type' => 'rating', + 'encoding' => 'zot', + 'channel' => $rr['xlink_xchan'], + 'target' => $rr['xlink_link'], + 'rating' => intval($rr['xlink_rating']), + 'rating_text' => $rr['xlink_rating_text'], + 'signature' => $rr['xlink_sig'], + 'edited' => $rr['xlink_updated'] + ); + } + } + json_return_and_die($spkt); + } + else { + + $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash + where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 + $safesql $order $qlimit " + ); + + + + $ret['page'] = $page + 1; + $ret['records'] = count($r); + } + + + + if($r) { + + $entries = array(); + + foreach($r as $rr) { + + $entry = array(); + + $pc = q("select count(xlink_rating) as total_ratings from xlink where xlink_link = '%s' and xlink_rating != 0 and xlink_static = 1 group by xlink_rating", + dbesc($rr['xchan_hash']) + ); + + if($pc) + $entry['total_ratings'] = intval($pc[0]['total_ratings']); + else + $entry['total_ratings'] = 0; + + $entry['name'] = $rr['xchan_name']; + $entry['hash'] = $rr['xchan_hash']; + + $entry['public_forum'] = (intval($rr['xchan_pubforum']) ? true : false); + + $entry['url'] = $rr['xchan_url']; + $entry['photo_l'] = $rr['xchan_photo_l']; + $entry['photo'] = $rr['xchan_photo_m']; + $entry['address'] = $rr['xchan_addr']; + $entry['description'] = $rr['xprof_desc']; + $entry['locale'] = $rr['xprof_locale']; + $entry['region'] = $rr['xprof_region']; + $entry['postcode'] = $rr['xprof_postcode']; + $entry['country'] = $rr['xprof_country']; + $entry['birthday'] = $rr['xprof_dob']; + $entry['age'] = $rr['xprof_age']; + $entry['gender'] = $rr['xprof_gender']; + $entry['marital'] = $rr['xprof_marital']; + $entry['sexual'] = $rr['xprof_sexual']; + $entry['about'] = $rr['xprof_about']; + $entry['homepage'] = $rr['xprof_homepage']; + $entry['hometown'] = $rr['xprof_hometown']; + $entry['keywords'] = $rr['xprof_keywords']; + + $entries[] = $entry; + + } + + $ret['results'] = $entries; + if($kw) { + $k = dir_tagadelic($kw); + if($k) { + $ret['keywords'] = array(); + foreach($k as $kv) { + $ret['keywords'][] = array('term' => $kv[0],'weight' => $kv[1], 'normalise' => $kv[2]); + } + } + } + } + + json_return_and_die($ret); + } + + function dir_query_build($joiner,$field,$s) { + $ret = ''; + if(trim($s)) + $ret .= dbesc($joiner) . " " . dbesc($field) . " like '" . protect_sprintf( '%' . dbesc($s) . '%' ) . "' "; + return $ret; + } + + function dir_flag_build($joiner,$field,$bit,$s) { + return dbesc($joiner) . " ( " . dbesc($field) . " & " . intval($bit) . " ) " . ((intval($s)) ? '>' : '=' ) . " 0 "; + } + + + function dir_parse_query($s) { + + $ret = array(); + $curr = array(); + $all = explode(' ',$s); + $quoted_string = false; + + if($all) { + foreach($all as $q) { + if($quoted_string === false) { + if($q === 'and') { + $curr['logic'] = 'and'; + continue; + } + if($q === 'or') { + $curr['logic'] = 'or'; + continue; + } + if($q === 'not') { + $curr['logic'] .= ' not'; + continue; + } + if(strpos($q,'=')) { + if(! isset($curr['logic'])) + $curr['logic'] = 'or'; + $curr['field'] = trim(substr($q,0,strpos($q,'='))); + $curr['value'] = trim(substr($q,strpos($q,'=')+1)); + if($curr['value'][0] == '"' && $curr['value'][strlen($curr['value'])-1] != '"') { + $quoted_string = true; + $curr['value'] = substr($curr['value'],1); + continue; + } + elseif($curr['value'][0] == '"' && $curr['value'][strlen($curr['value'])-1] == '"') { + $curr['value'] = substr($curr['value'],1,strlen($curr['value'])-2); + $ret[] = $curr; + $curr = array(); + continue; + } + else { + $ret[] = $curr; + $curr = array(); + continue; + } + } + } + else { + if($q[strlen($q)-1] == '"') { + $curr['value'] .= ' ' . str_replace('"','',trim($q)); + $ret[] = $curr; + $curr = array(); + $quoted_string = false; + } + else + $curr['value'] .= ' ' . trim(q); + } + } + } + logger('dir_parse_query:' . print_r($ret,true),LOGGER_DATA); + return $ret; + } + + + + + + + + function list_public_sites() { + + $rand = db_getfunc('rand'); + $realm = get_directory_realm(); + if($realm == DIRECTORY_REALM) { + $r = q("select * from site where site_access != 0 and site_register !=0 and ( site_realm = '%s' or site_realm = '') and site_type = %d order by $rand", + dbesc($realm), + intval(SITE_TYPE_ZOT) + ); + } + else { + $r = q("select * from site where site_access != 0 and site_register !=0 and site_realm = '%s' and site_type = %d order by $rand", + dbesc($realm), + intval(SITE_TYPE_ZOT) + ); + } + + $ret = array('success' => false); + + if($r) { + $ret['success'] = true; + $ret['sites'] = array(); + $insecure = array(); + + foreach($r as $rr) { + + if($rr['site_access'] == ACCESS_FREE) + $access = 'free'; + elseif($rr['site_access'] == ACCESS_PAID) + $access = 'paid'; + elseif($rr['site_access'] == ACCESS_TIERED) + $access = 'tiered'; + else + $access = 'private'; + + if($rr['site_register'] == REGISTER_OPEN) + $register = 'open'; + elseif($rr['site_register'] == REGISTER_APPROVE) + $register = 'approve'; + else + $register = 'closed'; + + if(strpos($rr['site_url'],'https://') !== false) + $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project']); + else + $insecure[] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project']); + } + if($insecure) { + $ret['sites'] = array_merge($ret['sites'],$insecure); + } + } + return $ret; + } + +} diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php new file mode 100644 index 000000000..d1d4edc7d --- /dev/null +++ b/Zotlabs/Module/Display.php @@ -0,0 +1,343 @@ + 1 && argv(1) !== 'load') + $item_hash = argv(1); + + + if($_REQUEST['mid']) + $item_hash = $_REQUEST['mid']; + + + if(! $item_hash) { + \App::$error = 404; + notice( t('Item not found.') . EOL); + return; + } + + $observer_is_owner = false; + + + if(local_channel() && (! $update)) { + + $channel = \App::get_channel(); + + + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + + + $x = array( + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + + 'acl' => populate_acl($channel_acl), + 'bang' => '', + 'visitor' => true, + 'profile_uid' => local_channel(), + 'return_path' => 'channel/' . $channel['channel_address'], + 'expanded' => true, + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true + ); + + $o = '
';
+ $o .= status_editor($a,$x);
+ $o .= '
';
+
+ }
+
+ // This page can be viewed by anybody so the query could be complicated
+ // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally.
+ // If that fails (or we aren't logged in locally),
+ // query an item in which the observer (if logged in remotely) has cid or gid rights
+ // and if that fails, look for a copy of the post that has no privacy restrictions.
+ // If we find the post, but we don't find a copy that we're allowed to look at, this fact needs to be reported.
+
+ // find a copy of the item somewhere
+
+ $target_item = null;
+
+ $r = q("select id, uid, mid, parent_mid, item_type, item_deleted from item where mid like '%s' limit 1",
+ dbesc($item_hash . '%')
+ );
+
+ if($r) {
+ $target_item = $r[0];
+ }
+
+ $r = null;
+
+ if($target_item['item_type'] == ITEM_TYPE_WEBPAGE) {
+ $x = q("select * from channel where channel_id = %d limit 1",
+ intval($target_item['uid'])
+ );
+ $y = q("select * from iconfig left join item on iconfig.iid = item.id
+ where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1",
+ intval($target_item['uid']),
+ intval($target_item['id'])
+ );
+ if($x && $y) {
+ goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
+ }
+ else {
+ notice( t('Page not found.') . EOL);
+ return '';
+ }
+ }
+
+
+ $simple_update = (($update) ? " AND item_unseen = 1 " : '');
+
+ if($update && $_SESSION['loadtime'])
+ $simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
+ if($load)
+ $simple_update = '';
+
+
+
+ if((! $update) && (! $load)) {
+
+
+ $o .= '' . "\r\n";
+ $o .= "\r\n";
+
+ \App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
+ '$baseurl' => z_root(),
+ '$pgtype' => 'display',
+ '$uid' => '0',
+ '$gid' => '0',
+ '$cid' => '0',
+ '$cmin' => '0',
+ '$cmax' => '99',
+ '$star' => '0',
+ '$liked' => '0',
+ '$conv' => '0',
+ '$spam' => '0',
+ '$fh' => '0',
+ '$nouveau' => '0',
+ '$wall' => '0',
+ '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1),
+ '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
+ '$search' => '',
+ '$order' => '',
+ '$file' => '',
+ '$cats' => '',
+ '$tags' => '',
+ '$dend' => '',
+ '$dbegin' => '',
+ '$verb' => '',
+ '$mid' => $item_hash
+ ));
+
+
+ }
+
+ $observer_hash = get_observer_hash();
+ $item_normal = item_normal();
+
+ $sql_extra = public_permissions_sql($observer_hash);
+
+ if(($update && $load) || ($checkjs->disabled())) {
+
+ $updateable = false;
+
+ $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']),intval(\App::$pager['start']));
+
+ if($load || ($checkjs->disabled())) {
+ $r = null;
+
+ require_once('include/channel.php');
+ $sys = get_sys_channel();
+ $sysid = $sys['channel_id'];
+
+ if(local_channel()) {
+ $r = q("SELECT * from item
+ WHERE uid = %d
+ and mid = '%s'
+ $item_normal
+ limit 1",
+ intval(local_channel()),
+ dbesc($target_item['parent_mid'])
+ );
+ if($r) {
+ $updateable = true;
+
+ }
+
+ }
+ if($r === null) {
+
+ // in case somebody turned off public access to sys channel content using permissions
+ // make that content unsearchable by ensuring the owner_xchan can't match
+
+ if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
+ $sysid = 0;
+
+
+ $r = q("SELECT * from item
+ WHERE mid = '%s'
+ AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
+ AND `item`.`deny_gid` = '' AND item_private = 0 )
+ and owner_xchan in ( " . stream_perms_xchans(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
+ OR uid = %d )
+ $sql_extra )
+ $item_normal
+ limit 1",
+ dbesc($target_item['parent_mid']),
+ intval($sysid)
+ );
+
+ }
+ }
+ }
+
+ elseif($update && !$load) {
+ $r = null;
+
+ require_once('include/channel.php');
+ $sys = get_sys_channel();
+ $sysid = $sys['channel_id'];
+
+ if(local_channel()) {
+ $r = q("SELECT * from item
+ WHERE uid = %d
+ and mid = '%s'
+ $item_normal
+ $simple_update
+ limit 1",
+ intval(local_channel()),
+ dbesc($target_item['parent_mid'])
+ );
+ if($r) {
+ $updateable = true;
+ }
+ }
+ if($r === null) {
+ // in case somebody turned off public access to sys channel content using permissions
+ // make that content unsearchable by ensuring the owner_xchan can't match
+ if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
+ $sysid = 0;
+
+ $r = q("SELECT * from item
+ WHERE mid = '%s'
+ AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
+ AND `item`.`deny_gid` = '' AND item_private = 0 )
+ and owner_xchan in ( " . stream_perms_xchans(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
+ OR uid = %d )
+ $sql_extra )
+ $item_normal
+ $simple_update
+ limit 1",
+ dbesc($target_item['parent_mid']),
+ intval($sysid)
+ );
+ }
+ $_SESSION['loadtime'] = datetime_convert();
+ }
+
+ else {
+ $r = array();
+ }
+
+ if($r) {
+
+ $parents_str = ids_to_querystr($r,'id');
+ if($parents_str) {
+
+ $items = q("SELECT `item`.*, `item`.`id` AS `item_id`
+ FROM `item`
+ WHERE parent in ( %s ) $item_normal ",
+ dbesc($parents_str)
+ );
+
+ xchan_query($items);
+ $items = fetch_post_tags($items,true);
+ $items = conv_sort($items,'created');
+ }
+ } else {
+ $items = array();
+ }
+
+
+ if ($checkjs->disabled()) {
+ $o .= conversation($a, $items, 'display', $update, 'traditional');
+ if ($items[0]['title'])
+ \App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title'];
+ }
+ else {
+ $o .= conversation($a, $items, 'display', $update, 'client');
+ }
+
+ if($updateable) {
+ $x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ",
+ intval(local_channel()),
+ intval($r[0]['parent'])
+ );
+ }
+
+ $o .= '';
+
+ return $o;
+
+
+ /*
+ elseif((! $update) && (! {
+
+ $r = q("SELECT `id`, item_flags FROM `item` WHERE `id` = '%s' OR `mid` = '%s' LIMIT 1",
+ dbesc($item_hash),
+ dbesc($item_hash)
+ );
+ if($r) {
+ if(intval($r[0]['item_deleted'])) {
+ notice( t('Item has been removed.') . EOL );
+ }
+ else {
+ notice( t('Permission denied.') . EOL );
+ }
+ }
+ else {
+ notice( t('Item not found.') . EOL );
+ }
+
+ }
+ */
+ }
+
+
+}
diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php
new file mode 100644
index 000000000..d2933b464
--- /dev/null
+++ b/Zotlabs/Module/Dreport.php
@@ -0,0 +1,170 @@
+ 1) ? argv(1) : '');
+
+ if($mid === 'push') {
+ $table = 'push';
+ $mid = ((argc() > 2) ? argv(2) : '');
+ if($mid) {
+ $i = q("select id from item where mid = '%s' and author_xchan = '%s' and uid = %d",
+ dbesc($mid),
+ dbesc($channel['channel_hash']),
+ intval($channel['channel_id'])
+ );
+ if($i) {
+ \Zotlabs\Daemon\Master::Summon([ 'Notifier', 'edit_post', $i[0]['id'] ]);
+ }
+ }
+ sleep(3);
+ goaway(z_root() . '/dreport/' . urlencode($mid));
+ }
+
+ if($mid === 'mail') {
+ $table = 'mail';
+ $mid = ((argc() > 2) ? argv(2) : '');
+ }
+
+
+ if(! $mid) {
+ notice( t('Invalid message') . EOL);
+ return;
+ }
+
+ switch($table) {
+ case 'item':
+ $i = q("select id from item where mid = '%s' and author_xchan = '%s' ",
+ dbesc($mid),
+ dbesc($channel['channel_hash'])
+ );
+ break;
+ case 'mail':
+ $i = q("select id from mail where mid = '%s' and from_xchan = '%s'",
+ dbesc($mid),
+ dbesc($channel['channel_hash'])
+ );
+ break;
+ default:
+ break;
+ }
+
+ if(! $i) {
+ notice( t('Permission denied') . EOL);
+ return;
+ }
+
+ $r = q("select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s'",
+ dbesc($channel['channel_hash']),
+ dbesc($mid)
+ );
+
+ if(! $r) {
+ notice( t('no results') . EOL);
+ return;
+ }
+
+ for($x = 0; $x < count($r); $x++ ) {
+ $r[$x]['name'] = escape_tags(substr($r[$x]['dreport_recip'],strpos($r[$x]['dreport_recip'],' ')));
+
+ // This has two purposes: 1. make the delivery report strings translateable, and
+ // 2. assign an ordering to item delivery results so we can group them and provide
+ // a readable report with more interesting events listed toward the top and lesser
+ // interesting items towards the bottom
+
+ switch($r[$x]['dreport_result']) {
+ case 'channel sync processed':
+ $r[$x]['gravity'] = 0;
+ $r[$x]['dreport_result'] = t('channel sync processed');
+ break;
+ case 'queued':
+ $r[$x]['gravity'] = 2;
+ $r[$x]['dreport_result'] = t('queued');
+ break;
+ case 'posted':
+ $r[$x]['gravity'] = 3;
+ $r[$x]['dreport_result'] = t('posted');
+ break;
+ case 'accepted for delivery':
+ $r[$x]['gravity'] = 4;
+ $r[$x]['dreport_result'] = t('accepted for delivery');
+ break;
+ case 'updated':
+ $r[$x]['gravity'] = 5;
+ $r[$x]['dreport_result'] = t('updated');
+ case 'update ignored':
+ $r[$x]['gravity'] = 6;
+ $r[$x]['dreport_result'] = t('update ignored');
+ break;
+ case 'permission denied':
+ $r[$x]['dreport_result'] = t('permission denied');
+ $r[$x]['gravity'] = 6;
+ break;
+ case 'recipient not found':
+ $r[$x]['dreport_result'] = t('recipient not found');
+ break;
+ case 'mail recalled':
+ $r[$x]['dreport_result'] = t('mail recalled');
+ break;
+ case 'duplicate mail received':
+ $r[$x]['dreport_result'] = t('duplicate mail received');
+ break;
+ case 'mail delivered':
+ $r[$x]['dreport_result'] = t('mail delivered');
+ break;
+ default:
+ $r[$x]['gravity'] = 1;
+ break;
+ }
+ }
+
+ usort($r,'self::dreport_gravity_sort');
+
+ $entries = array();
+ foreach($r as $rr) {
+ $entries[] = [
+ 'name' => $rr['name'],
+ 'result' => escape_tags($rr['dreport_result']),
+ 'time' => escape_tags(datetime_convert('UTC',date_default_timezone_get(),$rr['dreport_time']))
+ ];
+ }
+
+ $o = replace_macros(get_markup_template('dreport.tpl'), array(
+ '$title' => sprintf( t('Delivery report for %1$s'),substr($mid,0,32)) . '...',
+ '$table' => $table,
+ '$mid' => urlencode($mid),
+ '$options' => t('Options'),
+ '$push' => t('Redeliver'),
+ '$entries' => $entries
+ ));
+
+
+ return $o;
+
+
+
+ }
+
+ private static function dreport_gravity_sort($a,$b) {
+ if($a['gravity'] == $b['gravity']) {
+ if($a['name'] === $b['name'])
+ return strcmp($a['dreport_time'],$b['dreport_time']);
+ return strcmp($a['name'],$b['name']);
+ }
+ return (($a['gravity'] > $b['gravity']) ? 1 : (-1));
+ }
+
+}
diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php
new file mode 100644
index 000000000..6a9fa5f2d
--- /dev/null
+++ b/Zotlabs/Module/Editblock.php
@@ -0,0 +1,143 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+ $sys = get_sys_channel();
+ if($sys && intval($sys['channel_id'])) {
+ \App::$is_sys = true;
+ }
+ }
+
+ if(argc() > 1)
+ $which = argv(1);
+ else
+ return;
+
+ profile_load($which);
+
+ }
+
+ function get() {
+
+ if(! \App::$profile) {
+ notice( t('Requested profile is not available.') . EOL );
+ \App::$error = 404;
+ return;
+ }
+
+ $which = argv(1);
+
+ $uid = local_channel();
+ $owner = 0;
+ $channel = null;
+ $observer = \App::get_observer();
+
+ $channel = \App::get_channel();
+
+ if(\App::$is_sys && is_site_admin()) {
+ $sys = get_sys_channel();
+ if($sys && intval($sys['channel_id'])) {
+ $uid = $owner = intval($sys['channel_id']);
+ $channel = $sys;
+ $observer = $sys;
+ }
+ }
+
+ if(! $owner) {
+ // Figure out who the page owner is.
+ $r = q("select channel_id from channel where channel_address = '%s'",
+ dbesc($which)
+ );
+ if($r) {
+ $owner = intval($r[0]['channel_id']);
+ }
+ }
+
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+ if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $is_owner = (($uid && $uid == $owner) ? true : false);
+
+ $o = '';
+
+ // Figure out which post we're editing
+ $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
+
+ if(! ($post_id && $owner)) {
+ notice( t('Item not found') . EOL);
+ return;
+ }
+
+ $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1",
+ intval($post_id),
+ intval($owner)
+ );
+ if($itm) {
+ $item_id = q("select * from iconfig where cat = 'system' and k = 'BUILDBLOCK' and iid = %d limit 1",
+ intval($itm[0]['id'])
+ );
+ if($item_id)
+ $block_title = $item_id[0]['v'];
+ }
+ else {
+ notice( t('Item not found') . EOL);
+ return;
+ }
+
+ $mimetype = $itm[0]['mimetype'];
+
+ $rp = 'blocks/' . $channel['channel_address'];
+
+ $x = array(
+ 'nickname' => $channel['channel_address'],
+ 'bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : 'comanche-block'),
+ 'return_path' => $rp,
+ 'webpage' => ITEM_TYPE_BLOCK,
+ 'ptlabel' => t('Block Name'),
+ 'button' => t('Edit'),
+ 'writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
+ 'weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false),
+ 'hide_voting' => true,
+ 'hide_future' => true,
+ 'hide_location' => true,
+ 'hide_expire' => true,
+ 'showacl' => false,
+ 'ptyp' => $itm[0]['type'],
+ 'mimeselect' => true,
+ 'mimetype' => $itm[0]['mimetype'],
+ 'body' => undo_post_tagging($itm[0]['body']),
+ 'post_id' => $post_id,
+ 'visitor' => true,
+ 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
+ 'placeholdertitle' => t('Title (optional)'),
+ 'pagetitle' => $block_title,
+ 'profile_uid' => (intval($channel['channel_id'])),
+ 'bbcode' => (($mimetype == 'text/bbcode') ? true : false)
+ );
+
+ $editor = status_editor($a, $x);
+
+ $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+ '$title' => t('Edit Block'),
+ '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+ '$id' => $itm[0]['id'],
+ '$editor' => $editor
+ ));
+
+ return $o;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php
new file mode 100644
index 000000000..26732dc77
--- /dev/null
+++ b/Zotlabs/Module/Editlayout.php
@@ -0,0 +1,146 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+ $sys = get_sys_channel();
+ if($sys && intval($sys['channel_id'])) {
+ \App::$is_sys = true;
+ }
+ }
+
+ if(argc() > 1)
+ $which = argv(1);
+ else
+ return;
+
+ profile_load($which);
+
+ }
+
+ function get() {
+
+ if(! \App::$profile) {
+ notice( t('Requested profile is not available.') . EOL );
+ \App::$error = 404;
+ return;
+ }
+
+ $which = argv(1);
+
+ $uid = local_channel();
+ $owner = 0;
+ $channel = null;
+ $observer = \App::get_observer();
+
+ $channel = \App::get_channel();
+
+ if(\App::$is_sys && is_site_admin()) {
+ $sys = get_sys_channel();
+ if($sys && intval($sys['channel_id'])) {
+ $uid = $owner = intval($sys['channel_id']);
+ $channel = $sys;
+ $observer = $sys;
+ }
+ }
+
+ if(! $owner) {
+ // Figure out who the page owner is.
+ $r = q("select channel_id from channel where channel_address = '%s'",
+ dbesc($which)
+ );
+ if($r) {
+ $owner = intval($r[0]['channel_id']);
+ }
+ }
+
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+ if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $is_owner = (($uid && $uid == $owner) ? true : false);
+
+ $o = '';
+
+ // Figure out which post we're editing
+ $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
+
+ if(! $post_id) {
+ notice( t('Item not found') . EOL);
+ return;
+ }
+
+ // Now we've got a post and an owner, let's find out if we're allowed to edit it
+
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+ $perms = get_all_perms($owner,$ob_hash);
+
+ if(! $perms['write_pages']) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1",
+ intval($post_id),
+ intval($owner)
+ );
+
+ $item_id = q("select * from iconfig where cat = 'system' and k = 'PDL' and iid = %d limit 1",
+ intval($itm[0]['id'])
+ );
+ if($item_id)
+ $layout_title = $item_id[0]['v'];
+
+
+ $rp = 'layouts/' . $which;
+
+ $x = array(
+ 'webpage' => ITEM_TYPE_PDL,
+ 'nickname' => $channel['channel_address'],
+ 'editor_autocomplete'=> true,
+ 'bbco_autocomplete'=> 'comanche',
+ 'return_path' => $rp,
+ 'button' => t('Edit'),
+ 'hide_voting' => true,
+ 'hide_future' => true,
+ 'hide_expire' => true,
+ 'hide_location' => true,
+ 'hide_weblink' => true,
+ 'hide_attach' => true,
+ 'hide_preview' => true,
+ 'ptyp' => $itm[0]['obj_type'],
+ 'body' => undo_post_tagging($itm[0]['body']),
+ 'post_id' => $post_id,
+ 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
+ 'pagetitle' => $layout_title,
+ 'ptlabel' => t('Layout Name'),
+ 'placeholdertitle' => t('Layout Description (Optional)'),
+ 'showacl' => false,
+ 'profile_uid' => intval($owner),
+ );
+
+ $editor = status_editor($a, $x);
+
+ $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+ '$title' => t('Edit Layout'),
+ '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+ '$id' => $itm[0]['id'],
+ '$editor' => $editor
+ ));
+
+ return $o;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php
new file mode 100644
index 000000000..838fe9e4f
--- /dev/null
+++ b/Zotlabs/Module/Editpost.php
@@ -0,0 +1,114 @@
+ 1) ? intval(argv(1)) : 0);
+
+ if(! $post_id) {
+ notice( t('Item not found') . EOL);
+ return;
+ }
+
+ $itm = q("SELECT * FROM `item` WHERE `id` = %d AND ( owner_xchan = '%s' OR author_xchan = '%s' ) LIMIT 1",
+ intval($post_id),
+ dbesc(get_observer_hash()),
+ dbesc(get_observer_hash())
+ );
+
+ if(! count($itm)) {
+ notice( t('Item is not editable') . EOL);
+ return;
+ }
+
+ if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) {
+ goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1');
+ }
+
+ $owner_uid = $itm[0]['uid'];
+
+ $channel = \App::get_channel();
+
+ if(intval($itm[0]['item_obscured'])) {
+ $key = get_config('system','prvkey');
+ if($itm[0]['title'])
+ $itm[0]['title'] = crypto_unencapsulate(json_decode($itm[0]['title'],true),$key);
+ if($itm[0]['body'])
+ $itm[0]['body'] = crypto_unencapsulate(json_decode($itm[0]['body'],true),$key);
+ }
+
+ $category = '';
+ $catsenabled = ((feature_enabled($owner_uid,'categories')) ? 'categories' : '');
+
+ if ($catsenabled){
+ $itm = fetch_post_tags($itm);
+
+ $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
+
+ foreach ($cats as $cat) {
+ if (strlen($category))
+ $category .= ', ';
+ $category .= $cat['term'];
+ }
+ }
+
+ if($itm[0]['attach']) {
+ $j = json_decode($itm[0]['attach'],true);
+ if($j) {
+ foreach($j as $jj) {
+ $itm[0]['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
+ }
+ }
+ }
+
+ $x = array(
+ 'nickname' => $channel['channel_address'],
+ 'editor_autocomplete'=> true,
+ 'bbco_autocomplete'=> 'bbcode',
+ 'return_path' => $_SESSION['return_url'],
+ 'button' => t('Edit'),
+ 'hide_voting' => true,
+ 'hide_future' => true,
+ 'hide_location' => true,
+ 'mimetype' => $itm[0]['mimetype'],
+ 'ptyp' => $itm[0]['obj_type'],
+ 'body' => htmlspecialchars_decode(undo_post_tagging($itm[0]['body']),ENT_COMPAT),
+ 'post_id' => $post_id,
+ 'defloc' => $channel['channel_location'],
+ 'visitor' => true,
+ 'title' => htmlspecialchars_decode($itm[0]['title'],ENT_COMPAT),
+ 'category' => $category,
+ 'showacl' => false,
+ 'profile_uid' => $owner_uid,
+ 'catsenabled' => $catsenabled,
+ 'hide_expire' => true,
+ 'bbcode' => true
+ );
+
+ $editor = status_editor($a, $x);
+
+ $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+ '$title' => t('Edit post'),
+ '$editor' => $editor
+ ));
+
+ return $o;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
new file mode 100644
index 000000000..a55f81101
--- /dev/null
+++ b/Zotlabs/Module/Editwebpage.php
@@ -0,0 +1,178 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+ $sys = get_sys_channel();
+ if($sys && intval($sys['channel_id'])) {
+ \App::$is_sys = true;
+ }
+ }
+
+ if(argc() > 1)
+ $which = argv(1);
+ else
+ return;
+
+ profile_load($which);
+
+ }
+
+ function get() {
+
+ if(! \App::$profile) {
+ notice( t('Requested profile is not available.') . EOL );
+ \App::$error = 404;
+ return;
+ }
+
+ $which = argv(1);
+
+ $uid = local_channel();
+ $owner = 0;
+ $channel = null;
+ $observer = \App::get_observer();
+
+ $channel = \App::get_channel();
+
+ if(\App::$is_sys && is_site_admin()) {
+ $sys = get_sys_channel();
+ if($sys && intval($sys['channel_id'])) {
+ $uid = $owner = intval($sys['channel_id']);
+ $channel = $sys;
+ $observer = $sys;
+ }
+ }
+
+ if(! $owner) {
+ // Figure out who the page owner is.
+ $r = q("select channel_id from channel where channel_address = '%s'",
+ dbesc($which)
+ );
+ if($r) {
+ $owner = intval($r[0]['channel_id']);
+ }
+ }
+
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+ if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $is_owner = (($uid && $uid == $owner) ? true : false);
+
+ $o = '';
+
+ // Figure out which post we're editing
+ $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
+
+ if(! $post_id) {
+ notice( t('Item not found') . EOL);
+ return;
+ }
+
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+ $perms = get_all_perms($owner,$ob_hash);
+
+ if(! $perms['write_pages']) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ // We've already figured out which item we want and whose copy we need,
+ // so we don't need anything fancy here
+
+ $sql_extra = item_permissions_sql($owner);
+
+ $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s $sql_extra LIMIT 1",
+ intval($post_id),
+ intval($owner)
+ );
+
+ if(! $itm) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ if(intval($itm[0]['item_obscured'])) {
+ $key = get_config('system','prvkey');
+ if($itm[0]['title'])
+ $itm[0]['title'] = crypto_unencapsulate(json_decode($itm[0]['title'],true),$key);
+ if($itm[0]['body'])
+ $itm[0]['body'] = crypto_unencapsulate(json_decode($itm[0]['body'],true),$key);
+ }
+
+ $item_id = q("select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1",
+ intval($itm[0]['id'])
+ );
+ if($item_id)
+ $page_title = $item_id[0]['v'];
+
+ $mimetype = $itm[0]['mimetype'];
+
+ if($mimetype === 'application/x-php') {
+ if((! $uid) || ($uid != $itm[0]['uid'])) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+ }
+
+ $layout = $itm[0]['layout_mid'];
+
+ $tpl = get_markup_template("jot.tpl");
+
+ $rp = 'webpages/' . $which;
+
+ $x = array(
+ 'nickname' => $channel['channel_address'],
+ 'bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : ''),
+ 'return_path' => $rp,
+ 'webpage' => ITEM_TYPE_WEBPAGE,
+ 'ptlabel' => t('Page link'),
+ 'pagetitle' => $page_title,
+ 'writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
+ 'button' => t('Edit'),
+ 'weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false),
+ 'hide_location' => true,
+ 'hide_voting' => true,
+ 'ptyp' => $itm[0]['type'],
+ 'body' => undo_post_tagging($itm[0]['body']),
+ 'post_id' => $post_id,
+ 'visitor' => ($is_owner) ? true : false,
+ 'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')),
+ 'showacl' => ($is_owner) ? true : false,
+ 'mimetype' => $mimetype,
+ 'mimeselect' => true,
+ 'layout' => $layout,
+ 'layoutselect' => true,
+ 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
+ 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
+ 'profile_uid' => (intval($owner)),
+ 'bbcode' => (($mimetype == 'text/bbcode') ? true : false)
+ );
+
+ $editor = status_editor($a, $x);
+
+ $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+ '$title' => t('Edit Webpage'),
+ '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+ '$editor' => $editor,
+ '$id' => $itm[0]['id']
+ ));
+
+ return $o;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php
new file mode 100644
index 000000000..0dac873c5
--- /dev/null
+++ b/Zotlabs/Module/Embedphotos.php
@@ -0,0 +1,180 @@
+ 1 && argv(1) === 'album') {
+ // API: /embedphotos/album
+ $name = (x($_POST,'name') ? $_POST['name'] : null );
+ if (!$name) {
+ json_return_and_die(array('errormsg' => 'Error retrieving album', 'status' => false));
+ }
+ $album = $this->embedphotos_widget_album(array('channel' => \App::get_channel(), 'album' => $name));
+ json_return_and_die(array('status' => true, 'content' => $album));
+
+ }
+ if (argc() > 1 && argv(1) === 'albumlist') {
+ // API: /embedphotos/albumlist
+ $album_list = $this->embedphotos_album_list($a);
+ json_return_and_die(array('status' => true, 'albumlist' => $album_list));
+
+ }
+ if (argc() > 1 && argv(1) === 'photolink') {
+ // API: /embedphotos/photolink
+ $href = (x($_POST,'href') ? $_POST['href'] : null );
+ if (!$href) {
+ json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false));
+ }
+ $resource_id = array_pop(explode("/", $href));
+ $r = q("SELECT obj from item where resource_type = 'photo' and resource_id = '%s' limit 1",
+ dbesc($resource_id)
+ );
+ if(!$r) {
+ json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
+ }
+ $obj = json_decode($r[0]['obj'], true);
+ if(x($obj,'body')) {
+ $photolink = $obj['body'];
+ } elseif (x($obj,'bbcode')) {
+ $photolink = $obj['bbcode'];
+ } else {
+ json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
+ }
+ json_return_and_die(array('status' => true, 'photolink' => $photolink));
+
+ }
+ }
+
+
+/**
+ * Copied from include/widgets.php::widget_album() with a modification to get the profile_uid from
+ * the input array as in widget_item()
+ * @param type $name
+ * @return string
+ */
+function embedphotos_widget_album($args) {
+
+ $channel_id = 0;
+ if(array_key_exists('channel',$args))
+ $channel = $args['channel'];
+ $channel_id = intval($channel['channel_id']);
+ if(! $channel_id)
+ $channel_id = \App::$profile_uid;
+ if(! $channel_id)
+ return '';
+ $owner_uid = $channel_id;
+ require_once('include/security.php');
+ $sql_extra = permissions_sql($channel_id);
+
+ if(! perm_is_allowed($channel_id,get_observer_hash(),'view_storage'))
+ return '';
+
+ if($args['album'])
+ $album = $args['album'];
+ if($args['title'])
+ $title = $args['title'];
+
+ /**
+ * This may return incorrect permissions if you have multiple directories of the same name.
+ * It is a limitation of the photo table using a name for a photo album instead of a folder hash
+ */
+
+ if($album) {
+ $x = q("select hash from attach where filename = '%s' and uid = %d limit 1",
+ dbesc($album),
+ intval($owner_uid)
+ );
+ if($x) {
+ $y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']);
+ if(! $y)
+ return '';
+ }
+ }
+
+ $order = 'DESC';
+
+ $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+ (SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph
+ ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
+ ORDER BY created $order",
+ intval($owner_uid),
+ dbesc($album),
+ intval(PHOTO_NORMAL),
+ intval(PHOTO_PROFILE)
+ );
+
+ $photos = array();
+ if(count($r)) {
+ $twist = 'rotright';
+ foreach($r as $rr) {
+
+ if($twist == 'rotright')
+ $twist = 'rotleft';
+ else
+ $twist = 'rotright';
+
+ $ext = $phototypes[$rr['mimetype']];
+
+ $imgalt_e = $rr['filename'];
+ $desc_e = $rr['description'];
+
+ $imagelink = (z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id']
+ . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
+
+ $photos[] = array(
+ 'id' => $rr['id'],
+ 'twist' => ' ' . $twist . rand(2,4),
+ 'link' => $imagelink,
+ 'title' => t('View Photo'),
+ 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
+ 'alt' => $imgalt_e,
+ 'desc'=> $desc_e,
+ 'ext' => $ext,
+ 'hash'=> $rr['resource_id'],
+ 'unknown' => t('Unknown')
+ );
+ }
+ }
+
+ $tpl = get_markup_template('photo_album.tpl');
+ $o .= replace_macros($tpl, array(
+ '$photos' => $photos,
+ '$album' => (($title) ? $title : $album),
+ '$album_id' => rand(),
+ '$album_edit' => array(t('Edit Album'), $album_edit),
+ '$can_post' => false,
+ '$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
+ '$order' => false,
+ '$upload_form' => $upload_form,
+ '$no_fullscreen_btn' => true
+ ));
+
+ return $o;
+}
+
+
+function embedphotos_album_list($a) {
+ $o = '';
+ require_once('include/photos.php');
+ $p = photos_albums_list(\App::get_channel(), \App::get_observer());
+ if ($p['success']) {
+ return $p['albums'];
+ } else {
+ return null;
+ }
+}
+
+}
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
new file mode 100644
index 000000000..def5c437b
--- /dev/null
+++ b/Zotlabs/Module/Events.php
@@ -0,0 +1,718 @@
+set($x[0]);
+
+ $created = $x[0]['created'];
+ $edited = datetime_convert();
+
+ if($x[0]['allow_cid'] === '<' . $channel['channel_hash'] . '>'
+ && $x[0]['allow_gid'] === '' && $x[0]['deny_cid'] === '' && $x[0]['deny_gid'] === '') {
+ $share = false;
+ }
+ else {
+ $share = true;
+ }
+ }
+ else {
+ $created = $edited = datetime_convert();
+ if($share) {
+ $acl->set_from_array($_POST);
+ }
+ else {
+ $acl->set(array('allow_cid' => '<' . $channel['channel_hash'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''));
+ }
+ }
+
+ $post_tags = array();
+ $channel = \App::get_channel();
+ $ac = $acl->get();
+
+ if(strlen($categories)) {
+ $cats = explode(',',$categories);
+ foreach($cats as $cat) {
+ $post_tags[] = array(
+ 'uid' => $profile_uid,
+ 'ttype' => TERM_CATEGORY,
+ 'otype' => TERM_OBJ_POST,
+ 'term' => trim($cat),
+ 'url' => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat))
+ );
+ }
+ }
+
+ $datarray = array();
+ $datarray['dtstart'] = $start;
+ $datarray['dtend'] = $finish;
+ $datarray['summary'] = $summary;
+ $datarray['description'] = $desc;
+ $datarray['location'] = $location;
+ $datarray['etype'] = $type;
+ $datarray['adjust'] = $adjust;
+ $datarray['nofinish'] = $nofinish;
+ $datarray['uid'] = local_channel();
+ $datarray['account'] = get_account_id();
+ $datarray['event_xchan'] = $channel['channel_hash'];
+ $datarray['allow_cid'] = $ac['allow_cid'];
+ $datarray['allow_gid'] = $ac['allow_gid'];
+ $datarray['deny_cid'] = $ac['deny_cid'];
+ $datarray['deny_gid'] = $ac['deny_gid'];
+ $datarray['private'] = (($acl->is_private()) ? 1 : 0);
+ $datarray['id'] = $event_id;
+ $datarray['created'] = $created;
+ $datarray['edited'] = $edited;
+
+ if(intval($_REQUEST['preview'])) {
+ $html = format_event_html($datarray);
+ echo $html;
+ killme();
+ }
+
+ $event = event_store_event($datarray);
+
+
+ if($post_tags)
+ $datarray['term'] = $post_tags;
+
+ $item_id = event_store_item($datarray,$event);
+
+ if($item_id) {
+ $r = q("select * from item where id = %d",
+ intval($item_id)
+ );
+ if($r) {
+ xchan_query($r);
+ $sync_item = fetch_post_tags($r);
+ $z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
+ dbesc($r[0]['resource_id']),
+ intval($channel['channel_id'])
+ );
+ if($z) {
+ build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
+ }
+ }
+ }
+
+ if($share)
+ \Zotlabs\Daemon\Master::Summon(array('Notifier','event',$item_id));
+
+ }
+
+
+
+ function get() {
+
+ if(argc() > 2 && argv(1) == 'ical') {
+ $event_id = argv(2);
+
+ require_once('include/security.php');
+ $sql_extra = permissions_sql(local_channel());
+
+ $r = q("select * from event where event_hash = '%s' $sql_extra limit 1",
+ dbesc($event_id)
+ );
+ if($r) {
+ header('Content-type: text/calendar');
+ header('content-disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"' );
+ echo ical_wrapper($r);
+ killme();
+ }
+ else {
+ notice( t('Event not found.') . EOL );
+ return;
+ }
+ }
+
+ if(! local_channel()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ nav_set_selected('all_events');
+
+ if((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
+ $r = q("update event set dismissed = 1 where id = %d and uid = %d",
+ intval(argv(2)),
+ intval(local_channel())
+ );
+ }
+
+ if((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
+ $r = q("update event set dismissed = 0 where id = %d and uid = %d",
+ intval(argv(2)),
+ intval(local_channel())
+ );
+ }
+
+ $first_day = get_pconfig(local_channel(),'system','cal_first_day');
+ $first_day = (($first_day) ? $first_day : 0);
+
+ $htpl = get_markup_template('event_head.tpl');
+ \App::$page['htmlhead'] .= replace_macros($htpl,array(
+ '$baseurl' => z_root(),
+ '$module_url' => '/events',
+ '$modparams' => 1,
+ '$lang' => \App::$language,
+ '$first_day' => $first_day
+ ));
+
+ $o = '';
+
+ $channel = \App::get_channel();
+
+ $mode = 'view';
+ $y = 0;
+ $m = 0;
+ $ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
+
+
+ // logger('args: ' . print_r(\App::$argv,true));
+
+
+
+ if(argc() > 1) {
+ if(argc() > 2 && argv(1) === 'add') {
+ $mode = 'add';
+ $item_id = intval(argv(2));
+ }
+ if(argc() > 2 && argv(1) === 'drop') {
+ $mode = 'drop';
+ $event_id = argv(2);
+ }
+ if(argc() > 2 && intval(argv(1)) && intval(argv(2))) {
+ $mode = 'view';
+ $y = intval(argv(1));
+ $m = intval(argv(2));
+ }
+ if(argc() <= 2) {
+ $mode = 'view';
+ $event_id = argv(1);
+ }
+ }
+
+ if($mode === 'add') {
+ event_addtocal($item_id,local_channel());
+ killme();
+ }
+
+ if($mode == 'view') {
+
+ /* edit/create form */
+ if($event_id) {
+ $r = q("SELECT * FROM `event` WHERE event_hash = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($event_id),
+ intval(local_channel())
+ );
+ if(count($r))
+ $orig_event = $r[0];
+ }
+
+ $channel = \App::get_channel();
+
+ // Passed parameters overrides anything found in the DB
+ if(!x($orig_event))
+ $orig_event = array();
+
+ // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
+ /*
+ if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish'];
+ if(x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust'];
+ if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
+ if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
+ if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
+ if(x($_REQUEST,'start')) $orig_event['dtstart'] = $_REQUEST['start'];
+ if(x($_REQUEST,'finish')) $orig_event['dtend'] = $_REQUEST['finish'];
+ if(x($_REQUEST,'type')) $orig_event['etype'] = $_REQUEST['type'];
+ */
+
+ $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
+ $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
+ $t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
+ $d_orig = ((x($orig_event)) ? $orig_event['description'] : '');
+ $l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
+ $eid = ((x($orig_event)) ? $orig_event['id'] : 0);
+ $event_xchan = ((x($orig_event)) ? $orig_event['event_xchan'] : $channel['channel_hash']);
+ $mid = ((x($orig_event)) ? $orig_event['mid'] : '');
+
+ if(! x($orig_event))
+ $sh_checked = '';
+ else
+ $sh_checked = ((($orig_event['allow_cid'] === '<' . $channel['channel_hash'] . '>' || (! $orig_event['allow_cid'])) && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ' );
+
+ if($orig_event['event_xchan'])
+ $sh_checked .= ' disabled="disabled" ';
+
+ $sdt = ((x($orig_event)) ? $orig_event['dtstart'] : 'now');
+
+ $fdt = ((x($orig_event)) ? $orig_event['dtend'] : '+1 hour');
+
+ $tz = date_default_timezone_get();
+ if(x($orig_event))
+ $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+
+ $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
+ $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
+ $sday = datetime_convert('UTC', $tz, $sdt, 'd');
+ $shour = datetime_convert('UTC', $tz, $sdt, 'H');
+ $sminute = datetime_convert('UTC', $tz, $sdt, 'i');
+
+ $stext = datetime_convert('UTC',$tz,$sdt);
+ $stext = substr($stext,0,14) . "00:00";
+
+ $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
+ $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
+ $fday = datetime_convert('UTC', $tz, $fdt, 'd');
+ $fhour = datetime_convert('UTC', $tz, $fdt, 'H');
+ $fminute = datetime_convert('UTC', $tz, $fdt, 'i');
+
+ $ftext = datetime_convert('UTC',$tz,$fdt);
+ $ftext = substr($ftext,0,14) . "00:00";
+
+ $type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
+
+ $f = get_config('system','event_input_format');
+ if(! $f)
+ $f = 'ymd';
+
+ $catsenabled = feature_enabled(local_channel(),'categories');
+
+ $category = '';
+
+ if($catsenabled && x($orig_event)){
+ $itm = q("select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d limit 1",
+ dbesc($orig_event['event_hash']),
+ intval(local_channel())
+ );
+ $itm = fetch_post_tags($itm);
+ if($itm) {
+ $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
+ foreach ($cats as $cat) {
+ if(strlen($category))
+ $category .= ', ';
+ $category .= $cat['term'];
+ }
+ }
+ }
+
+ require_once('include/acl_selectors.php');
+
+ $acl = new \Zotlabs\Access\AccessList($channel);
+ $perm_defaults = $acl->get();
+
+ $tpl = get_markup_template('event_form.tpl');
+
+ $form = replace_macros($tpl,array(
+ '$post' => z_root() . '/events',
+ '$eid' => $eid,
+ '$type' => $type,
+ '$xchan' => $event_xchan,
+ '$mid' => $mid,
+ '$event_hash' => $event_id,
+ '$summary' => array('summary', (($event_id) ? t('Edit event title') : t('Event title')), $t_orig, t('Required'), '*'),
+ '$catsenabled' => $catsenabled,
+ '$placeholdercategory' => t('Categories (comma-separated list)'),
+ '$c_text' => (($event_id) ? t('Edit Category') : t('Category')),
+ '$category' => $category,
+ '$required' => '*',
+ '$s_dsel' => datetimesel($f,new \DateTime(),\DateTime::createFromFormat('Y',$syear+5),\DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"), (($event_id) ? t('Edit start date and time') : t('Start date and time')), 'start_text',true,true,'','',true,$first_day),
+ '$n_text' => t('Finish date and time are not known or not relevant'),
+ '$n_checked' => $n_checked,
+ '$f_dsel' => datetimesel($f,new \DateTime(),\DateTime::createFromFormat('Y',$fyear+5),\DateTime::createFromFormat('Y-m-d H:i',"$fyear-$fmonth-$fday $fhour:$fminute"), (($event_id) ? t('Edit finish date and time') : t('Finish date and time')),'finish_text',true,true,'start_text','',false,$first_day),
+ '$nofinish' => array('nofinish', t('Finish date and time are not known or not relevant'), $n_checked, '', array(t('No'),t('Yes')), 'onclick="enableDisableFinishDate();"'),
+ '$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked, t('Important for events that happen in a particular place. Not practical for global holidays.'), array(t('No'),t('Yes'))),
+ '$a_text' => t('Adjust for viewer timezone'),
+ '$d_text' => (($event_id) ? t('Edit Description') : t('Description')),
+ '$d_orig' => $d_orig,
+ '$l_text' => (($event_id) ? t('Edit Location') : t('Location')),
+ '$l_orig' => $l_orig,
+ '$t_orig' => $t_orig,
+ '$sh_text' => t('Share this event'),
+ '$sh_checked' => $sh_checked,
+ '$share' => array('share', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))),
+ '$preview' => t('Preview'),
+ '$permissions' => t('Permission settings'),
+ // populating the acl dialog was a permission description from view_stream because Cal.php, which
+ // displays events, says "since we don't currently have an event permission - use the stream permission"
+ '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'))),
+ '$submit' => t('Submit'),
+ '$advanced' => t('Advanced Options')
+
+ ));
+ /* end edit/create form */
+
+ $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
+ $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
+ if(! $y)
+ $y = intval($thisyear);
+ if(! $m)
+ $m = intval($thismonth);
+
+ $export = false;
+ if(argc() === 4 && argv(3) === 'export')
+ $export = true;
+
+ // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
+ // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
+
+ if($y < 1901)
+ $y = 1900;
+ if($y > 2099)
+ $y = 2100;
+
+ $nextyear = $y;
+ $nextmonth = $m + 1;
+ if($nextmonth > 12) {
+ $nextmonth = 1;
+ $nextyear ++;
+ }
+
+ $prevyear = $y;
+ if($m > 1)
+ $prevmonth = $m - 1;
+ else {
+ $prevmonth = 12;
+ $prevyear --;
+ }
+
+ $dim = get_dim($y,$m);
+ $start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
+ $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
+
+
+ if (argv(1) === 'json'){
+ if (x($_GET,'start')) $start = $_GET['start'];
+ if (x($_GET,'end')) $finish = $_GET['end'];
+ }
+
+ $start = datetime_convert('UTC','UTC',$start);
+ $finish = datetime_convert('UTC','UTC',$finish);
+
+ $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
+ $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
+
+ if (x($_GET,'id')){
+ $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+ from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
+ intval(local_channel()),
+ intval($_GET['id'])
+ );
+ } elseif($export) {
+ $r = q("SELECT * from event where uid = %d
+ AND (( `adjust` = 0 AND ( `dtend` >= '%s' or nofinish = 1 ) AND `dtstart` <= '%s' )
+ OR ( `adjust` = 1 AND ( `dtend` >= '%s' or nofinish = 1 ) AND `dtstart` <= '%s' )) ",
+ intval(local_channel()),
+ dbesc($start),
+ dbesc($finish),
+ dbesc($adjust_start),
+ dbesc($adjust_finish)
+ );
+ }
+ else {
+ // fixed an issue with "nofinish" events not showing up in the calendar.
+ // There's still an issue if the finish date crosses the end of month.
+ // Noting this for now - it will need to be fixed here and in Friendica.
+ // Ultimately the finish date shouldn't be involved in the query.
+
+ $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+ from event left join item on event_hash = resource_id
+ where resource_type = 'event' and event.uid = %d $ignored
+ AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )
+ OR ( adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
+ intval(local_channel()),
+ dbesc($start),
+ dbesc($finish),
+ dbesc($adjust_start),
+ dbesc($adjust_finish)
+ );
+
+ }
+
+ $links = array();
+
+ if($r && ! $export) {
+ xchan_query($r);
+ $r = fetch_post_tags($r,true);
+
+ $r = sort_by_date($r);
+ }
+
+ if($r) {
+ foreach($r as $rr) {
+ $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
+ if(! x($links,$j))
+ $links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j;
+ }
+ }
+
+ $events=array();
+
+ $last_date = '';
+ $fmt = t('l, F j');
+
+ if($r) {
+
+ foreach($r as $rr) {
+
+ $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
+ $d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
+ $d = day_translate($d);
+
+ $start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
+ if ($rr['nofinish']){
+ $end = null;
+ } else {
+ $end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
+ }
+
+
+ $is_first = ($d !== $last_date);
+
+ $last_date = $d;
+
+ $edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false);
+
+ $drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');
+
+ $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
+ if(! $title) {
+ list($title, $_trash) = explode(""; var_dump(\App::$argv); killme();
+
+ switch(\App::$argv[1]){
+ case "image":
+ $path = array( array(z_root()."/fbrowser/image/", t("Photos")));
+ $albums = false;
+ $sql_extra = "";
+ $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
+
+ if (\App::$argc==2){
+ $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
+ intval(local_channel())
+ );
+ // anon functions only from 5.3.0... meglio tardi che mai..
+ $albums = array_map( "self::folder1" , $albums);
+
+ }
+
+ $album = "";
+ if (\App::$argc==3){
+ $album = hex2bin(\App::$argv[2]);
+ $sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+ $sql_extra2 = "";
+ $path[]=array(z_root() . "/fbrowser/image/" . \App::$argv[2] . "/", $album);
+ }
+
+ $r = q("SELECT `resource_id`, `id`, `filename`, type, min(`imgscale`) AS `hiq`,max(`imgscale`) AS `loq`, `description`
+ FROM `photo` WHERE `uid` = %d $sql_extra
+ GROUP BY `resource_id` $sql_extra2",
+ intval(local_channel())
+ );
+
+ $files = array_map("self::files1", $r);
+
+ $tpl = get_markup_template("filebrowser.tpl");
+ echo replace_macros($tpl, array(
+ '$type' => 'image',
+ '$baseurl' => z_root(),
+ '$path' => $path,
+ '$folders' => $albums,
+ '$files' =>$files,
+ '$cancel' => t('Cancel'),
+ ));
+
+
+ break;
+ case "file":
+ if (\App::$argc==2){
+ $files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
+ intval(local_channel())
+ );
+
+ $files = array_map("self::files2", $files);
+ //echo ""; var_dump($files); killme();
+
+
+ $tpl = get_markup_template("filebrowser.tpl");
+ echo replace_macros($tpl, array(
+ '$type' => 'file',
+ '$baseurl' => z_root(),
+ '$path' => array( array(z_root()."/fbrowser/image/", t("Files")) ),
+ '$folders' => false,
+ '$files' =>$files,
+ '$cancel' => t('Cancel'),
+ ));
+
+ }
+
+ break;
+ }
+
+
+ killme();
+
+ }
+
+ private static function folder1($el){
+ return array(bin2hex($el['album']),$el['album']);
+ }
+
+
+ private static function files1($rr){
+
+ $ph = photo_factory('');
+ $types = $ph->supportedTypes();
+ $ext = $types[$rr['type']];
+
+ $filename_e = $rr['filename'];
+
+ return array(
+ z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['hiq'] . '.' .$ext,
+ $filename_e,
+ z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['loq'] . '.'. $ext
+ );
+ }
+
+ private static function files2($rr){
+ list($m1,$m2) = explode("/",$rr['filetype']);
+ $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
+
+ if(\App::get_template_engine() === 'internal') {
+ $filename_e = template_escape($rr['filename']);
+ }
+ else {
+ $filename_e = $rr['filename'];
+ }
+
+ return array( z_root() . '/attach/' . $rr['id'], $filename_e, z_root() . '/images/icons/16/' . $filetype . '.png');
+ }
+
+
+}
diff --git a/Zotlabs/Module/Feed.php b/Zotlabs/Module/Feed.php
new file mode 100644
index 000000000..47871eafb
--- /dev/null
+++ b/Zotlabs/Module/Feed.php
@@ -0,0 +1,48 @@
+ 1) {
+ $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_address = '%s' limit 1",
+ dbesc(argv(1))
+ );
+ if(!($r && count($r)))
+ killme();
+
+ $channel = $r[0];
+
+ if(observer_prohibited(true))
+ killme();
+
+ logger('mod_feed: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
+
+ echo get_public_feed($channel,$params);
+
+ killme();
+ }
+
+ }
+
+
+
+}
diff --git a/Zotlabs/Module/Ffsapi.php b/Zotlabs/Module/Ffsapi.php
new file mode 100644
index 000000000..f3ade73c2
--- /dev/null
+++ b/Zotlabs/Module/Ffsapi.php
@@ -0,0 +1,71 @@
+
+
+ var baseurl = '$baseurl';
+
+ var data = {
+ "origin": baseurl,
+ // currently required
+ "name": '$name',
+ "iconURL": baseurl+"/images/hz-16.png",
+ "icon32URL": baseurl+"/images/hz-32.png",
+ "icon64URL": baseurl+"/images/hz-64.png",
+
+ // at least one of these must be defined
+ // "workerURL": baseurl+"/worker.js",
+ // "sidebarURL": baseurl+"/sidebar.htm",
+ "shareURL": baseurl+"/rpost?f=&url=%{url}",
+
+ // status buttons are scheduled for Firefox 26 or 27
+ //"statusURL": baseurl+"/statusPanel.html",
+
+ // social bookmarks are available in Firefox 26
+ "markURL": baseurl+"/rbmark?f=&url=%{url}&title=%{title}",
+ // icons should be 32x32 pixels
+ // "markedIcon": baseurl+"/images/checkbox-checked-32.png",
+ // "unmarkedIcon": baseurl+"/images/checkbox-unchecked-32.png",
+ "unmarkedIcon": baseurl+"/images/hz-bookmark-32.png",
+
+ // should be available for display purposes
+ "description": "$description",
+ "author": "$author",
+ "homepageURL": "$homepage",
+
+ // optional
+ "version": "1.0"
+ }
+
+ function activate(node) {
+ var event = new CustomEvent("ActivateSocialFeature");
+ var jdata = JSON.stringify(data);
+ node.setAttribute("data-service", JSON.stringify(data));
+ node.dispatchEvent(event);
+ }
+
+
+
+
+EOT;
+
+ return $s;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Fhublocs.php b/Zotlabs/Module/Fhublocs.php
new file mode 100644
index 000000000..f5b439421
--- /dev/null
+++ b/Zotlabs/Module/Fhublocs.php
@@ -0,0 +1,85 @@
+ 1) ? intval(\App::$argv[1]) : 0);
+
+ logger('filer: tag ' . $term . ' item ' . $item_id);
+
+ if($item_id && strlen($term)){
+ // file item
+ store_item_tag(local_channel(),$item_id,TERM_OBJ_POST,TERM_FILE,$term,'');
+
+ // protect the entire conversation from periodic expiration
+
+ $r = q("select parent from item where id = %d and uid = %d limit 1",
+ intval($item_id),
+ intval(local_channel())
+ );
+ if($r) {
+ $x = q("update item set item_retained = 1 where id = %d and uid = %d",
+ intval($r[0]['parent']),
+ intval(local_channel())
+ );
+ }
+ }
+ else {
+ $filetags = array();
+ $r = q("select distinct(term) from term where uid = %d and ttype = %d order by term asc",
+ intval(local_channel()),
+ intval(TERM_FILE)
+ );
+ if(count($r)) {
+ foreach($r as $rr)
+ $filetags[] = $rr['term'];
+ }
+ $tpl = get_markup_template("filer_dialog.tpl");
+ $o = replace_macros($tpl, array(
+ '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
+ '$submit' => t('Save'),
+ ));
+
+ echo $o;
+ }
+ killme();
+ }
+
+}
diff --git a/Zotlabs/Module/Filerm.php b/Zotlabs/Module/Filerm.php
new file mode 100644
index 000000000..cbf6a118d
--- /dev/null
+++ b/Zotlabs/Module/Filerm.php
@@ -0,0 +1,39 @@
+ 1) ? intval(\App::$argv[1]) : 0);
+
+ logger('filerm: tag ' . $term . ' item ' . $item_id);
+
+ if($item_id && strlen($term)) {
+ $r = q("delete from term where uid = %d and ttype = %d and oid = %d and term = '%s'",
+ intval(local_channel()),
+ intval(($category) ? TERM_CATEGORY : TERM_FILE),
+ intval($item_id),
+ dbesc($term)
+ );
+ }
+
+ if(x($_SESSION,'return_url'))
+ goaway(z_root() . '/' . $_SESSION['return_url']);
+
+ killme();
+ }
+
+}
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php
new file mode 100644
index 000000000..c3ef22e32
--- /dev/null
+++ b/Zotlabs/Module/Filestorage.php
@@ -0,0 +1,174 @@
+set_from_array($_REQUEST);
+ $x = $acl->get();
+
+ $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource);
+
+ //get the object before permissions change so we can catch eventual former allowed members
+ $object = get_file_activity_object($channel_id, $resource, $cloudPath);
+
+ attach_change_permissions($channel_id, $resource, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], $recurse);
+
+ file_activity($channel_id, $object, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], 'post', $notify);
+
+ goaway($cloudPath);
+ }
+
+ function get() {
+
+ if(argc() > 1)
+ $which = argv(1);
+ else {
+ notice( t('Requested profile is not available.') . EOL );
+ \App::$error = 404;
+ return;
+ }
+
+ $r = q("select * from channel where channel_address = '%s'",
+ dbesc($which)
+ );
+ if($r) {
+ $channel = $r[0];
+ $owner = intval($r[0]['channel_id']);
+ }
+
+ $observer = \App::get_observer();
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+ $perms = get_all_perms($owner, $ob_hash);
+
+ if(! $perms['view_storage']) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ // Since we have ACL'd files in the wild, but don't have ACL here yet, we
+ // need to return for anyone other than the owner, despite the perms check for now.
+
+ $is_owner = (((local_channel()) && ($owner == local_channel())) ? true : false);
+ if(! $is_owner) {
+ info( t('Permission Denied.') . EOL );
+ return;
+ }
+
+ if(argc() > 3 && argv(3) === 'delete') {
+ if(! $perms['write_storage']) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $file = intval(argv(2));
+ $r = q("SELECT hash FROM attach WHERE id = %d AND uid = %d LIMIT 1",
+ dbesc($file),
+ intval($owner)
+ );
+ if(! $r) {
+ notice( t('File not found.') . EOL);
+ goaway(z_root() . '/cloud/' . $which);
+ }
+
+ $f = $r[0];
+ $channel = \App::get_channel();
+
+ $parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
+
+ attach_delete($owner, $f['hash']);
+
+ goaway($parentpath);
+ }
+
+ if(argc() > 3 && argv(3) === 'edit') {
+ require_once('include/acl_selectors.php');
+ if(! $perms['write_storage']) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+ $file = intval(argv(2));
+
+ $r = q("select id, uid, folder, filename, revision, flags, is_dir, os_storage, hash, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and uid = %d limit 1",
+ intval($file),
+ intval($owner)
+ );
+
+ $f = $r[0];
+ $channel = \App::get_channel();
+
+ $cloudpath = get_cloudpath($f) . (intval($f['is_dir']) ? '?f=&davguest=1' : '');
+ $parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
+
+ $aclselect_e = populate_acl($f, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage'));
+ $is_a_dir = (intval($f['is_dir']) ? true : false);
+
+ $lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock');
+
+ // Encode path that is used for link so it's a valid URL
+ // Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly
+ $encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath));
+
+ $o = replace_macros(get_markup_template('attach_edit.tpl'), array(
+ '$header' => t('Edit file permissions'),
+ '$file' => $f,
+ '$cloudpath' => z_root() . '/' . $encoded_path,
+ '$parentpath' => $parentpath,
+ '$uid' => $channel['channel_id'],
+ '$channelnick' => $channel['channel_address'],
+ '$permissions' => t('Permissions'),
+ '$aclselect' => $aclselect_e,
+ '$lockstate' => $lockstate,
+ '$permset' => t('Set/edit permissions'),
+ '$recurse' => array('recurse', t('Include all files and sub folders'), 0, '', array(t('No'), t('Yes'))),
+ '$backlink' => t('Return to file list'),
+ '$isadir' => $is_a_dir,
+ '$cpdesc' => t('Copy/paste this code to attach file to a post'),
+ '$cpldesc' => t('Copy/paste this URL to link file from a web page'),
+ '$submit' => t('Submit'),
+ '$attach_btn_title' => t('Share this file'),
+ '$link_btn_title' => t('Show URL to this file'),
+ '$notify' => array('notify', t('Notify your contacts about this file'), 0, '', array(t('No'), t('Yes')))
+ ));
+
+ echo $o;
+ killme();
+ }
+
+ goaway(z_root() . '/cloud/' . $which);
+ }
+
+}
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
new file mode 100644
index 000000000..da9ab3670
--- /dev/null
+++ b/Zotlabs/Module/Follow.php
@@ -0,0 +1,68 @@
+ $v) {
+ if(strpos($k,'abook_') === 0) {
+ $clone[$k] = $v;
+ }
+ }
+ unset($clone['abook_id']);
+ unset($clone['abook_account']);
+ unset($clone['abook_channel']);
+
+ $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']);
+ if($abconfig)
+ $clone['abconfig'] = $abconfig;
+
+ build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone)), true);
+
+ $can_view_stream = intval(get_abconfig($channel['channel_id'],$clone['abook_xchan'],'their_perms','view_stream'));
+
+ // If we can view their stream, pull in some posts
+
+ if(($can_view_stream) || ($result['abook']['xchan_network'] === 'rss'))
+ \Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id']));
+
+ goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
+
+ }
+
+ function get() {
+ if(! local_channel()) {
+ return login();
+ }
+ }
+}
diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php
new file mode 100644
index 000000000..09d761887
--- /dev/null
+++ b/Zotlabs/Module/Getfile.php
@@ -0,0 +1,101 @@
+ $d1) || ($time < $d2)) {
+ logger('time outside allowable range');
+ killme();
+ }
+
+ if(! rsa_verify($hash . '.' . $time,base64url_decode($sig),$channel['channel_pubkey'])) {
+ logger('verify failed.');
+ killme();
+ }
+
+
+ $r = attach_by_hash($resource,$revision);
+
+ if(! $r['success']) {
+ notice( $r['message'] . EOL);
+ return;
+ }
+
+
+ $unsafe_types = array('text/html','text/css','application/javascript');
+
+ if(in_array($r['data']['filetype'],$unsafe_types)) {
+ header('Content-type: text/plain');
+ }
+ else {
+ header('Content-type: ' . $r['data']['filetype']);
+ }
+
+ header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"');
+ if(intval($r['data']['os_storage'])) {
+ $fname = dbunescbin($r['data']['data']);
+ if(strpos($fname,'store') !== false)
+ $istream = fopen($fname,'rb');
+ else
+ $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname,'rb');
+ $ostream = fopen('php://output','wb');
+ if($istream && $ostream) {
+ pipe_streams($istream,$ostream);
+ fclose($istream);
+ fclose($ostream);
+ }
+ }
+ else
+ echo dbunescbin($r['data']['data']);
+ killme();
+
+
+
+ }
+}
diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php
new file mode 100644
index 000000000..254ee6ef2
--- /dev/null
+++ b/Zotlabs/Module/Group.php
@@ -0,0 +1,244 @@
+ t('Submit'));
+
+ if((argc() == 2) && (argv(1) === 'new')) {
+
+ return replace_macros($tpl, $context + array(
+ '$title' => t('Create a group of channels.'),
+ '$gname' => array('groupname',t('Privacy group name: '), '', ''),
+ '$gid' => 'new',
+ '$public' => array('public',t('Members are visible to other channels'), false, ''),
+ '$form_security_token' => get_form_security_token("group_edit"),
+ ));
+
+
+ }
+
+ if((argc() == 3) && (argv(1) === 'drop')) {
+ check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
+
+ if(intval(argv(2))) {
+ $r = q("SELECT `name` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval(argv(2)),
+ intval(local_channel())
+ );
+ if($r)
+ $result = group_rmv(local_channel(),$r[0]['gname']);
+ if($result)
+ info( t('Privacy group removed.') . EOL);
+ else
+ notice( t('Unable to remove privacy group.') . EOL);
+ }
+ goaway(z_root() . '/group');
+ // NOTREACHED
+ }
+
+
+ if((argc() > 2) && intval(argv(1)) && argv(2)) {
+
+ check_form_security_token_ForbiddenOnErr('group_member_change', 't');
+
+ $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
+ dbesc(base64url_decode(argv(2))),
+ intval(local_channel())
+ );
+ if(count($r))
+ $change = base64url_decode(argv(2));
+
+ }
+
+ if((argc() > 1) && (intval(argv(1)))) {
+
+ require_once('include/acl_selectors.php');
+ $r = q("SELECT * FROM `groups` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
+ intval(argv(1)),
+ intval(local_channel())
+ );
+ if(! $r) {
+ notice( t('Privacy group not found.') . EOL );
+ goaway(z_root() . '/connections');
+ }
+ $group = $r[0];
+
+
+ $members = group_get_members($group['id']);
+
+ $preselected = array();
+ if(count($members)) {
+ foreach($members as $member)
+ if(! in_array($member['xchan_hash'],$preselected))
+ $preselected[] = $member['xchan_hash'];
+ }
+
+ if($change) {
+
+ if(in_array($change,$preselected)) {
+ group_rmv_member(local_channel(),$group['gname'],$change);
+ }
+ else {
+ group_add_member(local_channel(),$group['gname'],$change);
+ }
+
+ $members = group_get_members($group['id']);
+
+ $preselected = array();
+ if(count($members)) {
+ foreach($members as $member)
+ $preselected[] = $member['xchan_hash'];
+ }
+ }
+
+ $drop_tpl = get_markup_template('group_drop.tpl');
+ $drop_txt = replace_macros($drop_tpl, array(
+ '$id' => $group['id'],
+ '$delete' => t('Delete'),
+ '$form_security_token' => get_form_security_token("group_drop"),
+ ));
+
+
+ $context = $context + array(
+ '$title' => t('Privacy group editor'),
+ '$gname' => array('groupname',t('Privacy group name: '),$group['gname'], ''),
+ '$gid' => $group['id'],
+ '$drop' => $drop_txt,
+ '$public' => array('public',t('Members are visible to other channels'), $group['visible'], ''),
+ '$form_security_token' => get_form_security_token('group_edit'),
+ );
+
+ }
+
+ if(! isset($group))
+ return;
+
+ $groupeditor = array(
+ 'label_members' => t('Members'),
+ 'members' => array(),
+ 'label_contacts' => t('All Connected Channels'),
+ 'contacts' => array(),
+ );
+
+ $sec_token = addslashes(get_form_security_token('group_member_change'));
+ $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
+ foreach($members as $member) {
+ if($member['xchan_url']) {
+ $member['archived'] = (intval($member['abook_archived']) ? true : false);
+ $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;';
+ $groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode);
+ }
+ else
+ group_rmv_member(local_channel(),$group['gname'],$member['xchan_hash']);
+ }
+
+ $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
+ intval(local_channel())
+ );
+
+ if(count($r)) {
+ $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
+ foreach($r as $member) {
+ if(! in_array($member['xchan_hash'],$preselected)) {
+ $member['archived'] = (intval($member['abook_archived']) ? true : false);
+ $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;';
+ $groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode);
+ }
+ }
+ }
+
+ $context['$groupeditor'] = $groupeditor;
+ $context['$desc'] = t('Click on a channel to add or remove.');
+
+ if($change) {
+ $tpl = get_markup_template('groupeditor.tpl');
+ echo replace_macros($tpl, $context);
+ killme();
+ }
+
+ return replace_macros($tpl, $context);
+
+ }
+
+
+}
diff --git a/Zotlabs/Module/Hcard.php b/Zotlabs/Module/Hcard.php
new file mode 100644
index 000000000..93c8d3ece
--- /dev/null
+++ b/Zotlabs/Module/Hcard.php
@@ -0,0 +1,60 @@
+ 1)
+ $which = argv(1);
+ else {
+ notice( t('Requested profile is not available.') . EOL );
+ \App::$error = 404;
+ return;
+ }
+
+ $profile = '';
+ $channel = \App::get_channel();
+
+ if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+ $which = $channel['channel_address'];
+ $profile = argv(1);
+ $r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
+ intval($profile),
+ intval(local_channel())
+ );
+ if(! $r)
+ $profile = '';
+ $profile = $r[0]['profile_guid'];
+ }
+
+ \App::$page['htmlhead'] .= '' . "\r\n" ;
+
+ if(! $profile) {
+ $x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
+ dbesc(argv(1))
+ );
+ if($x) {
+ \App::$profile = $x[0];
+ }
+ }
+
+ profile_load($which,$profile);
+
+
+ }
+
+
+ function get() {
+
+ require_once('include/widgets.php');
+ return widget_profile(array());
+
+
+
+ }
+
+
+
+}
diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php
new file mode 100644
index 000000000..cc46c550b
--- /dev/null
+++ b/Zotlabs/Module/Help.php
@@ -0,0 +1,146 @@
+';
+ $o .= '';
+ $o .= '' . t('Documentation Search') . ' - ' . htmlspecialchars($_REQUEST['search']) . '
';
+ $o .= '';
+ $o .= '';
+
+ $r = search_doc_files($_REQUEST['search']);
+ if($r) {
+ $o .= '';
+ $o .= '';
+ }
+ return $o;
+ }
+
+
+ global $lang;
+
+ $doctype = 'markdown';
+
+ $text = '';
+
+ if(argc() > 1) {
+ $path = '';
+ for($x = 1; $x < argc(); $x ++) {
+ if(strlen($path))
+ $path .= '/';
+ $path .= argv($x);
+ }
+ $title = basename($path);
+
+ $text = load_doc_file('doc/' . $path . '.md');
+ \App::$page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags($title)));
+
+ if(! $text) {
+ $text = load_doc_file('doc/' . $path . '.bb');
+ if($text)
+ $doctype = 'bbcode';
+ \App::$page['title'] = t('Help:') . ' ' . ucwords(str_replace('_',' ',notags($title)));
+ }
+ if(! $text) {
+ $text = load_doc_file('doc/' . $path . '.html');
+ if($text)
+ $doctype = 'html';
+ \App::$page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags($title)));
+ }
+ }
+
+ if(! $text) {
+ $text = load_doc_file('doc/Site.md');
+ \App::$page['title'] = t('Help');
+ }
+ if(! $text) {
+ $doctype = 'bbcode';
+ $text = load_doc_file('doc/main.bb');
+ \App::$page['title'] = t('Help');
+ }
+
+ if(! strlen($text)) {
+ header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
+ $tpl = get_markup_template("404.tpl");
+ return replace_macros($tpl, array(
+ '$message' => t('Page not found.' )
+ ));
+ }
+
+ if($doctype === 'html')
+ $content = $text;
+ if($doctype === 'markdown') {
+ require_once('library/markdown.php');
+ # escape #include tags
+ $text = preg_replace('/#include/ism', '%%include', $text);
+ $content = Markdown($text);
+ $content = preg_replace('/%%include/ism', '#include', $content);
+ }
+ if($doctype === 'bbcode') {
+ require_once('include/bbcode.php');
+ $content = bbcode($text);
+ // bbcode retargets external content to new windows. This content is internal.
+ $content = str_replace(' target="_blank"','',$content);
+ }
+
+ $content = preg_replace_callback("/#include (.*?)\;/ism", 'self::preg_callback_help_include', $content);
+
+ return replace_macros(get_markup_template("help.tpl"), array(
+ '$title' => t('$Projectname Documentation'),
+ '$content' => translate_projectname($content)
+ ));
+
+ }
+
+
+ private static function preg_callback_help_include($matches) {
+
+ if($matches[1]) {
+ $include = str_replace($matches[0],load_doc_file($matches[1]),$matches[0]);
+ if(preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) {
+ require_once('include/bbcode.php');
+ $include = bbcode($include);
+ $include = str_replace(' target="_blank"','',$include);
+ }
+ elseif(preg_match('/\.md$/', $matches[1])) {
+ require_once('library/markdown.php');
+ $include = Markdown($include);
+ }
+ return $include;
+ }
+
+ }
+
+
+}
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php
new file mode 100644
index 000000000..79449c3b2
--- /dev/null
+++ b/Zotlabs/Module/Home.php
@@ -0,0 +1,102 @@
+ 1 && argv(1) === 'splash') ? true : false);
+
+ $channel = \App::get_channel();
+ if(local_channel() && $channel && $channel['xchan_url'] && ! $splash) {
+ $dest = $channel['channel_startpage'];
+ if(! $dest)
+ $dest = get_pconfig(local_channel(),'system','startpage');
+ if(! $dest)
+ $dest = get_config('system','startpage');
+ if(! $dest)
+ $dest = z_root() . '/network';
+
+ goaway($dest);
+ }
+
+ if(remote_channel() && (! $splash) && $_SESSION['atoken']) {
+ $r = q("select * from atoken where atoken_id = %d",
+ intval($_SESSION['atoken'])
+ );
+ if($r) {
+ $x = channelx_by_n($r[0]['atoken_uid']);
+ if($x) {
+ goaway(z_root() . '/channel/' . $x['channel_address']);
+ }
+ }
+ }
+
+
+ if(get_account_id() && ! $splash) {
+ goaway(z_root() . '/new_channel');
+ }
+
+ }
+
+
+ function get($update = 0, $load = false) {
+
+ $o = '';
+
+
+ if(x($_SESSION,'theme'))
+ unset($_SESSION['theme']);
+ if(x($_SESSION,'mobile_theme'))
+ unset($_SESSION['mobile_theme']);
+
+ $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false);
+
+ call_hooks('home_content',$o);
+ if($o)
+ return $o;
+
+ $frontpage = get_config('system','frontpage');
+ if($frontpage) {
+ if(strpos($frontpage,'include:') !== false) {
+ $file = trim(str_replace('include:' , '', $frontpage));
+ if(file_exists($file)) {
+ \App::$page['template'] = 'full';
+ \App::$page['title'] = t('$Projectname');
+ $o .= file_get_contents($file);
+ return $o;
+ }
+ }
+ if(strpos($frontpage,'http') !== 0)
+ $frontpage = z_root() . '/' . $frontpage;
+ if(intval(get_config('system','mirror_frontpage'))) {
+ $o = '' . t('$Projectname') . ' ';
+ echo $o;
+ killme();
+ }
+ goaway($frontpage);
+ }
+
+
+ $sitename = get_config('system','sitename');
+ if($sitename)
+ $o .= '' . sprintf( t("Welcome to %s") ,$sitename) . '
';
+
+ $loginbox = get_config('system','login_on_homepage');
+ if(intval($loginbox) || $loginbox === false)
+ $o .= login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+
+ return $o;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Hostxrd.php b/Zotlabs/Module/Hostxrd.php
new file mode 100644
index 000000000..1aae8da9e
--- /dev/null
+++ b/Zotlabs/Module/Hostxrd.php
@@ -0,0 +1,24 @@
+ \App::get_hostname(),
+ '$zroot' => z_root()
+ ));
+ $arr = array('xrd' => $x);
+ call_hooks('hostxrd',$arr);
+
+ echo $arr['xrd'];
+ killme();
+ }
+
+}
diff --git a/Zotlabs/Module/Id.php b/Zotlabs/Module/Id.php
new file mode 100644
index 000000000..e053bf99c
--- /dev/null
+++ b/Zotlabs/Module/Id.php
@@ -0,0 +1,319 @@
+ t('First Name'),
+ 'namePerson/last' => t('Last Name'),
+ 'namePerson/friendly' => t('Nickname'),
+ 'namePerson' => t('Full Name'),
+ 'contact/internet/email' => t('Email'),
+ 'contact/email' => t('Email'),
+ 'media/image/aspect11' => t('Profile Photo'),
+ 'media/image' => t('Profile Photo'),
+ 'media/image/default' => t('Profile Photo'),
+ 'media/image/16x16' => t('Profile Photo 16px'),
+ 'media/image/32x32' => t('Profile Photo 32px'),
+ 'media/image/48x48' => t('Profile Photo 48px'),
+ 'media/image/64x64' => t('Profile Photo 64px'),
+ 'media/image/80x80' => t('Profile Photo 80px'),
+ 'media/image/128x128' => t('Profile Photo 128px'),
+ 'timezone' => t('Timezone'),
+ 'contact/web/default' => t('Homepage URL'),
+ 'language/pref' => t('Language'),
+ 'birthDate/birthYear' => t('Birth Year'),
+ 'birthDate/birthMonth' => t('Birth Month'),
+ 'birthDate/birthday' => t('Birth Day'),
+ 'birthDate' => t('Birthdate'),
+ 'gender' => t('Gender'),
+);
+
+
+/**
+ * @brief Entrypoint for the OpenID implementation.
+ *
+ * @param App &$a
+ */
+
+class Id extends \Zotlabs\Web\Controller {
+
+ function init() {
+
+ logger('id: ' . print_r($_REQUEST, true));
+
+ if(argc() > 1) {
+ $which = argv(1);
+ } else {
+ \App::$error = 404;
+ return;
+ }
+
+ $profile = '';
+ $channel = \App::get_channel();
+ profile_load($which,$profile);
+
+ $op = new MysqlProvider;
+ $op->server();
+ }
+
+ /**
+ * @brief Returns user data needed for OpenID.
+ *
+ * If no $handle is provided we will use local_channel() by default.
+ *
+ * @param string $handle (default null)
+ * @return boolean|array
+ */
+ static public function getUserData($handle = null) {
+ if (! local_channel()) {
+ notice( t('Permission denied.') . EOL);
+ \App::$page['content'] = login();
+
+ return false;
+ }
+
+ // logger('handle: ' . $handle);
+
+ if ($handle) {
+ $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_address = '%s' limit 1",
+ dbesc($handle)
+ );
+ } else {
+ $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d",
+ intval(local_channel())
+ );
+ }
+
+ if (! r)
+ return false;
+
+ $x = q("select * from account where account_id = %d limit 1",
+ intval($r[0]['channel_account_id'])
+ );
+ if ($x)
+ $r[0]['email'] = $x[0]['account_email'];
+
+ $p = q("select * from profile where is_default = 1 and uid = %d limit 1",
+ intval($r[0]['channel_account_id'])
+ );
+
+ $gender = '';
+ if ($p[0]['gender'] == t('Male'))
+ $gender = 'M';
+ if ($p[0]['gender'] == t('Female'))
+ $gender = 'F';
+
+ $r[0]['firstName'] = ((strpos($r[0]['channel_name'],' ')) ? substr($r[0]['channel_name'],0,strpos($r[0]['channel_name'],' ')) : $r[0]['channel_name']);
+ $r[0]['lastName'] = ((strpos($r[0]['channel_name'],' ')) ? substr($r[0]['channel_name'],strpos($r[0]['channel_name'],' ')+1) : '');
+ $r[0]['namePerson'] = $r[0]['channel_name'];
+ $r[0]['pphoto'] = $r[0]['xchan_photo_l'];
+ $r[0]['pphoto16'] = z_root() . '/photo/profile/16/' . $r[0]['channel_id'] . '.jpg';
+ $r[0]['pphoto32'] = z_root() . '/photo/profile/32/' . $r[0]['channel_id'] . '.jpg';
+ $r[0]['pphoto48'] = z_root() . '/photo/profile/48/' . $r[0]['channel_id'] . '.jpg';
+ $r[0]['pphoto64'] = z_root() . '/photo/profile/64/' . $r[0]['channel_id'] . '.jpg';
+ $r[0]['pphoto80'] = z_root() . '/photo/profile/80/' . $r[0]['channel_id'] . '.jpg';
+ $r[0]['pphoto128'] = z_root() . '/photo/profile/128/' . $r[0]['channel_id'] . '.jpg';
+ $r[0]['timezone'] = $r[0]['channel_timezone'];
+ $r[0]['url'] = $r[0]['xchan_url'];
+ $r[0]['language'] = (($x[0]['account_language']) ? $x[0]['account_language'] : 'en');
+ $r[0]['birthyear'] = ((intval(substr($p[0]['dob'],0,4))) ? intval(substr($p[0]['dob'],0,4)) : '');
+ $r[0]['birthmonth'] = ((intval(substr($p[0]['dob'],5,2))) ? intval(substr($p[0]['dob'],5,2)) : '');
+ $r[0]['birthday'] = ((intval(substr($p[0]['dob'],8,2))) ? intval(substr($p[0]['dob'],8,2)) : '');
+ $r[0]['birthdate'] = (($r[0]['birthyear'] && $r[0]['birthmonth'] && $r[0]['birthday']) ? $p[0]['dob'] : '');
+ $r[0]['gender'] = $gender;
+
+ return $r[0];
+
+ /*
+ * if(isset($_POST['login'],$_POST['password'])) {
+ * $login = mysql_real_escape_string($_POST['login']);
+ * $password = sha1($_POST['password']);
+ * $q = mysql_query("SELECT * FROM Users WHERE login = '$login' AND password = '$password'");
+ * if($data = mysql_fetch_assoc($q)) {
+ * return $data;
+ * }
+ * if($handle) {
+ * echo 'Wrong login/password.';
+ * }
+ * }
+ * if($handle) {
+ * ?>
+ *
+ * 'firstName',
+ 'namePerson/last' => 'lastName',
+ 'namePerson/friendly' => 'channel_address',
+ 'namePerson' => 'namePerson',
+ 'contact/internet/email' => 'email',
+ 'contact/email' => 'email',
+ 'media/image/aspect11' => 'pphoto',
+ 'media/image' => 'pphoto',
+ 'media/image/default' => 'pphoto',
+ 'media/image/16x16' => 'pphoto16',
+ 'media/image/32x32' => 'pphoto32',
+ 'media/image/48x48' => 'pphoto48',
+ 'media/image/64x64' => 'pphoto64',
+ 'media/image/80x80' => 'pphoto80',
+ 'media/image/128x128' => 'pphoto128',
+ 'timezone' => 'timezone',
+ 'contact/web/default' => 'url',
+ 'language/pref' => 'language',
+ 'birthDate/birthYear' => 'birthyear',
+ 'birthDate/birthMonth' => 'birthmonth',
+ 'birthDate/birthday' => 'birthday',
+ 'birthDate' => 'birthdate',
+ 'gender' => 'gender',
+ );
+
+ function setup($identity, $realm, $assoc_handle, $attributes) {
+ global $attrMap;
+
+ // logger('identity: ' . $identity);
+ // logger('realm: ' . $realm);
+ // logger('assoc_handle: ' . $assoc_handle);
+ // logger('attributes: ' . print_r($attributes,true));
+
+ $data = \Zotlabs\Module\Id::getUserData($assoc_handle);
+
+
+ /** @FIXME this needs to be a template with localised strings */
+
+ $o .= '';
+
+ \App::$page['content'] .= $o;
+ }
+
+ function checkid($realm, &$attributes) {
+
+ logger('checkid: ' . $realm);
+ logger('checkid attrs: ' . print_r($attributes,true));
+
+ if(isset($_POST['cancel'])) {
+ $this->cancel();
+ }
+
+ $data = \Zotlabs\Module\Id::getUserData();
+ if(! $data) {
+ return false;
+ }
+
+ $q = get_pconfig(local_channel(), 'openid', $realm);
+
+ $attrs = array();
+ if($q) {
+ $attrs = $q;
+ } elseif(isset($_POST['attributes'])) {
+ $attrs = array_keys($_POST['attributes']);
+ } elseif(!isset($_POST['once']) && !isset($_POST['always'])) {
+ return false;
+ }
+
+ $attributes = array();
+ foreach($attrs as $attr) {
+ if(isset($this->attrFieldMap[$attr])) {
+ $attributes[$attr] = $data[$this->attrFieldMap[$attr]];
+ }
+ }
+
+ if(isset($_POST['always'])) {
+ set_pconfig(local_channel(),'openid',$realm,array_keys($attributes));
+ }
+
+ return z_root() . '/id/' . $data['channel_address'];
+ }
+
+ function assoc_handle() {
+ logger('assoc_handle');
+ $channel = \App::get_channel();
+
+ return z_root() . '/channel/' . $channel['channel_address'];
+ }
+
+ function setAssoc($handle, $data) {
+ logger('setAssoc');
+ $channel = channelx_by_nick(basename($handle));
+ if($channel)
+ set_pconfig($channel['channel_id'],'openid','associate',$data);
+ }
+
+ function getAssoc($handle) {
+ logger('getAssoc: ' . $handle);
+
+ $channel = channelx_by_nick(basename($handle));
+ if($channel)
+ return get_pconfig($channel['channel_id'], 'openid', 'associate');
+
+ return false;
+ }
+
+ function delAssoc($handle) {
+ logger('delAssoc');
+ $channel = channelx_by_nick(basename($handle));
+ if($channel)
+ return del_pconfig($channel['channel_id'], 'openid', 'associate');
+ }
+ }
+
diff --git a/Zotlabs/Module/Impel.php b/Zotlabs/Module/Impel.php
new file mode 100644
index 000000000..735c311d0
--- /dev/null
+++ b/Zotlabs/Module/Impel.php
@@ -0,0 +1,199 @@
+ false);
+
+ if(! local_channel())
+ json_return_and_die($ret);
+
+ logger('impel: ' . print_r($_REQUEST,true), LOGGER_DATA);
+
+ $elm = $_REQUEST['element'];
+ $x = base64url_decode($elm);
+ if(! $x)
+ json_return_and_die($ret);
+
+ $j = json_decode($x,true);
+ if(! $j)
+ json_return_and_die($ret);
+
+ $channel = \App::get_channel();
+
+ $arr = array();
+ $is_menu = false;
+
+ // a portable menu has its links rewritten with the local baseurl
+ $portable_menu = false;
+
+ switch($j['type']) {
+ case 'webpage':
+ $arr['item_type'] = ITEM_TYPE_WEBPAGE;
+ $namespace = 'WEBPAGE';
+ $installed_type = t('webpage');
+ break;
+ case 'block':
+ $arr['item_type'] = ITEM_TYPE_BLOCK;
+ $namespace = 'BUILDBLOCK';
+ $installed_type = t('block');
+ break;
+ case 'layout':
+ $arr['item_type'] = ITEM_TYPE_PDL;
+ $namespace = 'PDL';
+ $installed_type = t('layout');
+ break;
+ case 'portable-menu':
+ $portable_menu = true;
+ // fall through
+ case 'menu':
+ $is_menu = true;
+ $installed_type = t('menu');
+ break;
+ default:
+ logger('mod_impel: unrecognised element type' . print_r($j,true));
+ break;
+ }
+
+ if($is_menu) {
+ $m = array();
+ $m['menu_channel_id'] = local_channel();
+ $m['menu_name'] = $j['pagetitle'];
+ $m['menu_desc'] = $j['desc'];
+ if($j['created'])
+ $m['menu_created'] = datetime_convert($j['created']);
+ if($j['edited'])
+ $m['menu_edited'] = datetime_convert($j['edited']);
+
+ $m['menu_flags'] = 0;
+ if($j['flags']) {
+ if(in_array('bookmark',$j['flags']))
+ $m['menu_flags'] |= MENU_BOOKMARK;
+ if(in_array('system',$j['flags']))
+ $m['menu_flags'] |= MENU_SYSTEM;
+
+ }
+
+ $menu_id = menu_create($m);
+
+ if($menu_id) {
+ if(is_array($j['items'])) {
+ foreach($j['items'] as $it) {
+ $mitem = array();
+
+ $mitem['mitem_link'] = str_replace('[baseurl]',z_root(),$it['link']);
+ $mitem['mitem_desc'] = escape_tags($it['desc']);
+ $mitem['mitem_order'] = intval($it['order']);
+ if(is_array($it['flags'])) {
+ $mitem['mitem_flags'] = 0;
+ if(in_array('zid',$it['flags']))
+ $mitem['mitem_flags'] |= MENU_ITEM_ZID;
+ if(in_array('new-window',$it['flags']))
+ $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN;
+ if(in_array('chatroom',$it['flags']))
+ $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM;
+ }
+ menu_add_item($menu_id,local_channel(),$mitem);
+ }
+ if($j['edited']) {
+ $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
+ dbesc(datetime_convert('UTC','UTC',$j['edited'])),
+ intval($menu_id),
+ intval(local_channel())
+ );
+ }
+ }
+ $ret['success'] = true;
+ }
+ $x = $ret;
+ }
+ else {
+ $arr['uid'] = local_channel();
+ $arr['aid'] = $channel['channel_account_id'];
+ $arr['title'] = $j['title'];
+ $arr['body'] = $j['body'];
+ $arr['term'] = $j['term'];
+ $arr['layout_mid'] = $j['layout_mid'];
+ $arr['created'] = datetime_convert('UTC','UTC', $j['created']);
+ $arr['edited'] = datetime_convert('UTC','UTC',$j['edited']);
+ $arr['owner_xchan'] = get_observer_hash();
+ $arr['author_xchan'] = (($j['author_xchan']) ? $j['author_xchan'] : get_observer_hash());
+ $arr['mimetype'] = (($j['mimetype']) ? $j['mimetype'] : 'text/bbcode');
+
+ if(! $j['mid'])
+ $j['mid'] = item_message_id();
+
+ $arr['mid'] = $arr['parent_mid'] = $j['mid'];
+
+
+ if($j['pagetitle']) {
+ require_once('library/urlify/URLify.php');
+ $pagetitle = strtolower(\URLify::transliterate($j['pagetitle']));
+ }
+
+ // Verify ability to use html or php!!!
+
+ $execflag = false;
+
+ if($arr['mimetype'] === 'application/x-php') {
+ $z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
+ intval(local_channel())
+ );
+
+ if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
+ $execflag = true;
+ }
+ }
+
+ $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
+ dbesc($arr['mid']),
+ intval(local_channel())
+ );
+
+ \Zotlabs\Lib\IConfig::Set($arr,'system',$namespace,(($pagetitle) ? $pagetitle : substr($arr['mid'],0,16)),true);
+
+ if($i) {
+ $arr['id'] = $i[0]['id'];
+ // don't update if it has the same timestamp as the original
+ if($arr['edited'] > $i[0]['edited'])
+ $x = item_store_update($arr,$execflag);
+ }
+ else {
+ if(($i) && (intval($i[0]['item_deleted']))) {
+ // was partially deleted already, finish it off
+ q("delete from item where mid = '%s' and uid = %d",
+ dbesc($arr['mid']),
+ intval(local_channel())
+ );
+ }
+ else
+ $x = item_store($arr,$execflag);
+ }
+
+ if($x && $x['success']) {
+ $item_id = $x['item_id'];
+ }
+ }
+
+ if($x['success']) {
+ $ret['success'] = true;
+ info( sprintf( t('%s element installed'), $installed_type));
+ }
+ else {
+ notice( sprintf( t('%s element installation failed'), $installed_type));
+ }
+
+ //??? should perhaps return ret?
+
+ json_return_and_die(true);
+
+ }
+
+}
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
new file mode 100644
index 000000000..d27f013b9
--- /dev/null
+++ b/Zotlabs/Module/Import.php
@@ -0,0 +1,567 @@
+ $max_identities) {
+ notice( sprintf( t('Your service plan only allows %d channels.'), $max_identities) . EOL);
+ return;
+ }
+ }
+
+
+ $data = null;
+ $seize = ((x($_REQUEST,'make_primary')) ? intval($_REQUEST['make_primary']) : 0);
+ $import_posts = ((x($_REQUEST,'import_posts')) ? intval($_REQUEST['import_posts']) : 0);
+ $src = $_FILES['filename']['tmp_name'];
+ $filename = basename($_FILES['filename']['name']);
+ $filesize = intval($_FILES['filename']['size']);
+ $filetype = $_FILES['filename']['type'];
+
+ $completed = ((array_key_exists('import_step',$_SESSION)) ? intval($_SESSION['import_step']) : 0);
+ if($completed)
+ logger('saved import step: ' . $_SESSION['import_step']);
+
+ if($src) {
+
+ // This is OS specific and could also fail if your tmpdir isn't very large
+ // mostly used for Diaspora which exports gzipped files.
+
+ if(strpos($filename,'.gz')){
+ @rename($src,$src . '.gz');
+ @system('gunzip ' . escapeshellarg($src . '.gz'));
+ }
+
+ if($filesize) {
+ $data = @file_get_contents($src);
+ }
+ unlink($src);
+ }
+
+ if(! $src) {
+ $old_address = ((x($_REQUEST,'old_address')) ? $_REQUEST['old_address'] : '');
+ if(! $old_address) {
+ logger('mod_import: nothing to import.');
+ notice( t('Nothing to import.') . EOL);
+ return;
+ }
+
+ $email = ((x($_REQUEST,'email')) ? $_REQUEST['email'] : '');
+ $password = ((x($_REQUEST,'password')) ? $_REQUEST['password'] : '');
+
+ $channelname = substr($old_address,0,strpos($old_address,'@'));
+ $servername = substr($old_address,strpos($old_address,'@')+1);
+
+ $scheme = 'https://';
+ $api_path = '/api/red/channel/export/basic?f=&channel=' . $channelname;
+ if($import_posts)
+ $api_path .= '&posts=1';
+ $binary = false;
+ $redirects = 0;
+ $opts = array('http_auth' => $email . ':' . $password);
+ $url = $scheme . $servername . $api_path;
+ $ret = z_fetch_url($url, $binary, $redirects, $opts);
+ if(! $ret['success'])
+ $ret = z_fetch_url('http://' . $servername . $api_path, $binary, $redirects, $opts);
+ if($ret['success'])
+ $data = $ret['body'];
+ else
+ notice( t('Unable to download data from old server') . EOL);
+
+ }
+
+ if(! $data) {
+ logger('mod_import: empty file.');
+ notice( t('Imported file is empty.') . EOL);
+ return;
+ }
+
+ $data = json_decode($data,true);
+
+ // logger('import: data: ' . print_r($data,true));
+ // print_r($data);
+
+
+ if(array_key_exists('user',$data) && array_key_exists('version',$data)) {
+ require_once('include/Import/import_diaspora.php');
+ import_diaspora($data);
+ return;
+ }
+
+ $moving = false;
+
+ if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
+ $v1 = substr($data['compatibility']['database'],-4);
+ $v2 = substr(DB_UPDATE_VERSION,-4);
+ if($v2 > $v1) {
+ $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
+ notice($t);
+ }
+ if(array_key_exists('server_role',$data['compatibility']) && $data['compatibility']['server_role'] == 'basic')
+ $moving = true;
+ }
+
+ if($moving)
+ $seize = 1;
+
+ // import channel
+
+ $relocate = ((array_key_exists('relocate',$data)) ? $data['relocate'] : null);
+
+ if(array_key_exists('channel',$data)) {
+
+ if($completed < 1) {
+ $channel = import_channel($data['channel'], $account_id, $seize);
+
+ }
+ else {
+ $r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
+ intval($account_id),
+ dbesc($channel['channel_guid'])
+ );
+ if($r)
+ $channel = $r[0];
+ }
+ if(! $channel) {
+ logger('mod_import: channel not found. ', print_r($channel,true));
+ notice( t('Cloned channel not found. Import failed.') . EOL);
+ return;
+ }
+ }
+
+ if(! $channel)
+ $channel = \App::get_channel();
+
+ if(! $channel) {
+ logger('mod_import: channel not found. ', print_r($channel,true));
+ notice( t('No channel. Import failed.') . EOL);
+ return;
+ }
+
+
+ if($completed < 2) {
+ if(is_array($data['config'])) {
+ import_config($channel,$data['config']);
+ }
+
+ logger('import step 2');
+ $_SESSION['import_step'] = 2;
+ }
+
+
+ if($completed < 3) {
+
+ if($data['photo']) {
+ require_once('include/photo/photo_driver.php');
+ import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],$account_id,$channel['channel_id']);
+ }
+
+ if(is_array($data['profile']))
+ import_profiles($channel,$data['profile']);
+
+ logger('import step 3');
+ $_SESSION['import_step'] = 3;
+ }
+
+
+ if($completed < 4) {
+
+ if(is_array($data['hubloc']) && (! $moving)) {
+ import_hublocs($channel,$data['hubloc'],$seize);
+
+ }
+ logger('import step 4');
+ $_SESSION['import_step'] = 4;
+ }
+
+ if($completed < 5) {
+ // create new hubloc for the new channel at this site
+
+ $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_primary,
+ hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey )
+ values ( '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )",
+ dbesc($channel['channel_guid']),
+ dbesc($channel['channel_guid_sig']),
+ dbesc($channel['channel_hash']),
+ dbesc($channel['channel_address'] . '@' . \App::get_hostname()),
+ dbesc('zot'),
+ intval(($seize) ? 1 : 0),
+ dbesc(z_root()),
+ dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))),
+ dbesc(\App::get_hostname()),
+ dbesc(z_root() . '/post'),
+ dbesc(get_config('system','pubkey'))
+ );
+
+ // reset the original primary hubloc if it is being seized
+
+ if($seize) {
+ $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ",
+ dbesc($channel['channel_hash']),
+ dbesc(z_root())
+ );
+ }
+ logger('import step 5');
+ $_SESSION['import_step'] = 5;
+ }
+
+
+ if($completed < 6) {
+
+ // import xchans and contact photos
+
+ if($seize) {
+
+ // replace any existing xchan we may have on this site if we're seizing control
+
+ $r = q("delete from xchan where xchan_hash = '%s'",
+ dbesc($channel['channel_hash'])
+ );
+
+ $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_hidden, xchan_orphan, xchan_censored, xchan_selfcensored, xchan_system, xchan_pubforum, xchan_deleted ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, %d )",
+ dbesc($channel['channel_hash']),
+ dbesc($channel['channel_guid']),
+ dbesc($channel['channel_guid_sig']),
+ dbesc($channel['channel_pubkey']),
+ dbesc(z_root() . "/photo/profile/l/" . $channel['channel_id']),
+ dbesc(z_root() . "/photo/profile/m/" . $channel['channel_id']),
+ dbesc(z_root() . "/photo/profile/s/" . $channel['channel_id']),
+ dbesc($channel['channel_address'] . '@' . \App::get_hostname()),
+ dbesc(z_root() . '/channel/' . $channel['channel_address']),
+ dbesc(z_root() . '/follow?f=&url=%s'),
+ dbesc(z_root() . '/poco/' . $channel['channel_address']),
+ dbesc($channel['channel_name']),
+ dbesc('zot'),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ 0,0,0,0,0,0,0
+ );
+ }
+ logger('import step 6');
+ $_SESSION['import_step'] = 6;
+ }
+
+ if($completed < 7) {
+
+ $xchans = $data['xchan'];
+ if($xchans) {
+ foreach($xchans as $xchan) {
+
+ $hash = make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_guid_sig']);
+ if($xchan['xchan_network'] === 'zot' && $hash !== $xchan['xchan_hash']) {
+ logger('forged xchan: ' . print_r($xchan,true));
+ continue;
+ }
+
+ if(! array_key_exists('xchan_hidden',$xchan)) {
+ $xchan['xchan_hidden'] = (($xchan['xchan_flags'] & 0x0001) ? 1 : 0);
+ $xchan['xchan_orphan'] = (($xchan['xchan_flags'] & 0x0002) ? 1 : 0);
+ $xchan['xchan_censored'] = (($xchan['xchan_flags'] & 0x0004) ? 1 : 0);
+ $xchan['xchan_selfcensored'] = (($xchan['xchan_flags'] & 0x0008) ? 1 : 0);
+ $xchan['xchan_system'] = (($xchan['xchan_flags'] & 0x0010) ? 1 : 0);
+ $xchan['xchan_pubforum'] = (($xchan['xchan_flags'] & 0x0020) ? 1 : 0);
+ $xchan['xchan_deleted'] = (($xchan['xchan_flags'] & 0x1000) ? 1 : 0);
+ }
+
+ $r = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1",
+ dbesc($xchan['xchan_hash'])
+ );
+ if($r)
+ continue;
+
+ dbesc_array($xchan);
+
+ $r = dbq("INSERT INTO xchan (`"
+ . implode("`, `", array_keys($xchan))
+ . "`) VALUES ('"
+ . implode("', '", array_values($xchan))
+ . "')" );
+
+
+ require_once('include/photo/photo_driver.php');
+ $photos = import_xchan_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']);
+ if($photos[4])
+ $photodate = NULL_DATE;
+ else
+ $photodate = $xchan['xchan_photo_date'];
+
+ $r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s'
+ where xchan_hash = '%s'",
+ dbesc($photos[0]),
+ dbesc($photos[1]),
+ dbesc($photos[2]),
+ dbesc($photos[3]),
+ dbesc($photodate),
+ dbesc($xchan['xchan_hash'])
+ );
+
+ }
+ }
+ logger('import step 7');
+ $_SESSION['import_step'] = 7;
+
+ }
+
+
+
+ // FIXME - ensure we have an xchan if somebody is trying to pull a fast one
+
+ if($completed < 8) {
+ $friends = 0;
+ $feeds = 0;
+
+ // import contacts
+ $abooks = $data['abook'];
+ if($abooks) {
+ foreach($abooks as $abook) {
+
+ $abook_copy = $abook;
+
+ $abconfig = null;
+ if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig']))
+ $abconfig = $abook['abconfig'];
+
+ unset($abook['abook_id']);
+ unset($abook['abook_rating']);
+ unset($abook['abook_rating_text']);
+ unset($abook['abconfig']);
+ unset($abook['abook_their_perms']);
+ unset($abook['abook_my_perms']);
+
+ $abook['abook_account'] = $account_id;
+ $abook['abook_channel'] = $channel['channel_id'];
+ if(! array_key_exists('abook_blocked',$abook)) {
+ $abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001 ) ? 1 : 0);
+ $abook['abook_ignored'] = (($abook['abook_flags'] & 0x0002 ) ? 1 : 0);
+ $abook['abook_hidden'] = (($abook['abook_flags'] & 0x0004 ) ? 1 : 0);
+ $abook['abook_archived'] = (($abook['abook_flags'] & 0x0008 ) ? 1 : 0);
+ $abook['abook_pending'] = (($abook['abook_flags'] & 0x0010 ) ? 1 : 0);
+ $abook['abook_unconnected'] = (($abook['abook_flags'] & 0x0020 ) ? 1 : 0);
+ $abook['abook_self'] = (($abook['abook_flags'] & 0x0080 ) ? 1 : 0);
+ $abook['abook_feed'] = (($abook['abook_flags'] & 0x0100 ) ? 1 : 0);
+ }
+
+ if($abook['abook_self']) {
+ $role = get_pconfig($channel['channel_id'],'system','permissions_role');
+ if(($role === 'forum') || ($abook['abook_my_perms'] & PERMS_W_TAGWALL)) {
+ q("update xchan set xchan_pubforum = 1 where xchan_hash = '%s' ",
+ dbesc($abook['abook_xchan'])
+ );
+ }
+ }
+ else {
+ if($max_friends !== false && $friends > $max_friends)
+ continue;
+ if($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds))
+ continue;
+ }
+
+ dbesc_array($abook);
+ $r = dbq("INSERT INTO abook (`"
+ . implode("`, `", array_keys($abook))
+ . "`) VALUES ('"
+ . implode("', '", array_values($abook))
+ . "')" );
+
+ $friends ++;
+ if(intval($abook['abook_feed']))
+ $feeds ++;
+
+ translate_abook_perms_inbound($channel,$abook_copy);
+
+ if($abconfig) {
+ // @fixme does not handle sync of del_abconfig
+ foreach($abconfig as $abc) {
+ set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
+ }
+ }
+
+
+
+ }
+ }
+ logger('import step 8');
+ $_SESSION['import_step'] = 8;
+ }
+
+
+
+ if($completed < 9) {
+ $groups = $data['group'];
+ if($groups) {
+ $saved = array();
+ foreach($groups as $group) {
+ $saved[$group['hash']] = array('old' => $group['id']);
+ if(array_key_exists('name',$group)) {
+ $group['gname'] = $group['name'];
+ unset($group['name']);
+ }
+ unset($group['id']);
+ $group['uid'] = $channel['channel_id'];
+ dbesc_array($group);
+ $r = dbq("INSERT INTO groups (`"
+ . implode("`, `", array_keys($group))
+ . "`) VALUES ('"
+ . implode("', '", array_values($group))
+ . "')" );
+ }
+ $r = q("select * from `groups` where uid = %d",
+ intval($channel['channel_id'])
+ );
+ if($r) {
+ foreach($r as $rr) {
+ $saved[$rr['hash']]['new'] = $rr['id'];
+ }
+ }
+ }
+
+
+ $group_members = $data['group_member'];
+ if($group_members) {
+ foreach($group_members as $group_member) {
+ unset($group_member['id']);
+ $group_member['uid'] = $channel['channel_id'];
+ foreach($saved as $x) {
+ if($x['old'] == $group_member['gid'])
+ $group_member['gid'] = $x['new'];
+ }
+ dbesc_array($group_member);
+ $r = dbq("INSERT INTO group_member (`"
+ . implode("`, `", array_keys($group_member))
+ . "`) VALUES ('"
+ . implode("', '", array_values($group_member))
+ . "')" );
+ }
+ }
+ logger('import step 9');
+ $_SESSION['import_step'] = 9;
+ }
+
+ if(is_array($data['obj']))
+ import_objs($channel,$data['obj']);
+
+ if(is_array($data['likes']))
+ import_likes($channel,$data['likes']);
+
+ if(is_array($data['app']))
+ import_apps($channel,$data['app']);
+
+ if(is_array($data['chatroom']))
+ import_chatrooms($channel,$data['chatroom']);
+
+ if(is_array($data['conv']))
+ import_conv($channel,$data['conv']);
+
+ if(is_array($data['mail']))
+ import_mail($channel,$data['mail']);
+
+ if(is_array($data['event']))
+ import_events($channel,$data['event']);
+
+ if(is_array($data['event_item']))
+ import_items($channel,$data['event_item'],false,$relocate);
+
+ if(is_array($data['menu']))
+ import_menus($channel,$data['menu']);
+
+ $addon = array('channel' => $channel,'data' => $data);
+ call_hooks('import_channel',$addon);
+
+ $saved_notification_flags = notifications_off($channel['channel_id']);
+
+ if($import_posts && array_key_exists('item',$data) && $data['item'])
+ import_items($channel,$data['item'],false,$relocate);
+
+ notifications_on($channel['channel_id'],$saved_notification_flags);
+
+
+ if(array_key_exists('item_id',$data) && $data['item_id'])
+ import_item_ids($channel,$data['item_id']);
+
+
+ // FIXME - ensure we have a self entry if somebody is trying to pull a fast one
+
+ // send out refresh requests
+ // notify old server that it may no longer be primary.
+
+ \Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id']));
+
+ // This will indirectly perform a refresh_all *and* update the directory
+
+ \Zotlabs\Daemon\Master::Summon(array('Directory', $channel['channel_id']));
+
+
+ notice( t('Import completed.') . EOL);
+
+ change_channel($channel['channel_id']);
+
+ unset($_SESSION['import_step']);
+ goaway(z_root() . '/network' );
+
+ }
+
+
+ function post() {
+
+ $account_id = get_account_id();
+ if(! $account_id)
+ return;
+
+ $this->import_account($account_id);
+ }
+
+ function get() {
+
+ if(! get_account_id()) {
+ notice( t('You must be logged in to use this feature.'));
+ return '';
+ }
+
+ $o = replace_macros(get_markup_template('channel_import.tpl'),array(
+ '$title' => t('Import Channel'),
+ '$desc' => t('Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file.'),
+ '$label_filename' => t('File to Upload'),
+ '$choice' => t('Or provide the old server/hub details'),
+ '$label_old_address' => t('Your old identity address (xyz@example.com)'),
+ '$label_old_email' => t('Your old login email address'),
+ '$label_old_pass' => t('Your old login password'),
+ '$common' => t('For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'),
+ '$label_import_primary' => t('Make this hub my primary location'),
+ '$label_import_posts' => t('Import existing posts if possible (experimental - limited by available memory'),
+ '$pleasewait' => t('This process may take several minutes to complete. Please submit the form only once and leave this page open until finished.'),
+ '$email' => '',
+ '$pass' => '',
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Import_items.php b/Zotlabs/Module/Import_items.php
new file mode 100644
index 000000000..f20cbfe7e
--- /dev/null
+++ b/Zotlabs/Module/Import_items.php
@@ -0,0 +1,131 @@
+ $email . ':' . $password);
+ $url = $scheme . $servername . $api_path;
+ $ret = z_fetch_url($url, $binary, $redirects, $opts);
+ if(! $ret['success'])
+ $ret = z_fetch_url('http://' . $servername . $api_path, $binary, $redirects, $opts);
+ if($ret['success'])
+ $data = $ret['body'];
+ else
+ notice( t('Unable to download data from old server') . EOL);
+
+ }
+
+ if(! $data) {
+ logger('mod_import: empty file.');
+ notice( t('Imported file is empty.') . EOL);
+ return;
+ }
+
+ $data = json_decode($data,true);
+
+ // logger('import: data: ' . print_r($data,true));
+ // print_r($data);
+
+ if(! is_array($data))
+ return;
+
+ if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
+ $v1 = substr($data['compatibility']['database'],-4);
+ $v2 = substr(DB_UPDATE_VERSION,-4);
+ if($v2 > $v1) {
+ $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
+ notice($t);
+ }
+ }
+
+ $channel = \App::get_channel();
+
+
+ if(array_key_exists('item',$data) && $data['item']) {
+ import_items($channel,$data['item'],false,((array_key_exists('relocate',$data)) ? $data['relocate'] : null));
+ }
+
+ if(array_key_exists('item_id',$data) && $data['item_id']) {
+ import_item_ids($channel,$data['item_id']);
+ }
+
+ info( t('Import completed') . EOL);
+ return;
+ }
+
+
+
+
+ function get() {
+
+ if(! local_channel()) {
+ notice( t('Permission denied') . EOL);
+ return login();
+ }
+
+ $o = replace_macros(get_markup_template('item_import.tpl'),array(
+ '$title' => t('Import Items'),
+ '$desc' => t('Use this form to import existing posts and content from an export file.'),
+ '$label_filename' => t('File to Upload'),
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+
+ }
+
+
+
+}
diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php
new file mode 100644
index 000000000..3d7438484
--- /dev/null
+++ b/Zotlabs/Module/Invite.php
@@ -0,0 +1,152 @@
+ $max_invites) {
+ notice( t('Total invitation limit exceeded.') . EOL);
+ return;
+ };
+
+
+ $recips = ((x($_POST,'recipients')) ? explode("\n",$_POST['recipients']) : array());
+ $message = ((x($_POST,'message')) ? notags(trim($_POST['message'])) : '');
+
+ $total = 0;
+
+ if(get_config('system','invitation_only')) {
+ $invonly = true;
+ $x = get_pconfig(local_channel(),'system','invites_remaining');
+ if((! $x) && (! is_site_admin()))
+ return;
+ }
+
+ foreach($recips as $recip) {
+
+ $recip = trim($recip);
+ if(! $recip)
+ continue;
+
+ if(! valid_email($recip)) {
+ notice( sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
+ continue;
+ }
+
+ else
+ $nmessage = $message;
+
+ $account = \App::get_account();
+
+
+ $res = mail($recip, sprintf( t('Please join us on $Projectname'), \App::$config['sitename']),
+ $nmessage,
+ "From: " . $account['account_email'] . "\n"
+ . 'Content-type: text/plain; charset=UTF-8' . "\n"
+ . 'Content-transfer-encoding: 8bit' );
+
+ if($res) {
+ $total ++;
+ $current_invites ++;
+ set_pconfig(local_channel(),'system','sent_invites',$current_invites);
+ if($current_invites > $max_invites) {
+ notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
+ return;
+ }
+ }
+ else {
+ notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL);
+ }
+
+ }
+ notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL);
+ return;
+ }
+
+
+ function get() {
+
+ if(! local_channel()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $tpl = get_markup_template('invite.tpl');
+ $invonly = false;
+
+ if(get_config('system','invitation_only')) {
+ $invonly = true;
+ $x = get_pconfig(local_channel(),'system','invites_remaining');
+ if((! $x) && (! is_site_admin())) {
+ notice( t('You have no more invitations available') . EOL);
+ return '';
+ }
+ }
+
+ if($invonly && ($x || is_site_admin())) {
+ $invite_code = autoname(8) . rand(1000,9999);
+ $nmessage = str_replace('$invite_code',$invite_code,$message);
+
+ $r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
+ dbesc($invite_code),
+ dbesc(datetime_convert())
+ );
+
+ if(! is_site_admin()) {
+ $x --;
+ if($x >= 0)
+ set_pconfig(local_channel(),'system','invites_remaining',$x);
+ else
+ return;
+ }
+ }
+
+ $ob = \App::get_observer();
+ if(! $ob)
+ return $o;
+
+ $channel = \App::get_channel();
+
+ $o = replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("send_invite"),
+ '$invite' => t('Send invitations'),
+ '$addr_text' => t('Enter email addresses, one per line:'),
+ '$msg_text' => t('Your message:'),
+ '$default_message' => t('Please join my community on $Projectname.') . "\r\n" . "\r\n"
+ . $linktxt
+ . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code:') . " " . $invite_code . "\r\n" . "\r\n" : '')
+ . t('1. Register at any $Projectname location (they are all inter-connected)')
+ . "\r\n" . "\r\n" . z_root() . '/register'
+ . "\r\n" . "\r\n" . t('2. Enter my $Projectname network address into the site searchbar.')
+ . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit') . " " . z_root() . '/channel/' . $channel['channel_address'] . ')'
+ . "\r\n" . "\r\n"
+ . t('3. Click [Connect]')
+ . "\r\n" . "\r\n" ,
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+ }
+
+}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
new file mode 100644
index 000000000..2d0c1ba02
--- /dev/null
+++ b/Zotlabs/Module/Item.php
@@ -0,0 +1,1266 @@
+ 1);
+ echo json_encode($json);
+ killme();
+ }
+
+ call_hooks('post_local_start', $_REQUEST);
+
+ // logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+
+ $api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
+
+ $consensus = intval($_REQUEST['consensus']);
+
+ // 'origin' (if non-zero) indicates that this network is where the message originated,
+ // for the purpose of relaying comments to other conversation members.
+ // If using the API from a device (leaf node) you must set origin to 1 (default) or leave unset.
+ // If the API is used from another network with its own distribution
+ // and deliveries, you may wish to set origin to 0 or false and allow the other
+ // network to relay comments.
+
+ // If you are unsure, it is prudent (and important) to leave it unset.
+
+ $origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1);
+
+ // To represent message-ids on other networks - this will create an iconfig record
+
+ $namespace = (($api_source && array_key_exists('namespace',$_REQUEST)) ? strip_tags($_REQUEST['namespace']) : '');
+ $remote_id = (($api_source && array_key_exists('remote_id',$_REQUEST)) ? strip_tags($_REQUEST['remote_id']) : '');
+
+ $owner_hash = null;
+
+ $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
+ $created = ((x($_REQUEST,'created')) ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['created']) : datetime_convert());
+ $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0);
+ $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : '');
+ $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+ $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
+ $categories = ((x($_REQUEST,'category')) ? escape_tags($_REQUEST['category']) : '');
+ $webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0);
+ $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags(urlencode($_REQUEST['pagetitle'])) : '');
+ $layout_mid = ((x($_REQUEST,'layout_mid')) ? escape_tags($_REQUEST['layout_mid']): '');
+ $plink = ((x($_REQUEST,'permalink')) ? escape_tags($_REQUEST['permalink']) : '');
+ $obj_type = ((x($_REQUEST,'obj_type')) ? escape_tags($_REQUEST['obj_type']) : ACTIVITY_OBJ_NOTE);
+
+ // allow API to bulk load a bunch of imported items with sending out a bunch of posts.
+ $nopush = ((x($_REQUEST,'nopush')) ? intval($_REQUEST['nopush']) : 0);
+
+ /*
+ * Check service class limits
+ */
+ if ($uid && !(x($_REQUEST,'parent')) && !(x($_REQUEST,'post_id'))) {
+ $ret = $this->item_check_service_class($uid,(($_REQUEST['webpage'] == ITEM_TYPE_WEBPAGE) ? true : false));
+ if (!$ret['success']) {
+ notice( t($ret['message']) . EOL) ;
+ if(x($_REQUEST,'return'))
+ goaway(z_root() . "/" . $return_path );
+ killme();
+ }
+ }
+
+ if($pagetitle) {
+ require_once('library/urlify/URLify.php');
+ $pagetitle = strtolower(\URLify::transliterate($pagetitle));
+ }
+
+
+ $item_flags = $item_restrict = 0;
+
+ $route = '';
+ $parent_item = null;
+ $parent_contact = null;
+ $thr_parent = '';
+ $parid = 0;
+ $r = false;
+
+ if($parent || $parent_mid) {
+
+ if(! x($_REQUEST,'type'))
+ $_REQUEST['type'] = 'net-comment';
+
+ if($obj_type == ACTIVITY_OBJ_POST)
+ $obj_type = ACTIVITY_OBJ_COMMENT;
+
+ if($parent) {
+ $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
+ intval($parent)
+ );
+ }
+ elseif($parent_mid && $uid) {
+ // This is coming from an API source, and we are logged in
+ $r = q("SELECT * FROM `item` WHERE `mid` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($parent_mid),
+ intval($uid)
+ );
+ }
+ // if this isn't the real parent of the conversation, find it
+ if($r !== false && count($r)) {
+ $parid = $r[0]['parent'];
+ $parent_mid = $r[0]['mid'];
+ if($r[0]['id'] != $r[0]['parent']) {
+ $r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
+ intval($parid)
+ );
+ }
+ }
+
+ if(($r === false) || (! count($r))) {
+ notice( t('Unable to locate original post.') . EOL);
+ if(x($_REQUEST,'return'))
+ goaway(z_root() . "/" . $return_path );
+ killme();
+ }
+
+ // can_comment_on_post() needs info from the following xchan_query
+ // This may be from the discover tab which means we need to correct the effective uid
+
+ xchan_query($r,true,(($r[0]['uid'] == local_channel()) ? 0 : local_channel()));
+
+ $parent_item = $r[0];
+ $parent = $r[0]['id'];
+
+ // multi-level threading - preserve the info but re-parent to our single level threading
+
+ $thr_parent = $parent_mid;
+
+ $route = $parent_item['route'];
+
+ }
+
+ if(! $observer)
+ $observer = \App::get_observer();
+
+ if($parent) {
+ logger('mod_item: item_post parent=' . $parent);
+ $can_comment = false;
+ if((array_key_exists('owner',$parent_item)) && intval($parent_item['owner']['abook_self']))
+ $can_comment = perm_is_allowed($profile_uid,$observer['xchan_hash'],'post_comments');
+ else
+ $can_comment = can_comment_on_post($observer['xchan_hash'],$parent_item);
+
+ if(! $can_comment) {
+ notice( t('Permission denied.') . EOL) ;
+ if(x($_REQUEST,'return'))
+ goaway(z_root() . "/" . $return_path );
+ killme();
+ }
+ }
+ else {
+ if(! perm_is_allowed($profile_uid,$observer['xchan_hash'],($webpage) ? 'write_pages' : 'post_wall')) {
+ notice( t('Permission denied.') . EOL) ;
+ if(x($_REQUEST,'return'))
+ goaway(z_root() . "/" . $return_path );
+ killme();
+ }
+ }
+
+
+ // is this an edited post?
+
+ $orig_post = null;
+
+ if($namespace && $remote_id) {
+ // It wasn't an internally generated post - see if we've got an item matching this remote service id
+ $i = q("select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1",
+ dbesc($namespace),
+ dbesc($remote_id)
+ );
+ if($i)
+ $post_id = $i[0]['iid'];
+ }
+
+ $iconfig = null;
+
+ if($post_id) {
+ $i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+ intval($profile_uid),
+ intval($post_id)
+ );
+ if(! count($i))
+ killme();
+ $orig_post = $i[0];
+ $iconfig = q("select * from iconfig where iid = %d",
+ intval($post_id)
+ );
+ }
+
+
+ if(! $channel) {
+ if($uid && $uid == $profile_uid) {
+ $channel = \App::get_channel();
+ }
+ else {
+ // posting as yourself but not necessarily to a channel you control
+ $r = q("select * from channel left join account on channel_account_id = account_id where channel_id = %d LIMIT 1",
+ intval($profile_uid)
+ );
+ if($r)
+ $channel = $r[0];
+ }
+ }
+
+
+ if(! $channel) {
+ logger("mod_item: no channel.");
+ if(x($_REQUEST,'return'))
+ goaway(z_root() . "/" . $return_path );
+ killme();
+ }
+
+ $owner_xchan = null;
+
+ $r = q("select * from xchan where xchan_hash = '%s' limit 1",
+ dbesc($channel['channel_hash'])
+ );
+ if($r && count($r)) {
+ $owner_xchan = $r[0];
+ }
+ else {
+ logger("mod_item: no owner.");
+ if(x($_REQUEST,'return'))
+ goaway(z_root() . "/" . $return_path );
+ killme();
+ }
+
+ $walltowall = false;
+ $walltowall_comment = false;
+
+ if($remote_xchan)
+ $observer = $remote_observer;
+
+ if($observer) {
+ logger('mod_item: post accepted from ' . $observer['xchan_name'] . ' for ' . $owner_xchan['xchan_name'], LOGGER_DEBUG);
+
+ // wall-to-wall detection.
+ // For top-level posts, if the author and owner are different it's a wall-to-wall
+ // For comments, We need to additionally look at the parent and see if it's a wall post that originated locally.
+
+ if($observer['xchan_name'] != $owner_xchan['xchan_name']) {
+ if(($parent_item) && ($parent_item['item_wall'] && $parent_item['item_origin'])) {
+ $walltowall_comment = true;
+ $walltowall = true;
+ }
+ if(! $parent) {
+ $walltowall = true;
+ }
+ }
+ }
+
+ $acl = new \Zotlabs\Access\AccessList($channel);
+
+ $view_policy = \Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_stream');
+ $comment_policy = \Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'post_comments');
+
+ $public_policy = ((x($_REQUEST,'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($view_policy,true));
+ if($webpage)
+ $public_policy = '';
+ if($public_policy)
+ $private = 1;
+
+ if($orig_post) {
+ $private = 0;
+ // webpages are allowed to change ACLs after the fact. Normal conversation items aren't.
+ if($webpage) {
+ $acl->set_from_array($_REQUEST);
+ }
+ else {
+ $acl->set($orig_post);
+ $public_policy = $orig_post['public_policy'];
+ $private = $orig_post['item_private'];
+ }
+
+ if($private || $public_policy || $acl->is_private())
+ $private = 1;
+
+
+ $location = $orig_post['location'];
+ $coord = $orig_post['coord'];
+ $verb = $orig_post['verb'];
+ $app = $orig_post['app'];
+ $title = escape_tags(trim($_REQUEST['title']));
+ $body = trim($_REQUEST['body']);
+ $item_flags = $orig_post['item_flags'];
+
+ $item_origin = $orig_post['item_origin'];
+ $item_unseen = $orig_post['item_unseen'];
+ $item_starred = $orig_post['item_starred'];
+ $item_uplink = $orig_post['item_uplink'];
+ $item_consensus = $orig_post['item_consensus'];
+ $item_wall = $orig_post['item_wall'];
+ $item_thread_top = $orig_post['item_thread_top'];
+ $item_notshown = $orig_post['item_notshown'];
+ $item_nsfw = $orig_post['item_nsfw'];
+ $item_relay = $orig_post['item_relay'];
+ $item_mentionsme = $orig_post['item_mentionsme'];
+ $item_nocomment = $orig_post['item_nocomment'];
+ $item_obscured = $orig_post['item_obscured'];
+ $item_verified = $orig_post['item_verified'];
+ $item_retained = $orig_post['item_retained'];
+ $item_rss = $orig_post['item_rss'];
+ $item_deleted = $orig_post['item_deleted'];
+ $item_type = $orig_post['item_type'];
+ $item_hidden = $orig_post['item_hidden'];
+ $item_unpublished = $orig_post['item_unpublished'];
+ $item_delayed = $orig_post['item_delayed'];
+ $item_pending_remove = $orig_post['item_pending_remove'];
+ $item_blocked = $orig_post['item_blocked'];
+
+
+
+ $postopts = $orig_post['postopts'];
+ $created = $orig_post['created'];
+ $mid = $orig_post['mid'];
+ $parent_mid = $orig_post['parent_mid'];
+ $plink = $orig_post['plink'];
+
+ }
+ else {
+ if(! $walltowall) {
+ if((array_key_exists('contact_allow',$_REQUEST))
+ || (array_key_exists('group_allow',$_REQUEST))
+ || (array_key_exists('contact_deny',$_REQUEST))
+ || (array_key_exists('group_deny',$_REQUEST))) {
+ $acl->set_from_array($_REQUEST);
+ }
+ elseif(! $api_source) {
+
+ // if no ACL has been defined and we aren't using the API, the form
+ // didn't send us any parameters. This means there's no ACL or it has
+ // been reset to the default audience.
+ // If $api_source is set and there are no ACL parameters, we default
+ // to the channel permissions which were set in the ACL contructor.
+
+ $acl->set(array('allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''));
+ }
+ }
+
+
+ $location = notags(trim($_REQUEST['location']));
+ $coord = notags(trim($_REQUEST['coord']));
+ $verb = notags(trim($_REQUEST['verb']));
+ $title = escape_tags(trim($_REQUEST['title']));
+ $body = trim($_REQUEST['body']);
+ $body .= trim($_REQUEST['attachment']);
+ $postopts = '';
+
+ $private = intval($acl->is_private() || ($public_policy));
+
+ // If this is a comment, set the permissions from the parent.
+
+ if($parent_item) {
+ $private = 0;
+ $acl->set($parent_item);
+ $private = intval($acl->is_private() || $parent_item['item_private']);
+ $public_policy = $parent_item['public_policy'];
+ $owner_hash = $parent_item['owner_xchan'];
+ }
+
+ if(! strlen($body)) {
+ if($preview)
+ killme();
+ info( t('Empty post discarded.') . EOL );
+ if(x($_REQUEST,'return'))
+ goaway(z_root() . "/" . $return_path );
+ killme();
+ }
+ }
+
+
+ $expires = NULL_DATE;
+
+ if(feature_enabled($profile_uid,'content_expire')) {
+ if(x($_REQUEST,'expire')) {
+ $expires = datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expire']);
+ if($expires <= datetime_convert())
+ $expires = NULL_DATE;
+ }
+ }
+
+ $mimetype = notags(trim($_REQUEST['mimetype']));
+ if(! $mimetype)
+ $mimetype = 'text/bbcode';
+
+ if($preview) {
+ $body = z_input_filter($profile_uid,$body,$mimetype);
+ }
+
+
+ // Verify ability to use html or php!!!
+
+ $execflag = false;
+
+ if($mimetype !== 'text/bbcode') {
+ $z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
+ intval($profile_uid)
+ );
+ if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
+ if($uid && (get_account_id() == $z[0]['account_id'])) {
+ $execflag = true;
+ }
+ else {
+ notice( t('Executable content type not permitted to this channel.') . EOL);
+ if(x($_REQUEST,'return'))
+ goaway(z_root() . "/" . $return_path );
+ killme();
+ }
+ }
+ }
+
+ $gacl = $acl->get();
+ $str_contact_allow = $gacl['allow_cid'];
+ $str_group_allow = $gacl['allow_gid'];
+ $str_contact_deny = $gacl['deny_cid'];
+ $str_group_deny = $gacl['deny_gid'];
+
+ if($mimetype === 'text/bbcode') {
+
+ require_once('include/text.php');
+
+ // Markdown doesn't work correctly. Do not re-enable unless you're willing to fix it and support it.
+
+ // Sample that will probably give you grief - you must preserve the linebreaks
+ // and provide the correct markdown interpretation and you cannot allow unfiltered HTML
+
+ // Markdown
+ // ========
+ //
+ // **bold** abcde
+ // fghijkl
+ // *italic*
+ // ', $body); + // $body = preg_replace_callback('/\[share(.*?)\]/ism','\share_shield',$body); + // $body = diaspora2bb($body,true); + // $body = preg_replace_callback('/\[share(.*?)\]/ism','\share_unshield',$body); + // } + + // BBCODE alert: the following functions assume bbcode input + // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) + // we may need virtual or template classes to implement the possible alternatives + + // Work around doubled linefeeds in Tinymce 3.5b2 + // First figure out if it's a status post that would've been + // created using tinymce. Otherwise leave it alone. + + $plaintext = true; + + // $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true); + // if((! $parent) && (! $api_source) && (! $plaintext)) { + // $body = fix_mce_lf($body); + // } + + + + // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it, if our pconfig is set. + + + if((! $parent) && (get_pconfig($profile_uid,'system','tagifonlyrecip')) && (substr_count($str_contact_allow,'<') == 1) && ($str_group_allow == '') && ($str_contact_deny == '') && ($str_group_deny == '')) { + $x = q("select abook_id, abconfig.v from abook left join abconfig on abook_xchan = abconfig.xchan and abook_channel = abconfig.chan and cat= 'their_perms' and abconfig.k = 'tag_deliver' and abconfig.v = 1 and abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc(str_replace(array('<','>'),array('',''),$str_contact_allow)), + intval($profile_uid) + ); + if($x) + $body .= "\n\n@group+" . $x[0]['abook_id'] . "\n"; + } + + /** + * fix naked links by passing through a callback to see if this is a hubzilla site + * (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both. + * First protect any url inside certain bbcode tags so we don't double link it. + */ + + + $body = preg_replace_callback('/\[code(.*?)\[\/(code)\]/ism','\red_escape_codeblock',$body); + $body = preg_replace_callback('/\[url(.*?)\[\/(url)\]/ism','\red_escape_codeblock',$body); + $body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','\red_escape_codeblock',$body); + + $body = preg_replace_callback("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", '\red_zrl_callback', $body); + + $body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','\red_unescape_codeblock',$body); + $body = preg_replace_callback('/\[\$b64url(.*?)\[\/(url)\]/ism','\red_unescape_codeblock',$body); + $body = preg_replace_callback('/\[\$b64code(.*?)\[\/(code)\]/ism','\red_unescape_codeblock',$body); + + + // fix any img tags that should be zmg + + $body = preg_replace_callback('/\[img(.*?)\](.*?)\[\/img\]/ism','\red_zrlify_img_callback',$body); + + + $body = bb_translate_video($body); + + /** + * Fold multi-line [code] sequences + */ + + $body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body); + + $body = scale_external_images($body,false); + + + // Look for tags and linkify them + $results = linkify_tags($a, $body, ($uid) ? $uid : $profile_uid); + + if($results) { + + // Set permissions based on tag replacements + set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private); + + $post_tags = array(); + foreach($results as $result) { + $success = $result['success']; + if($success['replaced']) { + $post_tags[] = array( + 'uid' => $profile_uid, + 'ttype' => $success['termtype'], + 'otype' => TERM_OBJ_POST, + 'term' => $success['term'], + 'url' => $success['url'] + ); + } + } + } + + + /** + * + * When a photo was uploaded into the message using the (profile wall) ajax + * uploader, The permissions are initially set to disallow anybody but the + * owner from seeing it. This is because the permissions may not yet have been + * set for the post. If it's private, the photo permissions should be set + * appropriately. But we didn't know the final permissions on the post until + * now. So now we'll look for links of uploaded photos and attachments that are in the + * post and set them to the same permissions as the post itself. + * + * If the post was end-to-end encrypted we can't find images and attachments in the body, + * use our media_str input instead which only contains these elements - but only do this + * when encrypted content exists because the photo/attachment may have been removed from + * the post and we should keep it private. If it's encrypted we have no way of knowing + * so we'll set the permissions regardless and realise that the media may not be + * referenced in the post. + * + * What is preventing us from being able to upload photos into comments is dealing with + * the photo and attachment permissions, since we don't always know who was in the + * distribution for the top level post. + * + * We might be able to provide this functionality with a lot of fiddling: + * - if the top level post is public (make the photo public) + * - if the top level post was written by us or a wall post that belongs to us (match the top level post) + * - if the top level post has privacy mentions, add those to the permissions. + * - otherwise disallow the photo *or* make the photo public. This is the part that gets messy. + */ + + if(! $preview) { + $this->fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); + + $this->fix_attached_file_permissions($channel,$observer['xchan_hash'],((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); + + } + + + $attachments = ''; + $match = false; + + if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) { + $attachments = array(); + $i = 0; + foreach($match[2] as $mtch) { + $attach_link = ''; + $hash = substr($mtch,0,strpos($mtch,',')); + $rev = intval(substr($mtch,strpos($mtch,','))); + $r = attach_by_hash_nodata($hash,$rev); + if($r['success']) { + $attachments[] = array( + 'href' => z_root() . '/attach/' . $r['data']['hash'], + 'length' => $r['data']['filesize'], + 'type' => $r['data']['filetype'], + 'title' => urlencode($r['data']['filename']), + 'revision' => $r['data']['revision'] + ); + } + $ext = substr($r['data']['filename'],strrpos($r['data']['filename'],'.')); + if(strpos($r['data']['filetype'],'audio/') !== false) + $attach_link = '[audio]' . z_root() . '/attach/' . $r['data']['hash'] . '/' . $r['data']['revision'] . (($ext) ? $ext : '') . '[/audio]'; + elseif(strpos($r['data']['filetype'],'video/') !== false) + $attach_link = '[video]' . z_root() . '/attach/' . $r['data']['hash'] . '/' . $r['data']['revision'] . (($ext) ? $ext : '') . '[/video]'; + $body = str_replace($match[1][$i],$attach_link,$body); + $i++; + } + } + + } + + // BBCODE end alert + + if(strlen($categories)) { + $cats = explode(',',$categories); + foreach($cats as $cat) { + $post_tags[] = array( + 'uid' => $profile_uid, + 'ttype' => TERM_CATEGORY, + 'otype' => TERM_OBJ_POST, + 'term' => trim($cat), + 'url' => $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)) + ); + } + } + + if($orig_post) { + // preserve original tags + $t = q("select * from term where oid = %d and otype = %d and uid = %d and ttype in ( %d, %d, %d )", + intval($orig_post['id']), + intval(TERM_OBJ_POST), + intval($profile_uid), + intval(TERM_UNKNOWN), + intval(TERM_FILE), + intval(TERM_COMMUNITYTAG) + ); + if($t) { + foreach($t as $t1) { + $post_tags[] = array( + 'uid' => $profile_uid, + 'ttype' => $t1['type'], + 'otype' => TERM_OBJ_POST, + 'term' => $t1['term'], + 'url' => $t1['url'], + ); + } + } + } + + + $item_unseen = ((local_channel() != $profile_uid) ? 1 : 0); + $item_wall = (($post_type === 'wall' || $post_type === 'wall-comment') ? 1 : 0); + $item_origin = (($origin) ? 1 : 0); + $item_consensus = (($consensus) ? 1 : 0); + + + // determine if this is a wall post + + if($parent) { + $item_wall = $parent_item['item_wall']; + } + else { + if(! $webpage) { + $item_wall = 1; + } + } + + + if($moderated) + $item_blocked = ITEM_MODERATED; + + + if(! strlen($verb)) + $verb = ACTIVITY_POST ; + + $notify_type = (($parent) ? 'comment-new' : 'wall-new' ); + + if(! $mid) { + $mid = (($message_id) ? $message_id : item_message_id()); + } + if(! $parent_mid) { + $parent_mid = $mid; + } + + if($parent_item) + $parent_mid = $parent_item['mid']; + + // Fallback so that we alway have a thr_parent + + if(!$thr_parent) + $thr_parent = $mid; + + $datarray = array(); + + $item_thread_top = ((! $parent) ? 1 : 0); + + if ((! $plink) && ($item_thread_top)) { + $plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $mid; + } + + + + + + $datarray['aid'] = $channel['channel_account_id']; + $datarray['uid'] = $profile_uid; + + $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']); + $datarray['author_xchan'] = $observer['xchan_hash']; + $datarray['created'] = $created; + $datarray['edited'] = (($orig_post) ? datetime_convert() : $created); + $datarray['expires'] = $expires; + $datarray['commented'] = (($orig_post) ? datetime_convert() : $created); + $datarray['received'] = (($orig_post) ? datetime_convert() : $created); + $datarray['changed'] = (($orig_post) ? datetime_convert() : $created); + $datarray['mid'] = $mid; + $datarray['parent_mid'] = $parent_mid; + $datarray['mimetype'] = $mimetype; + $datarray['title'] = $title; + $datarray['body'] = $body; + $datarray['app'] = $app; + $datarray['location'] = $location; + $datarray['coord'] = $coord; + $datarray['verb'] = $verb; + $datarray['obj_type'] = $obj_type; + $datarray['allow_cid'] = $str_contact_allow; + $datarray['allow_gid'] = $str_group_allow; + $datarray['deny_cid'] = $str_contact_deny; + $datarray['deny_gid'] = $str_group_deny; + $datarray['item_private'] = $private; + $datarray['item_wall'] = $item_wall; + $datarray['attach'] = $attachments; + $datarray['thr_parent'] = $thr_parent; + $datarray['postopts'] = $postopts; + $datarray['item_unseen'] = $item_unseen; + $datarray['item_wall'] = $item_wall; + $datarray['item_origin'] = $item_origin; + $datarray['item_type'] = $webpage; + $datarray['item_thread_top'] = $item_thread_top; + $datarray['item_unseen'] = $item_unseen; + $datarray['item_starred'] = $item_starred; + $datarray['item_uplink'] = $item_uplink; + $datarray['item_consensus'] = $item_consensus; + $datarray['item_notshown'] = $item_notshown; + $datarray['item_nsfw'] = $item_nsfw; + $datarray['item_relay'] = $item_relay; + $datarray['item_mentionsme'] = $item_mentionsme; + $datarray['item_nocomment'] = $item_nocomment; + $datarray['item_obscured'] = $item_obscured; + $datarray['item_verified'] = $item_verified; + $datarray['item_retained'] = $item_retained; + $datarray['item_rss'] = $item_rss; + $datarray['item_deleted'] = $item_deleted; + $datarray['item_hidden'] = $item_hidden; + $datarray['item_unpublished'] = $item_unpublished; + $datarray['item_delayed'] = $item_delayed; + $datarray['item_pending_remove'] = $item_pending_remove; + $datarray['item_blocked'] = $item_blocked; + + $datarray['layout_mid'] = $layout_mid; + $datarray['public_policy'] = $public_policy; + $datarray['comment_policy'] = map_scope($comment_policy); + $datarray['term'] = $post_tags; + $datarray['plink'] = $plink; + $datarray['route'] = $route; + + if($iconfig) + $datarray['iconfig'] = $iconfig; + + // preview mode - prepare the body for display and send it via json + + if($preview) { + require_once('include/conversation.php'); + + $datarray['owner'] = $owner_xchan; + $datarray['author'] = $observer; + $datarray['attach'] = json_encode($datarray['attach']); + $o = conversation($a,array($datarray),'search',false,'preview'); + // logger('preview: ' . $o, LOGGER_DEBUG); + echo json_encode(array('preview' => $o)); + killme(); + } + if($orig_post) + $datarray['edit'] = true; + + // suppress duplicates, *unless* you're editing an existing post. This could get picked up + // as a duplicate if you're editing it very soon after posting it initially and you edited + // some attribute besides the content, such as title or categories. + + if(feature_enabled($profile_uid,'suppress_duplicates') && (! $orig_post)) { + + $z = q("select created from item where uid = %d and created > %s - INTERVAL %s and body = '%s' limit 1", + intval($profile_uid), + db_utcnow(), + db_quoteinterval('2 MINUTE'), + dbesc($body) + ); + + if($z) { + $datarray['cancel'] = 1; + notice( t('Duplicate post suppressed.') . EOL); + logger('Duplicate post. Faking plugin cancel.'); + } + } + + call_hooks('post_local',$datarray); + + if(x($datarray,'cancel')) { + logger('mod_item: post cancelled by plugin or duplicate suppressed.'); + if($return_path) + goaway(z_root() . "/" . $return_path); + + $json = array('cancel' => 1); + $json['reload'] = z_root() . '/' . $_REQUEST['jsreload']; + echo json_encode($json); + killme(); + } + + + if(mb_strlen($datarray['title']) > 255) + $datarray['title'] = mb_substr($datarray['title'],0,255); + + if(array_key_exists('item_private',$datarray) && $datarray['item_private']) { + + $datarray['body'] = trim(z_input_filter($datarray['uid'],$datarray['body'],$datarray['mimetype'])); + + if($uid) { + if($channel['channel_hash'] === $datarray['author_xchan']) { + $datarray['sig'] = base64url_encode(rsa_sign($datarray['body'],$channel['channel_prvkey'])); + $datarray['item_verified'] = 1; + } + } + } + + if($webpage) { + Zlib\IConfig::Set($datarray,'system', webpage_to_namespace($webpage), + (($pagetitle) ? $pagetitle : substr($datarray['mid'],0,16)),true); + } + elseif($namespace) { + Zlib\IConfig::Set($datarray,'system', $namespace, + (($remote_id) ? $remote_id : substr($datarray['mid'],0,16)),true); + } + + + if($orig_post) { + $datarray['id'] = $post_id; + + $x = item_store_update($datarray,$execflag); + + if(! $parent) { + $r = q("select * from item where id = %d", + intval($post_id) + ); + if($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true)))); + } + } + if(! $nopush) + \Zotlabs\Daemon\Master::Summon(array('Notifier', 'edit_post', $post_id)); + + if((x($_REQUEST,'return')) && strlen($return_path)) { + logger('return: ' . $return_path); + goaway(z_root() . "/" . $return_path ); + } + killme(); + } + else + $post_id = 0; + + $post = item_store($datarray,$execflag); + + $post_id = $post['item_id']; + + if($post_id) { + logger('mod_item: saved item ' . $post_id); + + if($parent) { + + // only send comment notification if this is a wall-to-wall comment, + // otherwise it will happen during delivery + + if(($datarray['owner_xchan'] != $datarray['author_xchan']) && (intval($parent_item['item_wall']))) { + Zlib\Enotify::submit(array( + 'type' => NOTIFY_COMMENT, + 'from_xchan' => $datarray['author_xchan'], + 'to_xchan' => $datarray['owner_xchan'], + 'item' => $datarray, + 'link' => z_root() . '/display/' . $datarray['mid'], + 'verb' => ACTIVITY_POST, + 'otype' => 'item', + 'parent' => $parent, + 'parent_mid' => $parent_item['mid'] + )); + + } + } + else { + $parent = $post_id; + + if(($datarray['owner_xchan'] != $datarray['author_xchan']) && ($datarray['item_type'] == ITEM_TYPE_POST)) { + Zlib\Enotify::submit(array( + 'type' => NOTIFY_WALL, + 'from_xchan' => $datarray['author_xchan'], + 'to_xchan' => $datarray['owner_xchan'], + 'item' => $datarray, + 'link' => z_root() . '/display/' . $datarray['mid'], + 'verb' => ACTIVITY_POST, + 'otype' => 'item' + )); + } + + if($uid && $uid == $profile_uid && (is_item_normal($datarray))) { + q("update channel set channel_lastpost = '%s' where channel_id = %d", + dbesc(datetime_convert()), + intval($uid) + ); + } + } + + // photo comments turn the corresponding item visible to the profile wall + // This way we don't see every picture in your new photo album posted to your wall at once. + // They will show up as people comment on them. + + if(intval($parent_item['item_hidden'])) { + $r = q("UPDATE item SET item_hidden = 0 WHERE id = %d", + intval($parent_item['id']) + ); + } + } + else { + logger('mod_item: unable to retrieve post that was just stored.'); + notice( t('System error. Post not saved.') . EOL); + goaway(z_root() . "/" . $return_path ); + // NOTREACHED + } + + if(($parent) && ($parent != $post_id)) { + // Store the comment signature information in case we need to relay to Diaspora + //$ditem = $datarray; + //$ditem['author'] = $observer; + //store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0)); + } + else { + $r = q("select * from item where id = %d", + intval($post_id) + ); + if($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true)))); + } + } + + $datarray['id'] = $post_id; + $datarray['llink'] = z_root() . '/display/' . $channel['channel_address'] . '/' . $post_id; + + call_hooks('post_local_end', $datarray); + + if(! $nopush) + \Zotlabs\Daemon\Master::Summon(array('Notifier', $notify_type, $post_id)); + + logger('post_complete'); + + // figure out how to return, depending on from whence we came + + if($api_source) + return $post; + + if($return_path) { + goaway(z_root() . "/" . $return_path); + } + + $json = array('success' => 1); + if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) + $json['reload'] = z_root() . '/' . $_REQUEST['jsreload']; + + logger('post_json: ' . print_r($json,true), LOGGER_DEBUG); + + echo json_encode($json); + killme(); + // NOTREACHED + } + + + function get() { + + if((! local_channel()) && (! remote_channel())) + return; + + require_once('include/security.php'); + + if((argc() == 3) && (argv(1) === 'drop') && intval(argv(2))) { + + require_once('include/items.php'); + $i = q("select id, uid, author_xchan, owner_xchan, source_xchan, item_type from item where id = %d limit 1", + intval(argv(2)) + ); + + if($i) { + $can_delete = false; + $local_delete = false; + if(local_channel() && local_channel() == $i[0]['uid']) + $local_delete = true; + + $sys = get_sys_channel(); + if(is_site_admin() && $sys['channel_id'] == $i[0]['uid']) + $can_delete = true; + + $ob_hash = get_observer_hash(); + if($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) + $can_delete = true; + + if(! ($can_delete || $local_delete)) { + notice( t('Permission denied.') . EOL); + return; + } + + // if this is a different page type or it's just a local delete + // but not by the item author or owner, do a simple deletion + + if(intval($i[0]['item_type']) || ($local_delete && (! $can_delete))) { + drop_item($i[0]['id']); + } + else { + // complex deletion that needs to propagate and be performed in phases + drop_item($i[0]['id'],true,DROPITEM_PHASE1); + tag_deliver($i[0]['uid'],$i[0]['id']); + } + } + } + } + + + function fix_attached_photo_permissions($uid,$xchan_hash,$body, + $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny) { + + if(get_pconfig($uid,'system','force_public_uploads')) { + $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = ''; + } + + $match = null; + // match img and zmg image links + if(preg_match_all("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/",$body,$match)) { + $images = $match[2]; + if($images) { + foreach($images as $image) { + if(! stristr($image,z_root() . '/photo/')) + continue; + $image_uri = substr($image,strrpos($image,'/') + 1); + if(strpos($image_uri,'-') !== false) + $image_uri = substr($image_uri,0, strpos($image_uri,'-')); + if(strpos($image_uri,'.') !== false) + $image_uri = substr($image_uri,0, strpos($image_uri,'.')); + if(! strlen($image_uri)) + continue; + $srch = '<' . $xchan_hash . '>'; + + $r = q("select folder from attach where hash = '%s' and uid = %d limit 1", + dbesc($image_uri), + intval($uid) + ); + if($r && $r[0]['folder']) { + $f = q("select * from attach where hash = '%s' and is_dir = 1 and uid = %d limit 1", + dbesc($r[0]['folder']), + intval($uid) + ); + if(($f) && (($f[0]['allow_cid']) || ($f[0]['allow_gid']) || ($f[0]['deny_cid']) || ($f[0]['deny_gid']))) { + $str_contact_allow = $f[0]['allow_cid']; + $str_group_allow = $f[0]['allow_gid']; + $str_contact_deny = $f[0]['deny_cid']; + $str_group_deny = $f[0]['deny_gid']; + } + } + + $r = q("SELECT id FROM photo + WHERE allow_cid = '%s' AND allow_gid = '' AND deny_cid = '' AND deny_gid = '' + AND resource_id = '%s' AND uid = %d LIMIT 1", + dbesc($srch), + dbesc($image_uri), + intval($uid) + ); + + if($r) { + $r = q("UPDATE photo SET allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' + WHERE resource_id = '%s' AND uid = %d ", + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), + dbesc($image_uri), + intval($uid) + ); + + // also update the linked item (which is probably invisible) + + $r = q("select id from item + WHERE allow_cid = '%s' AND allow_gid = '' AND deny_cid = '' AND deny_gid = '' + AND resource_id = '%s' and resource_type = 'photo' AND uid = %d LIMIT 1", + dbesc($srch), + dbesc($image_uri), + intval($uid) + ); + if($r) { + $private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false); + + $r = q("UPDATE item SET allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d + WHERE id = %d AND uid = %d", + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), + intval($private), + intval($r[0]['id']), + intval($uid) + ); + } + $r = q("select id from attach where hash = '%s' and uid = %d limit 1", + dbesc($image_uri), + intval($uid) + ); + if($r) { + q("update attach SET allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' + WHERE id = %d AND uid = %d", + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), + intval($r[0]['id']), + intval($uid) + ); + } + } + } + } + } + } + + + function fix_attached_file_permissions($channel,$observer_hash,$body, + $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny) { + + if(get_pconfig($channel['channel_id'],'system','force_public_uploads')) { + $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = ''; + } + + $match = false; + + if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) { + $attaches = $match[1]; + if($attaches) { + foreach($attaches as $attach) { + $hash = substr($attach,0,strpos($attach,',')); + $rev = intval(substr($attach,strpos($attach,','))); + attach_store($channel,$observer_hash,$options = 'update', array( + 'hash' => $hash, + 'revision' => $rev, + 'allow_cid' => $str_contact_allow, + 'allow_gid' => $str_group_allow, + 'deny_cid' => $str_contact_deny, + 'deny_gid' => $str_group_deny + )); + } + } + } + } + + function item_check_service_class($channel_id,$iswebpage) { + $ret = array('success' => false, 'message' => ''); + + if ($iswebpage) { + $r = q("select count(i.id) as total from item i + right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id ) + and i.parent=i.id and i.item_type = %d and i.item_deleted = 0 and i.uid= %d ", + intval(ITEM_TYPE_WEBPAGE), + intval($channel_id) + ); + } + else { + $r = q("select count(id) as total from item where parent = id and item_wall = 1 and uid = %d " . item_normal(), + intval($channel_id) + ); + } + + if(! $r) { + $ret['message'] = t('Unable to obtain post information from database.'); + return $ret; + } + + if (!$iswebpage) { + $max = engr_units_to_bytes(service_class_fetch($channel_id,'total_items')); + if(! service_class_allows($channel_id,'total_items',$r[0]['total'])) { + $result['message'] .= upgrade_message() . sprintf( t('You have reached your limit of %1$.0f top level posts.'),$max); + return $result; + } + } + else { + $max = engr_units_to_bytes(service_class_fetch($channel_id,'total_pages')); + if(! service_class_allows($channel_id,'total_pages',$r[0]['total'])) { + $result['message'] .= upgrade_message() . sprintf( t('You have reached your limit of %1$.0f webpages.'),$max); + return $result; + } + } + + $ret['success'] = true; + return $ret; + } + + +} diff --git a/Zotlabs/Module/Lang.php b/Zotlabs/Module/Lang.php new file mode 100644 index 000000000..69f10fe6d --- /dev/null +++ b/Zotlabs/Module/Lang.php @@ -0,0 +1,12 @@ + 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + \App::$is_sys = true; + } + } + + if(argc() > 1) + $which = argv(1); + else + return; + + profile_load($which); + + } + + function get() { + + if(! \App::$profile) { + notice( t('Requested profile is not available.') . EOL ); + \App::$error = 404; + return; + } + + $which = argv(1); + + $_SESSION['return_url'] = \App::$query_string; + + $uid = local_channel(); + $owner = 0; + $channel = null; + $observer = \App::get_observer(); + + $channel = \App::get_channel(); + + if(\App::$is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } + + if(! $owner) { + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } + + // Block design features from visitors + + if((! $uid) || ($uid != $owner)) { + notice( t('Permission denied.') . EOL); + return; + } + + // Get the observer, check their permissions + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } + + // This feature is not exposed in redbasic ui since it is not clear why one would want to + // download a json encoded pdl file - we dont have a possibility to import it. + // Use the buildin share/install feature instead. + + if((argc() > 3) && (argv(2) === 'share') && (argv(3))) { + $r = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig + left join item on item.id = iconfig.iid + where uid = %d and mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc", + intval($owner), + dbesc(argv(3)) + ); + if($r) { + header('Content-type: application/x-hubzilla-layout'); + header('Content-disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"'); + echo json_encode($r); + killme(); + } + } + + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages + // Nickname is set to the observers xchan, and profile_uid to the owners. + // This lets you post pages at other people's channels. + + $x = array( + 'webpage' => ITEM_TYPE_PDL, + 'is_owner' => true, + 'nickname' => \App::$profile['channel_address'], + 'showacl' => false, + 'hide_voting' => true, + 'hide_future' => true, + 'hide_expire' => true, + 'hide_location' => true, + 'hide_weblink' => true, + 'hide_attach' => true, + 'hide_preview' => true, + 'ptlabel' => t('Layout Name'), + 'profile_uid' => intval($owner), + 'expanded' => true, + 'placeholdertitle' => t('Layout Description (Optional)'), + 'novoting' => true, + 'bbco_autocomplete' => 'comanche' + ); + + if($_REQUEST['title']) + $x['title'] = $_REQUEST['title']; + if($_REQUEST['body']) + $x['body'] = $_REQUEST['body']; + if($_REQUEST['pagetitle']) + $x['pagetitle'] = $_REQUEST['pagetitle']; + + $editor = status_editor($a,$x); + + $r = q("select iconfig.iid, iconfig.v, mid, title, body, mimetype, created, edited, item_type from iconfig + left join item on iconfig.iid = item.id + where uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' and item_type = %d order by item.created desc", + intval($owner), + intval(ITEM_TYPE_PDL) + ); + + $pages = null; + + if($r) { + $pages = array(); + foreach($r as $rr) { + $element_arr = array( + 'type' => 'layout', + 'title' => $rr['title'], + 'body' => $rr['body'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'pagetitle' => $rr['sid'], + 'mid' => $rr['mid'] + ); + $pages[$rr['iid']][] = array( + 'url' => $rr['iid'], + 'title' => $rr['v'], + 'descr' => $rr['title'], + 'mid' => $rr['mid'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' + ); + } + } + + //Build the base URL for edit links + $url = z_root() . '/editlayout/' . $which; + + $o .= replace_macros(get_markup_template('layoutlist.tpl'), array( + '$title' => t('Layouts'), + '$create' => t('Create'), + '$help' => array('text' => t('Help'), 'url' => 'help/comanche', 'title' => t('Comanche page description language help')), + '$editor' => $editor, + '$baseurl' => $url, + '$name' => t('Layout Name'), + '$descr' => t('Layout Description'), + '$created' => t('Created'), + '$edited' => t('Edited'), + '$edit' => t('Edit'), + '$share' => t('Share'), + '$download' => t('Download PDL file'), + '$pages' => $pages, + '$channel' => $which, + '$view' => t('View'), + )); + + return $o; + + } + +} diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php new file mode 100644 index 000000000..170349509 --- /dev/null +++ b/Zotlabs/Module/Like.php @@ -0,0 +1,546 @@ +' . t('Like/Dislike') . ''; + $o .= EOL . EOL; + + if(! $observer) { + $_SESSION['return_url'] = \App::$query_string; + $o .= t('This action is restricted to members.') . EOL; + $o .= t('Please login with your $Projectname ID or register as a new $Projectname member to continue.') . EOL; + return $o; + } + } + + $verb = notags(trim($_GET['verb'])); + + if(! $verb) + $verb = 'like'; + + switch($verb) { + case 'like': + case 'unlike': + $activity = ACTIVITY_LIKE; + break; + case 'dislike': + case 'undislike': + $activity = ACTIVITY_DISLIKE; + break; + case 'agree': + case 'unagree': + $activity = ACTIVITY_AGREE; + break; + case 'disagree': + case 'undisagree': + $activity = ACTIVITY_DISAGREE; + break; + case 'abstain': + case 'unabstain': + $activity = ACTIVITY_ABSTAIN; + break; + case 'attendyes': + case 'unattendyes': + $activity = ACTIVITY_ATTEND; + break; + case 'attendno': + case 'unattendno': + $activity = ACTIVITY_ATTENDNO; + break; + case 'attendmaybe': + case 'unattendmaybe': + $activity = ACTIVITY_ATTENDMAYBE; + break; + default: + return; + break; + } + + $extended_like = false; + $object = $target = null; + $post_type = ''; + $objtype = ''; + + if(argc() == 3) { + + if(! $observer) + killme(); + + $extended_like = true; + $obj_type = argv(1); + $obj_id = argv(2); + $public = true; + + if($obj_type == 'profile') { + $r = q("select * from profile where profile_guid = '%s' limit 1", + dbesc(argv(2)) + ); + if(! $r) + killme(); + $owner_uid = $r[0]['uid']; + if($r[0]['is_default']) + $public = true; + if(! $public) { + $d = q("select abook_xchan from abook where abook_profile = '%s' and abook_channel = %d", + dbesc($r[0]['profile_guid']), + intval($owner_uid) + ); + if(! $d) { + // forgery - illegal + if($interactive) { + notice( t('Invalid request.') . EOL); + return $o; + } + killme(); + } + // $d now contains a list of those who can see this profile - only send the status notification + // to them. + $allow_cid = $allow_gid = $deny_cid = $deny_gid = ''; + foreach($d as $dd) { + $allow_cid .= '<' . $dd['abook_xchan'] . '>'; + } + } + $post_type = t('channel'); + $objtype = ACTIVITY_OBJ_PROFILE; + + $profile = $r[0]; + } + elseif($obj_type == 'thing') { + + $r = q("select * from obj where obj_type = %d and obj_obj = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc(argv(2)) + ); + + if(! $r) { + if($interactive) { + notice( t('Invalid request.') . EOL); + return $o; + } + killme(); + } + + $owner_uid = $r[0]['obj_channel']; + + $allow_cid = $r[0]['allow_cid']; + $allow_gid = $r[0]['allow_gid']; + $deny_cid = $r[0]['deny_cid']; + $deny_gid = $r[0]['deny_gid']; + if($allow_cid || $allow_gid || $deny_cid || $deny_gid) + $public = false; + + $post_type = t('thing'); + $objtype = ACTIVITY_OBJ_PROFILE; + $tgttype = ACTIVITY_OBJ_THING; + + $links = array(); + $links[] = array('rel' => 'alternate', 'type' => 'text/html', + 'href' => z_root() . '/thing/' . $r[0]['obj_obj']); + if($r[0]['imgurl']) + $links[] = array('rel' => 'photo', 'href' => $r[0]['obj_imgurl']); + + $target = json_encode(array( + 'type' => $tgttype, + 'title' => $r[0]['obj_term'], + 'id' => z_root() . '/thing/' . $r[0]['obj_obj'], + 'link' => $links + )); + + $plink = '[zrl=' . z_root() . '/thing/' . $r[0]['obj_obj'] . ']' . $r[0]['obj_term'] . '[/zrl]'; + + } + + if(! ($owner_uid && $r)) { + if($interactive) { + notice( t('Invalid request.') . EOL); + return $o; + } + killme(); + } + + // The resultant activity is going to be a wall-to-wall post, so make sure this is allowed + + $perms = get_all_perms($owner_uid,$observer['xchan_hash']); + + if(! ($perms['post_like'] && $perms['view_profile'])) { + if($interactive) { + notice( t('Permission denied.') . EOL); + return $o; + } + killme(); + } + + $ch = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1", + intval($owner_uid) + ); + if(! $ch) { + if($interactive) { + notice( t('Channel unavailable.') . EOL); + return $o; + } + killme(); + } + + if(! $plink) + $plink = '[zrl=' . z_root() . '/profile/' . $ch[0]['channel_address'] . ']' . $post_type . '[/zrl]'; + + $links = array(); + $links[] = array('rel' => 'alternate', 'type' => 'text/html', + 'href' => z_root() . '/profile/' . $ch[0]['channel_address']); + $links[] = array('rel' => 'photo', 'type' => $ch[0]['xchan_photo_mimetype'], + 'href' => $ch[0]['xchan_photo_l']); + + $object = json_encode(array( + 'type' => ACTIVITY_OBJ_PROFILE, + 'title' => $ch[0]['channel_name'], + 'id' => $ch[0]['xchan_url'] . '/' . $ch[0]['xchan_hash'], + 'link' => $links + )); + + + // second like of the same thing is "undo" for the first like + + $z = q("select * from likes where channel_id = %d and liker = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' limit 1", + intval($ch[0]['channel_id']), + dbesc($observer['xchan_hash']), + dbesc($activity), + dbesc(($tgttype)?$tgttype:$objtype), + dbesc($obj_id) + ); + + if($z) { + $z[0]['deleted'] = 1; + build_sync_packet($ch[0]['channel_id'],array('likes' => $z)); + + q("delete from likes where id = %d limit 1", + intval($z[0]['id']) + ); + if($z[0]['i_mid']) { + $r = q("select id from item where mid = '%s' and uid = %d limit 1", + dbesc($z[0]['i_mid']), + intval($ch[0]['channel_id']) + ); + if($r) + drop_item($r[0]['id'],false); + if($interactive) { + notice( t('Previous action reversed.') . EOL); + return $o; + } + } + killme(); + } + } + else { + + // this is used to like an item or comment + + $item_id = ((argc() == 2) ? notags(trim(argv(1))) : 0); + + logger('like: verb ' . $verb . ' item ' . $item_id, LOGGER_DEBUG); + + // get the item. Allow linked photos (which are normally hidden) to be liked + + $r = q("SELECT * FROM item WHERE id = %d + and item_type = 0 and item_deleted = 0 and item_unpublished = 0 + and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1", + intval($item_id) + ); + + if(! $item_id || (! $r)) { + logger('like: no item ' . $item_id); + killme(); + } + + + xchan_query($r,true,(($r[0]['uid'] == local_channel()) ? 0 : local_channel())); + + $item = $r[0]; + + $owner_uid = $r[0]['uid']; + $owner_aid = $r[0]['aid']; + + $can_comment = false; + if((array_key_exists('owner',$item)) && intval($item['owner']['abook_self'])) + $can_comment = perm_is_allowed($item['uid'],$observer['xchan_hash'],'post_comments'); + else + $can_comment = can_comment_on_post($observer['xchan_hash'],$item); + + if(! $can_comment) { + notice( t('Permission denied') . EOL); + killme(); + } + + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['owner_xchan']) + ); + if($r) + $thread_owner = $r[0]; + else + killme(); + + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) + ); + if($r) + $item_author = $r[0]; + else + killme(); + + + $verbs = " '".dbesc($activity)."' "; + + $multi_undo = false; + + // event participation and consensus items are essentially radio toggles. If you make a subsequent choice, + // we need to eradicate your first choice. + + if($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) { + $verbs = " '" . dbesc(ACTIVITY_ATTEND) . "','" . dbesc(ACTIVITY_ATTENDNO) . "','" . dbesc(ACTIVITY_ATTENDMAYBE) . "' "; + $multi_undo = 1; + } + if($activity === ACTIVITY_AGREE || $activity === ACTIVITY_DISAGREE || $activity === ACTIVITY_ABSTAIN) { + $verbs = " '" . dbesc(ACTIVITY_AGREE) . "','" . dbesc(ACTIVITY_DISAGREE) . "','" . dbesc(ACTIVITY_ABSTAIN) . "' "; + $multi_undo = true; + } + + $item_normal = item_normal(); + + $r = q("SELECT id, parent, uid, verb FROM item WHERE verb in ( $verbs ) $item_normal + AND author_xchan = '%s' AND thr_parent = '%s' and uid = %d ", + dbesc($observer['xchan_hash']), + dbesc($item['mid']), + intval($owner_uid) + ); + + if($r) { + // already liked it. Drop that item. + require_once('include/items.php'); + foreach($r as $rr) { + drop_item($rr['id'],false,DROPITEM_PHASE1); + // set the changed timestamp on the parent so we'll see the update without a page reload + $z = q("update item set changed = '%s' where id = %d and uid = %d", + dbesc(datetime_convert()), + intval($rr['parent']), + intval($rr['uid']) + ); + // Prior activity was a duplicate of the one we're submitting, just undo it; + // don't fall through and create another + if(activity_match($rr['verb'],$activity)) + $multi_undo = false; + + // drop_item was not done interactively, so we need to invoke the notifier + // in order to push the changes to connections + + \Zotlabs\Daemon\Master::Summon(array('Notifier','drop',$rr['id'])); + + } + + if($interactive) + return; + + if(! $multi_undo) + killme(); + } + } + + $mid = item_message_id(); + + $arr = array(); + + if($extended_like) { + $arr['item_thread_top'] = 1; + $arr['item_origin'] = 1; + $arr['item_wall'] = 1; + } + else { + $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); + if($item['obj_type'] === ACTIVITY_OBJ_EVENT) + $post_type = t('event'); + + $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink'])); + $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); + + $body = $item['body']; + + $object = json_encode(array( + 'type' => $objtype, + 'id' => $item['mid'], + 'parent' => (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']), + 'link' => $links, + 'title' => $item['title'], + 'content' => $item['body'], + 'created' => $item['created'], + 'edited' => $item['edited'], + 'author' => array( + 'name' => $item_author['xchan_name'], + 'address' => $item_author['xchan_addr'], + 'guid' => $item_author['xchan_guid'], + 'guid_sig' => $item_author['xchan_guid_sig'], + 'link' => array( + array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']), + array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])), + ), + )); + + if(! intval($item['item_thread_top'])) + $post_type = 'comment'; + + $arr['item_origin'] = 1; + $arr['item_notshown'] = 1; + + if(intval($item['item_wall'])) + $arr['item_wall'] = 1; + + // if this was a linked photo and was hidden, unhide it. + + if(intval($item['item_hidden'])) { + $r = q("update item set item_hidden = 0 where id = %d", + intval($item['id']) + ); + } + + } + + if($verb === 'like') + $bodyverb = t('%1$s likes %2$s\'s %3$s'); + if($verb === 'dislike') + $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); + if($verb === 'agree') + $bodyverb = t('%1$s agrees with %2$s\'s %3$s'); + if($verb === 'disagree') + $bodyverb = t('%1$s doesn\'t agree with %2$s\'s %3$s'); + if($verb === 'abstain') + $bodyverb = t('%1$s abstains from a decision on %2$s\'s %3$s'); + if($verb === 'attendyes') + $bodyverb = t('%1$s is attending %2$s\'s %3$s'); + if($verb === 'attendno') + $bodyverb = t('%1$s is not attending %2$s\'s %3$s'); + if($verb === 'attendmaybe') + $bodyverb = t('%1$s may attend %2$s\'s %3$s'); + + if(! isset($bodyverb)) + killme(); + + + + if($extended_like) { + $ulink = '[zrl=' . $ch[0]['xchan_url'] . ']' . $ch[0]['xchan_name'] . '[/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $private = (($public) ? 0 : 1); + } + else { + $arr['parent'] = $item['id']; + $arr['thr_parent'] = $item['mid']; + $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $plink = '[zrl=' . z_root() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]'; + $allow_cid = $item['allow_cid']; + $allow_gid = $item['allow_gid']; + $deny_cid = $item['deny_cid']; + $deny_gid = $item['deny_gid']; + $private = $item['private']; + + } + + + $arr['mid'] = $mid; + $arr['aid'] = (($extended_like) ? $ch[0]['channel_account_id'] : $owner_aid); + $arr['uid'] = $owner_uid; + $arr['item_flags'] = $item_flags; + $arr['item_wall'] = $item_wall; + $arr['parent_mid'] = (($extended_like) ? $mid : $item['mid']); + $arr['owner_xchan'] = (($extended_like) ? $ch[0]['xchan_hash'] : $thread_owner['xchan_hash']); + $arr['author_xchan'] = $observer['xchan_hash']; + + + $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); + if($obj_type === 'thing' && $r[0]['imgurl']) { + $arr['body'] .= "\n\n[zmg=80x80]" . $r[0]['imgurl'] . '[/zmg]'; + } + if($obj_type === 'profile') { + if($public) { + $arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $ch[0]['channel_address'] . '[/embed]'; + } + else + $arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]'; + } + + + $arr['verb'] = $activity; + $arr['obj_type'] = $objtype; + $arr['obj'] = $object; + + if($target) { + $arr['tgt_type'] = $tgttype; + $arr['target'] = $target; + } + + $arr['allow_cid'] = $allow_cid; + $arr['allow_gid'] = $allow_gid; + $arr['deny_cid'] = $deny_cid; + $arr['deny_gid'] = $deny_gid; + $arr['item_private'] = $private; + + + $post = item_store($arr); + $post_id = $post['item_id']; + + $arr['id'] = $post_id; + + call_hooks('post_local_end', $arr); + + + if($extended_like) { + $r = q("insert into likes (channel_id,liker,likee,iid,i_mid,verb,target_type,target_id,target) values (%d,'%s','%s',%d,'%s','%s','%s','%s','%s')", + intval($ch[0]['channel_id']), + dbesc($observer['xchan_hash']), + dbesc($ch[0]['channel_hash']), + intval($post_id), + dbesc($mid), + dbesc($activity), + dbesc(($tgttype)? $tgttype : $objtype), + dbesc($obj_id), + dbesc(($target) ? $target : $object) + ); + $r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ", + dbesc($observer['xchan_hash']), + dbesc($ch[0]['channel_hash']), + dbesc($mid), + dbesc($activity), + dbesc(($tgttype)? $tgttype : $objtype), + dbesc($obj_id) + ); + if($r) + build_sync_packet($ch[0]['channel_id'],array('likes' => $r)); + + } + + + \Zotlabs\Daemon\Master::Summon(array('Notifier','like',$post_id)); + + if($interactive) { + notice( t('Action completed.') . EOL); + $o .= t('Thank you.'); + return $o; + } + + killme(); + } + + + +} diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php new file mode 100644 index 000000000..e1a3a6abe --- /dev/null +++ b/Zotlabs/Module/Linkinfo.php @@ -0,0 +1,381 @@ + true, 'nobody' => true)); + if($result['success']) { + $hdrs=array(); + $h = explode("\n",$result['header']); + foreach ($h as $l) { + list($k,$v) = array_map("trim", explode(":", trim($l), 2)); + $hdrs[$k] = $v; + } + if (array_key_exists('Content-Type', $hdrs)) + $type = $hdrs['Content-Type']; + if($type) { + $zrl = is_matrix_url($url); + if(stripos($type,'image/') !== false) { + if($zrl) + echo $br . '[zmg]' . $url . '[/zmg]' . $br; + else + echo $br . '[img]' . $url . '[/img]' . $br; + killme(); + } + if(stripos($type,'video/') !== false) { + if($zrl) + echo $br . '[zvideo]' . $url . '[/zvideo]' . $br; + else + echo $br . '[video]' . $url . '[/video]' . $br; + killme(); + } + if(stripos($type,'audio/') !== false) { + if($zrl) + echo $br . '[zaudio]' . $url . '[/zaudio]' . $br; + else + echo $br . '[audio]' . $url . '[/audio]' . $br; + killme(); + } + } + } + + $template = $br . '#^[url=%s]%s[/url]%s' . $br; + + $arr = array('url' => $url, 'text' => ''); + + call_hooks('parse_link', $arr); + + if(strlen($arr['text'])) { + echo $arr['text']; + killme(); + } + + $x = oembed_process($url); + if($x) { + echo $x; + killme(); + } + + if($url && $title && $text) { + + $text = $br . '[quote]' . trim($text) . '[/quote]' . $br; + + $title = str_replace(array("\r","\n"),array('',''),$title); + + $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags; + + logger('linkinfo (unparsed): returns: ' . $result); + + echo $result; + killme(); + } + + $siteinfo = self::parseurl_getsiteinfo($url); + + // If this is a Red site, use zrl rather than url so they get zids sent to them by default + + if( x($siteinfo,'generator') && (strpos($siteinfo['generator'], \Zotlabs\Lib\System::get_platform_name() . ' ') === 0)) + $template = str_replace('url','zrl',$template); + + if($siteinfo["title"] == "") { + echo sprintf($template,$url,$url,'') . $str_tags; + killme(); + } else { + $text = $siteinfo["text"]; + $title = $siteinfo["title"]; + } + + $image = ""; + + if(sizeof($siteinfo["images"]) > 0){ + /* Execute below code only if image is present in siteinfo */ + + $total_images = 0; + $max_images = get_config('system','max_bookmark_images'); + if($max_images === false) + $max_images = 2; + else + $max_images = intval($max_images); + + foreach ($siteinfo["images"] as $imagedata) { + if ($url) { + $image .= sprintf('[url=%s]', $url); + } + $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]'; + if ($url) { + $image .= '[/url]'; + } + $image .= "\n"; + $total_images ++; + if($max_images && $max_images >= $total_images) + break; + } + } + + if(strlen($text)) { + $text = $br.'[quote]'.trim($text).'[/quote]'.$br ; + } + + if($image) { + $text = $br.$br.$image.$text; + } + $title = str_replace(array("\r","\n"),array('',''),$title); + + $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags; + + logger('linkinfo: returns: ' . $result, LOGGER_DEBUG); + + echo trim($result); + killme(); + + } + + + public static function deletexnode(&$doc, $node) { + $xpath = new \DomXPath($doc); + $list = $xpath->query("//".$node); + foreach ($list as $child) + $child->parentNode->removeChild($child); + } + + public static function completeurl($url, $scheme) { + $urlarr = parse_url($url); + + if (isset($urlarr["scheme"])) + return($url); + + $schemearr = parse_url($scheme); + + $complete = $schemearr["scheme"]."://".$schemearr["host"]; + + if ($schemearr["port"] != "") + $complete .= ":".$schemearr["port"]; + + if(strpos($urlarr['path'],'/') !== 0) + $complete .= '/'; + + $complete .= $urlarr["path"]; + + if ($urlarr["query"] != "") + $complete .= "?".$urlarr["query"]; + + if ($urlarr["fragment"] != "") + $complete .= "#".$urlarr["fragment"]; + + return($complete); + } + + + public static function parseurl_getsiteinfo($url) { + $siteinfo = array(); + + + $result = z_fetch_url($url,false,0,array('novalidate' => true)); + if(! $result['success']) + return $siteinfo; + + $header = $result['header']; + $body = $result['body']; + + $body = mb_convert_encoding($body, 'UTF-8', 'UTF-8'); + $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); + + $doc = new \DOMDocument(); + @$doc->loadHTML($body); + + self::deletexnode($doc, 'style'); + self::deletexnode($doc, 'script'); + self::deletexnode($doc, 'option'); + self::deletexnode($doc, 'h1'); + self::deletexnode($doc, 'h2'); + self::deletexnode($doc, 'h3'); + self::deletexnode($doc, 'h4'); + self::deletexnode($doc, 'h5'); + self::deletexnode($doc, 'h6'); + self::deletexnode($doc, 'ol'); + self::deletexnode($doc, 'ul'); + + $xpath = new \DomXPath($doc); + + //$list = $xpath->query("head/title"); + $list = $xpath->query("//title"); + foreach ($list as $node) + $siteinfo["title"] = html_entity_decode($node->nodeValue, ENT_QUOTES, "UTF-8"); + + //$list = $xpath->query("head/meta[@name]"); + $list = $xpath->query("//meta[@name]"); + foreach ($list as $node) { + $attr = array(); + if ($node->attributes->length) + foreach ($node->attributes as $attribute) + $attr[$attribute->name] = $attribute->value; + + $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"); + + switch (strtolower($attr["name"])) { + case 'generator': + $siteinfo['generator'] = $attr['content']; + break; + case "fulltitle": + $siteinfo["title"] = $attr["content"]; + break; + case "description": + $siteinfo["text"] = $attr["content"]; + break; + case "dc.title": + $siteinfo["title"] = $attr["content"]; + break; + case "dc.description": + $siteinfo["text"] = $attr["content"]; + break; + } + } + + //$list = $xpath->query("head/meta[@property]"); + $list = $xpath->query("//meta[@property]"); + foreach ($list as $node) { + $attr = array(); + if ($node->attributes->length) + foreach ($node->attributes as $attribute) + $attr[$attribute->name] = $attribute->value; + + $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"); + + switch (strtolower($attr["property"])) { + case "og:image": + $siteinfo["image"] = $attr["content"]; + break; + case "og:title": + $siteinfo["title"] = $attr["content"]; + break; + case "og:description": + $siteinfo["text"] = $attr["content"]; + break; + } + } + + if ($siteinfo["image"] == "") { + $list = $xpath->query("//img[@src]"); + foreach ($list as $node) { + $attr = array(); + if ($node->attributes->length) + foreach ($node->attributes as $attribute) + $attr[$attribute->name] = $attribute->value; + + $src = self::completeurl($attr["src"], $url); + $photodata = @getimagesize($src); + + if (($photodata) && ($photodata[0] > 150) and ($photodata[1] > 150)) { + if ($photodata[0] > 300) { + $photodata[1] = round($photodata[1] * (300 / $photodata[0])); + $photodata[0] = 300; + } + if ($photodata[1] > 300) { + $photodata[0] = round($photodata[0] * (300 / $photodata[1])); + $photodata[1] = 300; + } + $siteinfo["images"][] = array("src"=>$src, + "width"=>$photodata[0], + "height"=>$photodata[1]); + } + + } + } else { + $src = self::completeurl($siteinfo["image"], $url); + + unset($siteinfo["image"]); + + $photodata = @getimagesize($src); + + if (($photodata) && ($photodata[0] > 10) and ($photodata[1] > 10)) + $siteinfo["images"][] = array("src"=>$src, + "width"=>$photodata[0], + "height"=>$photodata[1]); + } + + if ($siteinfo["text"] == "") { + $text = ""; + + $list = $xpath->query("//div[@class='article']"); + foreach ($list as $node) + if (strlen($node->nodeValue) > 40) + $text .= " ".trim($node->nodeValue); + + if ($text == "") { + $list = $xpath->query("//div[@class='content']"); + foreach ($list as $node) + if (strlen($node->nodeValue) > 40) + $text .= " ".trim($node->nodeValue); + } + + // If none text was found then take the paragraph content + if ($text == "") { + $list = $xpath->query("//p"); + foreach ($list as $node) + if (strlen($node->nodeValue) > 40) + $text .= " ".trim($node->nodeValue); + } + + if ($text != "") { + $text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text)); + + while (strpos($text, " ")) + $text = trim(str_replace(" ", " ", $text)); + + $siteinfo["text"] = html_entity_decode(substr($text,0,350), ENT_QUOTES, "UTF-8").'...'; + } + } + + return($siteinfo); + } + + + private static function arr_add_hashes(&$item,$k) { + $item = '#' . $item; + } + + + + +} diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php new file mode 100644 index 000000000..d86a3c1d8 --- /dev/null +++ b/Zotlabs/Module/Lockview.php @@ -0,0 +1,152 @@ + 1) ? argv(1) : 0); + if (is_numeric($type)) { + $item_id = intval($type); + $type='item'; + } + else { + $item_id = ((argc() > 2) ? intval(argv(2)) : 0); + } + + if(! $item_id) + killme(); + + if (!in_array($type, array('item','photo','event', 'menu_item', 'chatroom'))) + killme(); + + //we have different naming in in menu_item table and chatroom table + switch($type) { + case 'menu_item': + $id = 'mitem_id'; + break; + case 'chatroom': + $id = 'cr_id'; + break; + default: + $id = 'id'; + break; + } + + $r = q("SELECT * FROM %s WHERE $id = %d LIMIT 1", + dbesc($type), + intval($item_id) + ); + + if(! $r) + killme(); + + $item = $r[0]; + + //we have different naming in in menu_item table and chatroom table + switch($type) { + case 'menu_item': + $uid = $item['mitem_channel_id']; + break; + case 'chatroom': + $uid = $item['cr_uid']; + break; + default: + $uid = $item['uid']; + break; + } + + if($uid != local_channel()) { + echo '
' . $o . '
';
+
+ $ret['width'] = $w;
+ $ret['height'] = $h;
+
+ return $ret;
+
+ }
+
+ function oep_mid_reply($args) {
+
+ $ret = array();
+ $url = $args['url'];
+ $maxwidth = intval($args['maxwidth']);
+ $maxheight = intval($args['maxheight']);
+
+ if(preg_match('#//(.*?)/(.*?)/(.*?)/(.*?)mid\=(.*?)(&|$)#',$url,$matches)) {
+ $chn = $matches[3];
+ $res = $matches[5];
+ }
+
+ if(! ($chn && $res))
+ return;
+ $c = q("select * from channel where channel_address = '%s' limit 1",
+ dbesc($chn)
+ );
+
+ if(! $c)
+ return;
+
+ $sql_extra = item_permissions_sql($c[0]['channel_id']);
+
+ $p = q("select * from item where mid = '%s' and uid = %d $sql_extra limit 1",
+ dbesc($res),
+ intval($c[0]['channel_id'])
+ );
+ if(! $p)
+ return;
+
+ xchan_query($p,true);
+ $p = fetch_post_tags($p,true);
+
+ $o = "[share author='".urlencode($p[0]['author']['xchan_name']).
+ "' profile='".$p[0]['author']['xchan_url'] .
+ "' avatar='".$p[0]['author']['xchan_photo_s'].
+ "' link='".$p[0]['plink'].
+ "' posted='".$p[0]['created'].
+ "' message_id='".$p[0]['mid']."']";
+ if($p[0]['title'])
+ $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
+ $o .= $p[0]['body'];
+ $o .= "[/share]";
+ $o = bbcode($o);
+
+ $ret['type'] = 'rich';
+
+ $w = (($maxwidth) ? $maxwidth : 640);
+ $h = (($maxheight) ? $maxheight : $w * 2 / 3);
+
+ $ret['html'] = '' . $o . '
';
+
+ $ret['width'] = $w;
+ $ret['height'] = $h;
+
+ return $ret;
+
+ }
+
+ function oep_profile_reply($args) {
+
+
+ require_once('include/channel.php');
+
+ $url = $args['url'];
+
+ if(preg_match('#//(.*?)/(.*?)/(.*?)(/|\?|&|$)#',$url,$matches)) {
+ $chn = $matches[3];
+ }
+
+ if(! $chn)
+ return;
+
+ $c = channelx_by_nick($chn);
+
+ if(! $c)
+ return;
+
+
+ $maxwidth = intval($args['maxwidth']);
+ $maxheight = intval($args['maxheight']);
+
+ $width = 800;
+ $height = 375;
+
+ if($maxwidth) {
+ $width = $maxwidth;
+ $height = (375 / 800) * $width;
+ }
+ if($maxheight) {
+ if($maxheight < $height) {
+ $width = (800 / 375) * $maxheight;
+ $height = $maxheight;
+ }
+ }
+ $ret = array();
+
+ $ret['type'] = 'rich';
+ $ret['width'] = intval($width);
+ $ret['height'] = intval($height);
+
+ $ret['html'] = get_zcard_embed($c,get_observer_hash(),array('width' => $width, 'height' => $height));
+
+ return $ret;
+
+ }
+
+ function oep_album_reply($args) {
+
+ $ret = array();
+ $url = $args['url'];
+ $maxwidth = intval($args['maxwidth']);
+ $maxheight = intval($args['maxheight']);
+
+ if(preg_match('|//(.*?)/(.*?)/(.*?)/album/|',$url,$matches)) {
+ $chn = $matches[3];
+ $res = hex2bin(basename($url));
+ }
+
+ if(! ($chn && $res))
+ return;
+ $c = q("select * from channel where channel_address = '%s' limit 1",
+ dbesc($chn)
+ );
+
+ if(! $c)
+ return;
+
+ $sql_extra = permissions_sql($c[0]['channel_id']);
+
+ $p = q("select resource_id from photo where album = '%s' and uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
+ dbesc($res),
+ intval($c[0]['channel_id'])
+ );
+ if(! $p)
+ return;
+
+ $res = $p[0]['resource_id'];
+
+ $r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
+ intval($c[0]['channel_id']),
+ dbesc($res)
+ );
+
+ if($r) {
+ foreach($r as $rr) {
+ $foundres = false;
+ if($maxheight && $rr['height'] > $maxheight)
+ continue;
+ if($maxwidth && $rr['width'] > $maxwidth)
+ continue;
+ $foundres = true;
+ break;
+ }
+
+ if($foundres) {
+ $ret['type'] = 'link';
+ $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
+ $ret['thumbnail_width'] = $rr['width'];
+ $ret['thumbnail_height'] = $rr['height'];
+ }
+
+
+ }
+ return $ret;
+
+ }
+
+
+ function oep_phototop_reply($args) {
+
+ $ret = array();
+ $url = $args['url'];
+ $maxwidth = intval($args['maxwidth']);
+ $maxheight = intval($args['maxheight']);
+
+ if(preg_match('|//(.*?)/(.*?)/(.*?)$|',$url,$matches)) {
+ $chn = $matches[3];
+ }
+
+ if(! $chn)
+ return;
+ $c = q("select * from channel where channel_address = '%s' limit 1",
+ dbesc($chn)
+ );
+
+ if(! $c)
+ return;
+
+ $sql_extra = permissions_sql($c[0]['channel_id']);
+
+ $p = q("select resource_id from photo where uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
+ intval($c[0]['channel_id'])
+ );
+ if(! $p)
+ return;
+
+ $res = $p[0]['resource_id'];
+
+ $r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
+ intval($c[0]['channel_id']),
+ dbesc($res)
+ );
+
+ if($r) {
+ foreach($r as $rr) {
+ $foundres = false;
+ if($maxheight && $rr['height'] > $maxheight)
+ continue;
+ if($maxwidth && $rr['width'] > $maxwidth)
+ continue;
+ $foundres = true;
+ break;
+ }
+
+ if($foundres) {
+ $ret['type'] = 'link';
+ $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
+ $ret['thumbnail_width'] = $rr['width'];
+ $ret['thumbnail_height'] = $rr['height'];
+ }
+
+
+ }
+ return $ret;
+
+ }
+
+
+ function oep_photo_reply($args) {
+
+ $ret = array();
+ $url = $args['url'];
+ $maxwidth = intval($args['maxwidth']);
+ $maxheight = intval($args['maxheight']);
+
+ if(preg_match('|//(.*?)/(.*?)/(.*?)/image/|',$url,$matches)) {
+ $chn = $matches[3];
+ $res = basename($url);
+ }
+
+ if(! ($chn && $res))
+ return;
+ $c = q("select * from channel where channel_address = '%s' limit 1",
+ dbesc($chn)
+ );
+
+ if(! $c)
+ return;
+
+ $sql_extra = permissions_sql($c[0]['channel_id']);
+
+
+ $r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
+ intval($c[0]['channel_id']),
+ dbesc($res)
+ );
+
+ if($r) {
+ foreach($r as $rr) {
+ $foundres = false;
+ if($maxheight && $rr['height'] > $maxheight)
+ continue;
+ if($maxwidth && $rr['width'] > $maxwidth)
+ continue;
+ $foundres = true;
+ break;
+ }
+
+ if($foundres) {
+ $ret['type'] = 'link';
+ $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
+ $ret['thumbnail_width'] = $rr['width'];
+ $ret['thumbnail_height'] = $rr['height'];
+ }
+
+
+ }
+ return $ret;
+
+ }
+}
diff --git a/Zotlabs/Module/Oexchange.php b/Zotlabs/Module/Oexchange.php
new file mode 100644
index 000000000..24fc14821
--- /dev/null
+++ b/Zotlabs/Module/Oexchange.php
@@ -0,0 +1,77 @@
+ 1) && (argv(1) === 'xrd')) {
+ $tpl = get_markup_template('oexchange_xrd.tpl');
+
+ $o = replace_macros($tpl, array('$base' => z_root()));
+ echo $o;
+ killme();
+ }
+ }
+
+ function get() {
+
+ if(! local_channel()) {
+ if(remote_channel()) {
+ $observer = \App::get_observer();
+ if($observer && $observer['xchan_url']) {
+ $parsed = @parse_url($observer['xchan_url']);
+ if(! $parsed) {
+ notice( t('Unable to find your hub.') . EOL);
+ return;
+ }
+ $url = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '');
+ $url .= '/oexchange';
+ $result = z_post_url($url,$_REQUEST);
+ json_return_and_die($result);
+ }
+ }
+
+ return login(false);
+ }
+
+ if((argc() > 1) && argv(1) === 'done') {
+ info( t('Post successful.') . EOL);
+ return;
+ }
+
+ $url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url']))
+ ? urlencode(notags(trim($_REQUEST['url']))) : '');
+ $title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title']))
+ ? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
+ $description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description']))
+ ? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
+ $tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags']))
+ ? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
+
+ $ret = z_fetch_url(z_root() . '/urlinfo?f=&url=' . $url . $title . $description . $tags);
+
+ if($ret['success'])
+ $s = $ret['body'];
+
+ if(! strlen($s))
+ return;
+
+ $post = array();
+
+ $post['profile_uid'] = local_channel();
+ $post['return'] = '/oexchange/done' ;
+ $post['body'] = $s;
+ $post['type'] = 'wall';
+
+ $_REQUEST = $post;
+ $mod = new Item();
+ $mod->post();
+
+ }
+
+
+
+}
diff --git a/Zotlabs/Module/Online.php b/Zotlabs/Module/Online.php
new file mode 100644
index 000000000..39399db38
--- /dev/null
+++ b/Zotlabs/Module/Online.php
@@ -0,0 +1,17 @@
+ false);
+ if(argc() != 2)
+ json_return_and_die($ret);
+
+ $ret = get_online_status(argv(1));
+ json_return_and_die($ret);
+ }
+
+}
diff --git a/Zotlabs/Module/Openid.php b/Zotlabs/Module/Openid.php
new file mode 100644
index 000000000..8cbc6d2fd
--- /dev/null
+++ b/Zotlabs/Module/Openid.php
@@ -0,0 +1,198 @@
+validate()) {
+
+ logger('openid: validate');
+
+ $authid = normalise_openid($_REQUEST['openid_identity']);
+
+ if(! strlen($authid)) {
+ logger( t('OpenID protocol error. No ID returned.') . EOL);
+ goaway(z_root());
+ }
+
+ $x = match_openid($authid);
+ if($x) {
+
+ $r = q("select * from channel where channel_id = %d limit 1",
+ intval($x)
+ );
+ if($r) {
+ $y = q("select * from account where account_id = %d limit 1",
+ intval($r[0]['channel_account_id'])
+ );
+ if($y) {
+ foreach($y as $record) {
+ if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)) {
+ logger('mod_openid: openid success for ' . $x[0]['channel_name']);
+ $_SESSION['uid'] = $r[0]['channel_id'];
+ $_SESSION['account_id'] = $r[0]['channel_account_id'];
+ $_SESSION['authenticated'] = true;
+ authenticate_success($record,$r[0],true,true,true,true);
+ goaway(z_root());
+ }
+ }
+ }
+ }
+ }
+
+ // Successful OpenID login - but we can't match it to an existing account.
+ // See if they've got an xchan
+
+ $r = q("select * from xconfig left join xchan on xchan_hash = xconfig.xchan where cat = 'system' and k = 'openid' and v = '%s' limit 1",
+ dbesc($authid)
+ );
+
+ if($r) {
+ $_SESSION['authenticated'] = 1;
+ $_SESSION['visitor_id'] = $r[0]['xchan_hash'];
+ $_SESSION['my_url'] = $r[0]['xchan_url'];
+ $_SESSION['my_address'] = $r[0]['xchan_addr'];
+ $arr = array('xchan' => $r[0], 'session' => $_SESSION);
+ call_hooks('magic_auth_openid_success',$arr);
+ \App::set_observer($r[0]);
+ require_once('include/security.php');
+ \App::set_groups(init_groups_visitor($_SESSION['visitor_id']));
+ info(sprintf( t('Welcome %s. Remote authentication successful.'),$r[0]['xchan_name']));
+ logger('mod_openid: remote auth success from ' . $r[0]['xchan_addr']);
+ if($_SESSION['return_url'])
+ goaway($_SESSION['return_url']);
+ goaway(z_root());
+ }
+
+ // no xchan...
+ // create one.
+ // We should probably probe the openid url and figure out if they have any kind of social presence we might be able to
+ // scrape some identifying info from.
+
+ $name = $authid;
+ $url = trim($_REQUEST['openid_identity'],'/');
+ if(strpos($url,'http') === false)
+ $url = 'https://' . $url;
+ $pphoto = z_root() . '/' . get_default_profile_photo();
+ $parsed = @parse_url($url);
+ if($parsed) {
+ $host = $parsed['host'];
+ }
+
+ $attr = $openid->getAttributes();
+
+ if(is_array($attr) && count($attr)) {
+ foreach($attr as $k => $v) {
+ if($k === 'namePerson/friendly')
+ $nick = notags(trim($v));
+ if($k === 'namePerson/first')
+ $first = notags(trim($v));
+ if($k === 'namePerson')
+ $name = notags(trim($v));
+ if($k === 'contact/email')
+ $addr = notags(trim($v));
+ if($k === 'media/image/aspect11')
+ $photosq = trim($v);
+ if($k === 'media/image/default')
+ $photo_other = trim($v);
+ }
+ }
+ if(! $nick) {
+ if($first)
+ $nick = $first;
+ else
+ $nick = $name;
+ }
+
+ require_once('library/urlify/URLify.php');
+ $x = strtolower(\URLify::transliterate($nick));
+ if($nick & $host)
+ $addr = $nick . '@' . $host;
+ $network = 'unknown';
+
+ if($photosq)
+ $pphoto = $photosq;
+ elseif($photo_other)
+ $pphoto = $photo_other;
+
+ $mimetype = guess_image_type($pphoto);
+
+ $x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype,
+ xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date,
+ xchan_name_date, xchan_hidden)
+ values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 1) ",
+ dbesc($url),
+ dbesc(''),
+ dbesc(''),
+ dbesc(''),
+ dbesc($mimetype),
+ dbesc($pphoto),
+ dbesc($addr),
+ dbesc($url),
+ dbesc(''),
+ dbesc(''),
+ dbesc(''),
+ dbesc($name),
+ dbesc($network),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert())
+ );
+ if($x) {
+ $r = q("select * from xchan where xchan_hash = '%s' limit 1",
+ dbesc($url)
+ );
+ if($r) {
+
+ $photos = import_xchan_photo($pphoto,$url);
+ if($photos) {
+ $z = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s',
+ xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
+ dbesc(datetime_convert()),
+ dbesc($photos[0]),
+ dbesc($photos[1]),
+ dbesc($photos[2]),
+ dbesc($photos[3]),
+ dbesc($url)
+ );
+ }
+
+ set_xconfig($url,'system','openid',$authid);
+ $_SESSION['authenticated'] = 1;
+ $_SESSION['visitor_id'] = $r[0]['xchan_hash'];
+ $_SESSION['my_url'] = $r[0]['xchan_url'];
+ $_SESSION['my_address'] = $r[0]['xchan_addr'];
+ $arr = array('xchan' => $r[0], 'session' => $_SESSION);
+ call_hooks('magic_auth_openid_success',$arr);
+ \App::set_observer($r[0]);
+ info(sprintf( t('Welcome %s. Remote authentication successful.'),$r[0]['xchan_name']));
+ logger('mod_openid: remote auth success from ' . $r[0]['xchan_addr']);
+ if($_SESSION['return_url'])
+ goaway($_SESSION['return_url']);
+ goaway(z_root());
+ }
+ }
+
+ }
+ }
+ notice( t('Login failed.') . EOL);
+ goaway(z_root());
+ // NOTREACHED
+ }
+
+}
diff --git a/Zotlabs/Module/Opensearch.php b/Zotlabs/Module/Opensearch.php
new file mode 100644
index 000000000..8e76038c9
--- /dev/null
+++ b/Zotlabs/Module/Opensearch.php
@@ -0,0 +1,24 @@
+ z_root(),
+ '$nodename' => \App::get_hostname(),
+ ));
+
+ echo $o;
+
+ killme();
+
+ }
+
+}
diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php
new file mode 100644
index 000000000..6ef285dd0
--- /dev/null
+++ b/Zotlabs/Module/Page.php
@@ -0,0 +1,148 @@
+parse($r[0]['body']);
+ \App::$pdl = $r[0]['body'];
+ }
+ elseif($r[0]['layout_mid']) {
+ $l = q("select body from item where mid = '%s' and uid = %d limit 1",
+ dbesc($r[0]['layout_mid']),
+ intval($u[0]['channel_id'])
+ );
+
+ if($l) {
+ \App::$comanche = new \Zotlabs\Render\Comanche();
+ \App::$comanche->parse($l[0]['body']);
+ \App::$pdl = $l[0]['body'];
+ }
+ }
+
+ \App::$data['webpage'] = $r;
+
+ }
+
+ function get() {
+
+ $r = \App::$data['webpage'];
+ if(! $r)
+ return;
+
+ if($r[0]['item_type'] == ITEM_TYPE_PDL) {
+ $r[0]['body'] = t('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.');
+ $r[0]['mimetype'] = 'text/plain';
+ $r[0]['title'] = '';
+
+ }
+
+ xchan_query($r);
+ $r = fetch_post_tags($r,true);
+
+ if($r[0]['mimetype'] === 'application/x-pdl')
+ \App::$page['pdl_content'] = true;
+
+ $o .= prepare_page($r[0]);
+ return $o;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Pconfig.php b/Zotlabs/Module/Pconfig.php
new file mode 100644
index 000000000..b6264bddc
--- /dev/null
+++ b/Zotlabs/Module/Pconfig.php
@@ -0,0 +1,122 @@
+disallowed_pconfig())) {
+ notice( t('This setting requires special processing and editing has been blocked.') . EOL);
+ return;
+ }
+
+ if(strpos($k,'password') !== false) {
+ $v = z_obscure($v);
+ }
+
+ set_pconfig(local_channel(),$cat,$k,$v);
+ build_sync_packet();
+
+ goaway(z_root() . '/pconfig/' . $cat . '/' . $k);
+
+ }
+
+
+ function get() {
+
+ if(! local_channel()) {
+ return login();
+ }
+
+ $content = '' . t('Configuration Editor') . '
'; + $content .= '' . t('Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature.') . '
' . EOL . EOL;
+
+
+
+ if(argc() == 3) {
+ $content .= 'pconfig[' . local_channel() . ']' . EOL;
+ $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . ']' . EOL . EOL;
+ $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . escape_tags(argv(2)) . '] = ' . get_pconfig(local_channel(),escape_tags(argv(1)),escape_tags(argv(2))) . EOL;
+
+ if(in_array(argv(2),$this->disallowed_pconfig())) {
+ notice( t('This setting requires special processing and editing has been blocked.') . EOL);
+ return $content;
+ }
+ else
+ $content .= $this->pconfig_form(escape_tags(argv(1)),escape_tags(argv(2)));
+ }
+
+
+ if(argc() == 2) {
+ $content .= 'pconfig[' . local_channel() . ']' . EOL;
+ load_pconfig(local_channel(),escape_tags(argv(1)));
+ foreach(\App::$config[local_channel()][escape_tags(argv(1))] as $k => $x) {
+ $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . $k . '] = ' . escape_tags($x) . EOL;
+ }
+ }
+
+ if(argc() == 1) {
+
+ $r = q("select * from pconfig where uid = " . local_channel());
+ if($r) {
+ foreach($r as $rr) {
+ $content .= 'pconfig[' . local_channel() . '][' . escape_tags($rr['cat']) . '][' . escape_tags($rr['k']) . '] = ' . escape_tags($rr['v']) . EOL;
+ }
+ }
+ }
+ return $content;
+
+ }
+
+
+ function pconfig_form($cat,$k) {
+
+ $o = '';
+
+ return $o;
+
+ }
+
+
+
+ function disallowed_pconfig() {
+ return array(
+ 'permissions_role'
+ );
+ }
+
+}
diff --git a/Zotlabs/Module/Pdledit.php b/Zotlabs/Module/Pdledit.php
new file mode 100644
index 000000000..5cb00f165
--- /dev/null
+++ b/Zotlabs/Module/Pdledit.php
@@ -0,0 +1,72 @@
+ 1)
+ $module = 'mod_' . argv(1) . '.pdl';
+ else {
+ $o .= '';
+ $o .= '
'; + } + } + } + + $o .= '
';
+
+ // list module pdl files
+ return $o;
+ }
+
+ $t = get_pconfig(local_channel(),'system',$module);
+ if(! $t)
+ $t = file_get_contents(theme_include($module));
+ if(! $t) {
+ notice( t('Layout not found.') . EOL);
+ return '';
+ }
+
+ $o = replace_macros(get_markup_template('pdledit.tpl'),array(
+ '$header' => t('Edit System Page Description'),
+ '$mname' => t('Module Name:'),
+ '$help' => t('Layout Help'),
+ '$module' => argv(1),
+ '$content' => htmlspecialchars($t,ENT_COMPAT,'UTF-8'),
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+ }
+
+}
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
new file mode 100644
index 000000000..66aaec49f
--- /dev/null
+++ b/Zotlabs/Module/Photo.php
@@ -0,0 +1,274 @@
+ 1))
+ {
+ $resolution = 1;
+ }
+ }
+
+ // If using resolution 1, make sure it exists before proceeding:
+ if ($resolution == 1)
+ {
+ $r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
+ dbesc($photo),
+ intval($resolution)
+ );
+ if (!($r))
+ $resolution = 2;
+ }
+
+ $r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
+ dbesc($photo),
+ intval($resolution)
+ );
+ if($r) {
+
+ $allowed = (($r[0]['uid']) ? perm_is_allowed($r[0]['uid'],$observer_xchan,'view_storage') : true);
+
+ $sql_extra = permissions_sql($r[0]['uid']);
+
+ $channel = channelx_by_n($r[0]['uid']);
+
+ // Now we'll see if we can access the photo
+
+ $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
+ dbesc($photo),
+ intval($resolution)
+ );
+
+ if($r && $allowed) {
+ $data = dbunescbin($r[0]['content']);
+ $mimetype = $r[0]['mimetype'];
+ if(intval($r[0]['os_storage'])) {
+ $streaming = $data;
+ }
+ }
+ else {
+
+ // Does the picture exist? It may be a remote person with no credentials,
+ // but who should otherwise be able to view it. Show a default image to let
+ // them know permissions was denied. It may be possible to view the image
+ // through an authenticated profile visit.
+ // There won't be many completely unauthorised people seeing this because
+ // they won't have the photo link, so there's a reasonable chance that the person
+ // might be able to obtain permission to view it.
+
+ $r = q("SELECT * FROM `photo` WHERE `resource_id` = '%s' AND `imgscale` = %d LIMIT 1",
+ dbesc($photo),
+ intval($resolution)
+ );
+
+ if($r) {
+ logger('mod_photo: forbidden. ' . \App::$query_string);
+ $observer = \App::get_observer();
+ logger('mod_photo: observer = ' . (($observer) ? $observer['xchan_addr'] : '(not authenticated)'));
+ $data = file_get_contents('images/nosign.png');
+ $mimetype = 'image/png';
+ $prvcachecontrol = true;
+ }
+ }
+ }
+ }
+
+ if(! isset($data)) {
+ if(isset($resolution)) {
+ switch($resolution) {
+
+ case 4:
+ $data = file_get_contents(get_default_profile_photo());
+ $mimetype = 'image/png';
+ break;
+ case 5:
+ $data = file_get_contents(get_default_profile_photo(80));
+ $mimetype = 'image/png';
+ break;
+ case 6:
+ $data = file_get_contents(get_default_profile_photo(48));
+ $mimetype = 'image/png';
+ break;
+ default:
+ killme();
+ // NOTREACHED
+ break;
+ }
+ }
+ }
+
+ if(isset($res) && intval($res) && $res < 500) {
+ $ph = photo_factory($data, $mimetype);
+ if($ph->is_valid()) {
+ $ph->scaleImageSquare($res);
+ $data = $ph->imageString();
+ $mimetype = $ph->getType();
+ }
+ }
+
+ // Writing in cachefile
+ if (isset($cachefile) && $cachefile != '')
+ file_put_contents($cachefile, $data);
+
+ if(function_exists('header_remove')) {
+ header_remove('Pragma');
+ header_remove('pragma');
+ }
+
+ header("Content-type: " . $mimetype);
+
+ if($prvcachecontrol) {
+
+ // it is a private photo that they have no permission to view.
+ // tell the browser not to cache it, in case they authenticate
+ // and subsequently have permission to see it
+
+ header("Cache-Control: no-store, no-cache, must-revalidate");
+
+ }
+ else {
+ // The photo cache default is 1 day to provide a privacy trade-off,
+ // as somebody reducing photo permissions on a photo that is already
+ // "in the wild" won't be able to stop the photo from being viewed
+ // for this amount amount of time once it is in the browser cache.
+ // The privacy expectations of your site members and their perception
+ // of privacy where it affects the entire project may be affected.
+ // This has performance considerations but we highly recommend you
+ // leave it alone.
+
+ $cache = get_config('system','photo_cache_time');
+ if(! $cache)
+ $cache = (3600 * 24); // 1 day
+
+ header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT");
+ header("Cache-Control: max-age=" . $cache);
+
+ }
+
+ // If it's a file resource, stream it.
+
+ if($streaming && $channel) {
+ if(strpos($streaming,'store') !== false)
+ $istream = fopen($streaming,'rb');
+ else
+ $istream = fopen('store/' . $channel['channel_address'] . '/' . $streaming,'rb');
+ $ostream = fopen('php://output','wb');
+ if($istream && $ostream) {
+ pipe_streams($istream,$ostream);
+ fclose($istream);
+ fclose($ostream);
+ }
+ }
+ else {
+ echo $data;
+ }
+
+ killme();
+ // NOTREACHED
+ }
+
+}
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
new file mode 100644
index 000000000..1eeab1461
--- /dev/null
+++ b/Zotlabs/Module/Photos.php
@@ -0,0 +1,1381 @@
+ 1) {
+ $nick = argv(1);
+
+ profile_load($nick);
+
+ $channelx = channelx_by_nick($nick);
+
+ if(! $channelx)
+ return;
+
+ \App::$data['channel'] = $channelx;
+
+ $observer = \App::get_observer();
+ \App::$data['observer'] = $observer;
+
+ $observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
+
+ head_set_icon(\App::$data['channel']['xchan_photo_s']);
+
+ \App::$page['htmlhead'] .= "" ;
+
+ }
+
+ return;
+ }
+
+
+
+ function post() {
+
+ logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
+
+
+ logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
+ logger('mod_photos: FILES ' . print_r($_FILES,true), LOGGER_DATA);
+
+ $ph = photo_factory('');
+
+ $phototypes = $ph->supportedTypes();
+
+ $can_post = false;
+
+ $page_owner_uid = \App::$data['channel']['channel_id'];
+
+ if(perm_is_allowed($page_owner_uid,get_observer_hash(),'write_storage'))
+ $can_post = true;
+
+ if(! $can_post) {
+ notice( t('Permission denied.') . EOL );
+ if(is_ajax())
+ killme();
+ return;
+ }
+
+ $s = abook_self($page_owner_uid);
+
+ if(! $s) {
+ notice( t('Page owner information could not be retrieved.') . EOL);
+ logger('mod_photos: post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
+ if(is_ajax())
+ killme();
+ return;
+ }
+
+ $owner_record = $s[0];
+
+ $acl = new \Zotlabs\Access\AccessList(\App::$data['channel']);
+
+ if((argc() > 3) && (argv(2) === 'album')) {
+
+ $album = hex2bin(argv(3));
+
+ if($album === t('Profile Photos')) {
+ // not allowed
+ goaway(z_root() . '/' . $_SESSION['photo_return']);
+ }
+
+ if(! photos_album_exists($page_owner_uid,$album)) {
+ notice( t('Album not found.') . EOL);
+ goaway(z_root() . '/' . $_SESSION['photo_return']);
+ }
+
+
+ /*
+ * RENAME photo album
+ */
+
+ $newalbum = notags(trim($_REQUEST['albumname']));
+ if($newalbum != $album) {
+
+ // @fixme - syncronise with DAV or disallow completely
+
+ goaway(z_root() . '/' . $_SESSION['photo_return']);
+
+ // $x = photos_album_rename($page_owner_uid,$album,$newalbum);
+ // if($x) {
+ // $newurl = str_replace(bin2hex($album),bin2hex($newalbum),$_SESSION['photo_return']);
+ // goaway(z_root() . '/' . $newurl);
+ // }
+ }
+
+ /*
+ * DELETE photo album and all its photos
+ */
+
+ if($_REQUEST['dropalbum'] == t('Delete Album')) {
+
+
+ // This is dangerous because we combined file storage and photos into one interface
+ // This function will remove all photos from any directory with the same name since
+ // we have not passed the path value.
+
+ // The correct solution would be to use a full pathname from your storage root for 'album'
+ // We also need to prevent/block removing the storage root folder.
+
+ $folder_hash = '';
+
+ $r = q("select * from attach where is_dir = 1 and uid = %d and filename = '%s'",
+ intval($page_owner_uid),
+ dbesc($album)
+ );
+ if(! $r) {
+ notice( t('Album not found.') . EOL);
+ return;
+ }
+ if(count($r) > 1) {
+ notice( t('Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager') . EOL);
+ return;
+ }
+ else {
+ $folder_hash = $r[0]['hash'];
+ }
+
+
+
+ $res = array();
+
+ // get the list of photos we are about to delete
+
+ if(remote_channel() && (! local_channel())) {
+ $str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel());
+ }
+ elseif(local_channel()) {
+ $str = photos_album_get_db_idstr(local_channel(),$album);
+ }
+ else {
+ $str = null;
+ }
+ if(! $str) {
+ goaway(z_root() . '/' . $_SESSION['photo_return']);
+ }
+
+ $r = q("select id from item where resource_id in ( $str ) and resource_type = 'photo' and uid = %d " . item_normal(),
+ intval($page_owner_uid)
+ );
+ if($r) {
+ foreach($r as $i) {
+ attach_delete($page_owner_uid, $i['resource_id'], 1 );
+ }
+ }
+
+ // remove the associated photos in case they weren't attached to an item
+
+ q("delete from photo where resource_id in ( $str ) and uid = %d",
+ intval($page_owner_uid)
+ );
+
+ // @FIXME do the same for the linked attach
+
+ if($folder_hash) {
+ attach_delete($page_owner_uid,$folder_hash, 1);
+
+ $sync = attach_export_data(\App::$data['channel'],$folder_hash, true);
+
+ if($sync)
+ build_sync_packet($page_owner_uid,array('file' => array($sync)));
+ }
+
+ }
+
+ goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
+ }
+
+ if((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) {
+
+ // same as above but remove single photo
+
+ $ob_hash = get_observer_hash();
+ if(! $ob_hash)
+ goaway(z_root() . '/' . $_SESSION['photo_return']);
+
+ $r = q("SELECT `id`, `resource_id` FROM `photo` WHERE ( xchan = '%s' or `uid` = %d ) AND `resource_id` = '%s' LIMIT 1",
+ dbesc($ob_hash),
+ intval(local_channel()),
+ dbesc(\App::$argv[2])
+ );
+
+ if($r) {
+ attach_delete($page_owner_uid, $r[0]['resource_id'], 1 );
+ $sync = attach_export_data(\App::$data['channel'],$r[0]['resource_id'], true);
+
+ if($sync)
+ build_sync_packet($page_owner_uid,array('file' => array($sync)));
+ }
+
+ goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
+ }
+
+
+ if((\App::$argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
+
+
+ $desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : '');
+ $rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : '');
+ $item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0);
+ $albname = ((x($_POST,'albname')) ? notags(trim($_POST['albname'])) : '');
+ $is_nsfw = ((x($_POST,'adult')) ? intval($_POST['adult']) : 0);
+
+ $acl->set_from_array($_POST);
+ $perm = $acl->get();
+
+ $resource_id = argv(2);
+
+ if(! strlen($albname))
+ $albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+
+
+ if((x($_POST,'rotate') !== false) &&
+ ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
+ logger('rotate');
+
+ $r = q("select * from photo where `resource_id` = '%s' and uid = %d and imgscale = 0 limit 1",
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+ if(count($r)) {
+ $d = (($r[0]['os_storage']) ? @file_get_contents($r[0]['content']) : dbunescbin($r[0]['content']));
+ $ph = photo_factory($d, $r[0]['mimetype']);
+ if($ph->is_valid()) {
+ $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
+ $ph->rotate($rotate_deg);
+
+ $width = $ph->getWidth();
+ $height = $ph->getHeight();
+
+ if(intval($r[0]['os_storage'])) {
+ @file_put_contents($r[0]['content'],$ph->imageString());
+ $data = $r[0]['content'];
+ $fsize = @filesize($r[0]['content']);
+ q("update attach set filesize = %d where hash = '%s' and uid = %d limit 1",
+ intval($fsize),
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+ }
+ else {
+ $data = $ph->imageString();
+ $fsize = strlen($data);
+ }
+
+ $x = q("update photo set content = '%s', filesize = %d, height = %d, width = %d where `resource_id` = '%s' and uid = %d and imgscale = 0",
+ dbescbin($data),
+ intval($fsize),
+ intval($height),
+ intval($width),
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+
+ if($width > 1024 || $height > 1024)
+ $ph->scaleImage(1024);
+
+ $width = $ph->getWidth();
+ $height = $ph->getHeight();
+
+ $x = q("update photo set content = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and imgscale = 1",
+ dbescbin($ph->imageString()),
+ intval($height),
+ intval($width),
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+
+
+ if($width > 640 || $height > 640)
+ $ph->scaleImage(640);
+
+ $width = $ph->getWidth();
+ $height = $ph->getHeight();
+
+ $x = q("update photo set content = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and imgscale = 2",
+ dbescbin($ph->imageString()),
+ intval($height),
+ intval($width),
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+
+
+ if($width > 320 || $height > 320)
+ $ph->scaleImage(320);
+
+ $width = $ph->getWidth();
+ $height = $ph->getHeight();
+
+ $x = q("update photo set content = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and imgscale = 3",
+ dbescbin($ph->imageString()),
+ intval($height),
+ intval($width),
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+ }
+ }
+ }
+
+ $p = q("SELECT mimetype, is_nsfw, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC",
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+ if($p) {
+ $ext = $phototypes[$p[0]['mimetype']];
+
+ $r = q("UPDATE `photo` SET `description` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource_id` = '%s' AND `uid` = %d",
+ dbesc($desc),
+ dbesc($perm['allow_cid']),
+ dbesc($perm['allow_gid']),
+ dbesc($perm['deny_cid']),
+ dbesc($perm['deny_gid']),
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+ }
+
+ $item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false);
+
+ $old_is_nsfw = $p[0]['is_nsfw'];
+ if($old_is_nsfw != $is_nsfw) {
+ $r = q("update photo set is_nsfw = %d where resource_id = '%s' and uid = %d",
+ intval($is_nsfw),
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+ }
+
+ /* Don't make the item visible if the only change was the album name */
+
+ $visibility = 0;
+ if($p[0]['description'] !== $desc || strlen($rawtags))
+ $visibility = 1;
+
+ if(! $item_id) {
+ $item_id = photos_create_item(\App::$data['channel'],get_observer_hash(),$p[0],$visibility);
+
+ }
+
+ if($item_id) {
+ $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($item_id),
+ intval($page_owner_uid)
+ );
+
+ if($r) {
+ $old_tag = $r[0]['tag'];
+ $old_inform = $r[0]['inform'];
+ }
+ }
+
+
+ // make sure the linked item has the same permissions as the photo regardless of any other changes
+ $x = q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d
+ where id = %d",
+ dbesc($perm['allow_cid']),
+ dbesc($perm['allow_gid']),
+ dbesc($perm['deny_cid']),
+ dbesc($perm['deny_gid']),
+ intval($acl->is_private()),
+ intval($item_id)
+ );
+
+ // make sure the attach has the same permissions as the photo regardless of any other changes
+ $x = q("update attach set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where hash = '%s' and uid = %d and is_photo = 1",
+ dbesc($perm['allow_cid']),
+ dbesc($perm['allow_gid']),
+ dbesc($perm['deny_cid']),
+ dbesc($perm['deny_gid']),
+ dbesc($resource_id),
+ intval($page_owner_uid)
+ );
+
+
+
+ if(strlen($rawtags)) {
+
+ $str_tags = '';
+ $inform = '';
+
+ // if the new tag doesn't have a namespace specifier (@foo or #foo) give it a mention
+
+ $x = substr($rawtags,0,1);
+ if($x !== '@' && $x !== '#')
+ $rawtags = '@' . $rawtags;
+
+ require_once('include/text.php');
+ $profile_uid = \App::$profile['profile_uid'];
+
+ $results = linkify_tags($a, $rawtags, (local_channel()) ? local_channel() : $profile_uid);
+
+ $success = $results['success'];
+ $post_tags = array();
+
+ foreach($results as $result) {
+ $success = $result['success'];
+ if($success['replaced']) {
+ $post_tags[] = array(
+ 'uid' => $profile_uid,
+ 'ttype' => $success['termtype'],
+ 'otype' => TERM_OBJ_POST,
+ 'term' => $success['term'],
+ 'url' => $success['url']
+ );
+ }
+ }
+
+ $r = q("select * from item where id = %d and uid = %d limit 1",
+ intval($item_id),
+ intval($page_owner_uid)
+ );
+
+ if($r) {
+ $r = fetch_post_tags($r,true);
+ $datarray = $r[0];
+ if($post_tags) {
+ if((! array_key_exists('term',$datarray)) || (! is_array($datarray['term'])))
+ $datarray['term'] = $post_tags;
+ else
+ $datarray['term'] = array_merge($datarray['term'],$post_tags);
+ }
+ item_store_update($datarray,$execflag);
+ }
+
+ }
+
+ goaway(z_root() . '/' . $_SESSION['photo_return']);
+ return; // NOTREACHED
+
+ $sync = attach_export_data(\App::$data['channel'],$resource_id);
+
+ if($sync)
+ build_sync_packet($page_owner_uid,array('file' => array($sync)));
+
+ }
+
+
+ /**
+ * default post action - upload a photo
+ */
+
+ $channel = \App::$data['channel'];
+ $observer = \App::$data['observer'];
+
+ $_REQUEST['source'] = 'photos';
+ require_once('include/attach.php');
+
+ if(! local_channel()) {
+ $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']);
+ $_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']);
+ $_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']);
+ $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']);
+ }
+
+ $r = attach_store($channel,get_observer_hash(), '', $_REQUEST);
+
+ if(! $r['success']) {
+ notice($r['message'] . EOL);
+ }
+
+ if($_REQUEST['newalbum'])
+ goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($_REQUEST['newalbum']));
+ else
+ goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex(datetime_convert('UTC',date_default_timezone_get(),'now', 'Y')));
+
+ }
+
+
+
+ function get() {
+
+ // URLs:
+ // photos/name
+ // photos/name/album/xxxxx (xxxxx is album name)
+ // photos/name/image/xxxxx
+
+
+ if(observer_prohibited()) {
+ notice( t('Public access denied.') . EOL);
+ return;
+ }
+
+ $unsafe = ((array_key_exists('unsafe',$_REQUEST) && $_REQUEST['unsafe']) ? 1 : 0);
+
+ require_once('include/bbcode.php');
+ require_once('include/security.php');
+ require_once('include/conversation.php');
+
+ if(! x(\App::$data,'channel')) {
+ notice( t('No photos selected') . EOL );
+ return;
+ }
+
+ $ph = photo_factory('');
+ $phototypes = $ph->supportedTypes();
+
+ $_SESSION['photo_return'] = \App::$cmd;
+
+ //
+ // Parse arguments
+ //
+
+ $can_comment = perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),'post_comments');
+
+ if(argc() > 3) {
+ $datatype = argv(2);
+ $datum = argv(3);
+ } else {
+ if(argc() > 2) {
+ $datatype = argv(2);
+ $datum = '';
+ }
+ else
+ $datatype = 'summary';
+ }
+
+ if(argc() > 4)
+ $cmd = argv(4);
+ else
+ $cmd = 'view';
+
+ //
+ // Setup permissions structures
+ //
+
+ $can_post = false;
+ $visitor = 0;
+
+
+ $owner_uid = \App::$data['channel']['channel_id'];
+ $owner_aid = \App::$data['channel']['channel_account_id'];
+
+ $observer = \App::get_observer();
+
+ $can_post = perm_is_allowed($owner_uid,$observer['xchan_hash'],'write_storage');
+ $can_view = perm_is_allowed($owner_uid,$observer['xchan_hash'],'view_storage');
+
+ if(! $can_view) {
+ notice( t('Access to this item is restricted.') . EOL);
+ return;
+ }
+
+ $sql_extra = permissions_sql($owner_uid);
+
+ $o = "";
+
+ $o .= "\r\n";
+
+ // tabs
+
+ $_is_owner = (local_channel() && (local_channel() == $owner_uid));
+ $o .= profile_tabs($a,$_is_owner, \App::$data['channel']['channel_address']);
+
+ /**
+ * Display upload form
+ */
+
+ if( $can_post) {
+
+ $uploader = '';
+
+ $ret = array('post_url' => z_root() . '/photos/' . \App::$data['channel']['channel_address'],
+ 'addon_text' => $uploader,
+ 'default_upload' => true);
+
+ call_hooks('photo_upload_form',$ret);
+
+ /* Show space usage */
+
+ $r = q("select sum(filesize) as total from photo where aid = %d and imgscale = 0 ",
+ intval(\App::$data['channel']['channel_account_id'])
+ );
+
+
+ $limit = engr_units_to_bytes(service_class_fetch(\App::$data['channel']['channel_id'],'photo_upload_limit'));
+ if($limit !== false) {
+ $usage_message = sprintf( t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000 );
+ }
+ else {
+ $usage_message = sprintf( t('%1$.2f MB photo storage used.'), $r[0]['total'] / 1024000 );
+ }
+
+ if($_is_owner) {
+ $channel = \App::get_channel();
+
+ $acl = new \Zotlabs\Access\AccessList($channel);
+ $channel_acl = $acl->get();
+
+ $lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+ }
+
+ $aclselect = (($_is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
+
+ // this is wrong but is to work around an issue with js_upload wherein it chokes if these variables
+ // don't exist. They really should be set to a parseable representation of the channel's default permissions
+ // which can be processed by getSelected()
+
+ if(! $aclselect) {
+ $aclselect = '';
+ }
+
+ $selname = (($datum) ? hex2bin($datum) : '');
+
+ $albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
+
+ if(! $selname) {
+ $def_album = get_pconfig(\App::$data['channel']['channel_id'],'system','photo_path');
+ if($def_album) {
+ $selname = filepath_macro($def_album);
+ $albums['album'][] = array('text' => $selname);
+ }
+ }
+
+ $tpl = get_markup_template('photos_upload.tpl');
+ $upload_form = replace_macros($tpl,array(
+ '$pagename' => t('Upload Photos'),
+ '$sessid' => session_id(),
+ '$usage' => $usage_message,
+ '$nickname' => \App::$data['channel']['channel_address'],
+ '$newalbum_label' => t('Enter an album name'),
+ '$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
+ '$visible' => array('visible', t('Create a status post for this upload'), 0,'', array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'),
+ '$caption' => array('description', t('Caption (optional):')),
+ '$body' => array('body', t('Description (optional):'),'', 'Description will only appear in the status post'),
+ '$albums' => $albums['albums'],
+ '$selname' => $selname,
+ '$permissions' => t('Permissions'),
+ '$aclselect' => $aclselect,
+ '$lockstate' => $lockstate,
+ '$uploader' => $ret['addon_text'],
+ '$default' => (($ret['default_upload']) ? true : false),
+ '$uploadurl' => $ret['post_url'],
+ '$submit' => t('Submit')
+
+ ));
+
+ }
+
+ //
+ // dispatch request
+ //
+
+ /*
+ * Display a single photo album
+ */
+
+ if($datatype === 'album') {
+
+ if(strlen($datum)) {
+ if((strlen($datum) & 1) || (! ctype_xdigit($datum))) {
+ notice( t('Album name could not be decoded') . EOL);
+ logger('mod_photos: illegal album encoding: ' . $datum);
+ $datum = '';
+ }
+ }
+
+ $album = (($datum) ? hex2bin($datum) : '');
+
+
+ \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n";
+
+
+ $r = q("SELECT `resource_id`, max(`imgscale`) AS `imgscale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
+ AND `imgscale` <= 4 and photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
+ intval($owner_uid),
+ dbesc($album),
+ intval(PHOTO_NORMAL),
+ intval(PHOTO_PROFILE),
+ intval($unsafe)
+ );
+ if(count($r)) {
+ \App::set_pager_total(count($r));
+ \App::set_pager_itemspage(60);
+ } else {
+ goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
+ }
+
+ if($_GET['order'] === 'posted')
+ $order = 'ASC';
+ else
+ $order = 'DESC';
+
+
+ $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+ (SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph
+ ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
+ ORDER BY created $order LIMIT %d OFFSET %d",
+ intval($owner_uid),
+ dbesc($album),
+ intval(PHOTO_NORMAL),
+ intval(PHOTO_PROFILE),
+ intval($unsafe),
+ intval(\App::$pager['itemspage']),
+ intval(\App::$pager['start'])
+ );
+
+ //edit album name
+ $album_edit = null;
+ if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
+ if($can_post) {
+ $album_e = $album;
+ $albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
+
+ // @fixme - syncronise actions with DAV
+
+ // $edit_tpl = get_markup_template('album_edit.tpl');
+ // $album_edit = replace_macros($edit_tpl,array(
+ // '$nametext' => t('Enter a new album name'),
+ // '$name_placeholder' => t('or select an existing one (doubleclick)'),
+ // '$nickname' => \App::$data['channel']['channel_address'],
+ // '$album' => $album_e,
+ // '$albums' => $albums['albums'],
+ // '$hexalbum' => bin2hex($album),
+ // '$submit' => t('Submit'),
+ // '$dropsubmit' => t('Delete Album')
+ // ));
+
+ }
+ }
+
+ if($_GET['order'] === 'posted')
+ $order = array(t('Show Newest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($album));
+ else
+ $order = array(t('Show Oldest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+
+ $photos = array();
+ if(count($r)) {
+ $twist = 'rotright';
+ foreach($r as $rr) {
+
+ if($twist == 'rotright')
+ $twist = 'rotleft';
+ else
+ $twist = 'rotright';
+
+ $ext = $phototypes[$rr['mimetype']];
+
+ $imgalt_e = $rr['filename'];
+ $desc_e = $rr['description'];
+
+ $imagelink = (z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id']
+ . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
+
+ $photos[] = array(
+ 'id' => $rr['id'],
+ 'twist' => ' ' . $twist . rand(2,4),
+ 'link' => $imagelink,
+ 'title' => t('View Photo'),
+ 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
+ 'alt' => $imgalt_e,
+ 'desc'=> $desc_e,
+ 'ext' => $ext,
+ 'hash'=> $rr['resource_id'],
+ 'unknown' => t('Unknown')
+ );
+ }
+ }
+
+ if($_REQUEST['aj']) {
+ if($photos) {
+ $o = replace_macros(get_markup_template('photosajax.tpl'),array(
+ '$photos' => $photos,
+ '$album_id' => bin2hex($album)
+ ));
+ }
+ else {
+ $o = '';
+ }
+ echo $o;
+ killme();
+ }
+ else {
+ $o .= "";
+ $tpl = get_markup_template('photo_album.tpl');
+ $o .= replace_macros($tpl, array(
+ '$photos' => $photos,
+ '$album' => $album,
+ '$album_id' => bin2hex($album),
+ '$album_edit' => array(t('Edit Album'), $album_edit),
+ '$can_post' => $can_post,
+ '$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/upload/' . bin2hex($album)),
+ '$order' => $order,
+ '$upload_form' => $upload_form,
+ '$usage' => $usage_message
+ ));
+
+ }
+
+ if((! $photos) && ($_REQUEST['aj'])) {
+ $o .= '';
+ echo $o;
+ killme();
+ }
+
+ // $o .= paginate($a);
+
+ return $o;
+
+ }
+
+ /**
+ * Display one photo
+ */
+
+ if($datatype === 'image') {
+
+ \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n";
+
+ // fetch image, item containing image, then comments
+
+ $ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'
+ $sql_extra ORDER BY `imgscale` ASC ",
+ intval($owner_uid),
+ dbesc($datum)
+ );
+
+ if(! $ph) {
+
+ /* Check again - this time without specifying permissions */
+
+ $ph = q("SELECT id FROM photo WHERE uid = %d AND resource_id = '%s' LIMIT 1",
+ intval($owner_uid),
+ dbesc($datum)
+ );
+ if($ph)
+ notice( t('Permission denied. Access to this item may be restricted.') . EOL);
+ else
+ notice( t('Photo not available') . EOL );
+ return;
+ }
+
+
+
+ $prevlink = '';
+ $nextlink = '';
+
+ if($_GET['order'] === 'posted')
+ $order = 'ASC';
+ else
+ $order = 'DESC';
+
+
+ $prvnxt = q("SELECT `resource_id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `imgscale` = 0
+ $sql_extra ORDER BY `created` $order ",
+ dbesc($ph[0]['album']),
+ intval($owner_uid)
+ );
+
+ if(count($prvnxt)) {
+ for($z = 0; $z < count($prvnxt); $z++) {
+ if($prvnxt[$z]['resource_id'] == $ph[0]['resource_id']) {
+ $prv = $z - 1;
+ $nxt = $z + 1;
+ if($prv < 0)
+ $prv = count($prvnxt) - 1;
+ if($nxt >= count($prvnxt))
+ $nxt = 0;
+ break;
+ }
+ }
+
+ $prevlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['resource_id'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ $nextlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['resource_id'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ }
+
+
+ if(count($ph) == 1)
+ $hires = $lores = $ph[0];
+ if(count($ph) > 1) {
+ if($ph[1]['imgscale'] == 2) {
+ // original is 640 or less, we can display it directly
+ $hires = $lores = $ph[0];
+ }
+ else {
+ $hires = $ph[0];
+ $lores = $ph[1];
+ }
+ }
+
+ $album_link = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($ph[0]['album']);
+ $tools = Null;
+ $lock = Null;
+
+ if($can_post && ($ph[0]['uid'] == $owner_uid)) {
+ $tools = array(
+ 'profile'=>array(z_root() . '/profile_photo/use/'.$ph[0]['resource_id'], t('Use as profile photo')),
+ 'cover'=>array(z_root() . '/cover_photo/use/'.$ph[0]['resource_id'], t('Use as cover photo')),
+ );
+ }
+
+ // lockstate
+ $lockstate = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
+ || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
+ ? array('lock', t('Private Photo'))
+ : array('unlock', Null));
+
+ \App::$page['htmlhead'] .= '';
+
+ if($prevlink)
+ $prevlink = array($prevlink, t('Previous'));
+
+ $photo = array(
+ 'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['imgscale'] . '.' . $phototypes[$hires['mimetype']],
+ 'title'=> t('View Full Size'),
+ 'src' => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['imgscale'] . '.' . $phototypes[$lores['mimetype']] . '?f=&_u=' . datetime_convert('','','','ymdhis')
+ );
+
+ if($nextlink)
+ $nextlink = array($nextlink, t('Next'));
+
+
+ // Do we have an item for this photo?
+
+ $linked_items = q("SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo'
+ $sql_extra LIMIT 1",
+ dbesc($datum)
+ );
+
+ $map = null;
+
+ if($linked_items) {
+
+ xchan_query($linked_items);
+ $linked_items = fetch_post_tags($linked_items,true);
+
+ $link_item = $linked_items[0];
+ $item_normal = item_normal();
+
+ $r = q("select * from item where parent_mid = '%s'
+ $item_normal and uid = %d $sql_extra ",
+ dbesc($link_item['mid']),
+ intval($link_item['uid'])
+
+ );
+
+ if($r) {
+ xchan_query($r);
+ $r = fetch_post_tags($r,true);
+ $r = conv_sort($r,'commented');
+ }
+
+ $tags = array();
+ if($link_item['term']) {
+ $cnt = 0;
+ foreach($link_item['term'] as $t) {
+ $tags[$cnt] = array(0 => format_term_for_display($t));
+ if($can_post && ($ph[0]['uid'] == $owner_uid)) {
+ $tags[$cnt][1] = 'tagrm/drop/' . $link_item['id'] . '/' . bin2hex($t['term']); //?f=&item=' . $link_item['id'];
+ $tags[$cnt][2] = t('Remove');
+ }
+ $cnt ++;
+ }
+ }
+
+ if((local_channel()) && (local_channel() == $link_item['uid'])) {
+ q("UPDATE `item` SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1",
+ intval($link_item['parent']),
+ intval(local_channel())
+ );
+ }
+
+ if($link_item['coord']) {
+ $map = generate_map($link_item['coord']);
+ }
+ }
+
+ // logger('mod_photo: link_item' . print_r($link_item,true));
+
+ // FIXME - remove this when we move to conversation module
+
+ $r = $r[0]['children'];
+
+ $edit = null;
+ if($can_post) {
+ $album_e = $ph[0]['album'];
+ $caption_e = $ph[0]['description'];
+ $aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
+ $albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
+
+ $_SESSION['album_return'] = bin2hex($ph[0]['album']);
+
+ $edit = array(
+ 'edit' => t('Edit photo'),
+ 'id' => $link_item['id'],
+ 'rotatecw' => t('Rotate CW (right)'),
+ 'rotateccw' => t('Rotate CCW (left)'),
+ 'albums' => $albums['albums'],
+ 'album' => $album_e,
+ 'newalbum_label' => t('Enter a new album name'),
+ 'newalbum_placeholder' => t('or select an existing one (doubleclick)'),
+ 'nickname' => \App::$data['channel']['channel_address'],
+ 'resource_id' => $ph[0]['resource_id'],
+ 'capt_label' => t('Caption'),
+ 'caption' => $caption_e,
+ 'tag_label' => t('Add a Tag'),
+ 'permissions' => t('Permissions'),
+ 'aclselect' => $aclselect_e,
+ 'lockstate' => $lockstate[0],
+ 'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
+ 'item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
+ 'adult_enabled' => feature_enabled($owner_uid,'adult_photo_flagging'),
+ 'adult' => array('adult',t('Flag as adult in album view'), intval($ph[0]['is_nsfw']),''),
+ 'submit' => t('Submit'),
+ 'delete' => t('Delete Photo')
+ );
+ }
+
+ if(count($linked_items)) {
+
+ $cmnt_tpl = get_markup_template('comment_item.tpl');
+ $tpl = get_markup_template('photo_item.tpl');
+ $return_url = \App::$cmd;
+
+ $like_tpl = get_markup_template('like_noshare.tpl');
+
+ $likebuttons = '';
+
+ if($can_post || $can_comment) {
+ $likebuttons = array(
+ 'id' => $link_item['id'],
+ 'likethis' => t("I like this \x28toggle\x29"),
+ 'nolike' => t("I don't like this \x28toggle\x29"),
+ 'share' => t('Share'),
+ 'wait' => t('Please wait')
+ );
+ }
+
+ $comments = '';
+ if(! count($r)) {
+ if($can_post || $can_comment) {
+ $commentbox = replace_macros($cmnt_tpl,array(
+ '$return_path' => '',
+ '$mode' => 'photos',
+ '$jsreload' => $return_url,
+ '$type' => 'wall-comment',
+ '$id' => $link_item['id'],
+ '$parent' => $link_item['id'],
+ '$profile_uid' => $owner_uid,
+ '$mylink' => $observer['xchan_url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $observer['xchan_photo_s'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$preview' => t('Preview'),
+ '$ww' => '',
+ '$feature_encrypt' => false
+ ));
+ }
+ }
+
+ $alike = array();
+ $dlike = array();
+
+ $like = '';
+ $dislike = '';
+
+ $conv_responses = array(
+ 'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')),
+ 'agree' => array('title' => t('Agree','title')),'disagree' => array('title' => t('Disagree','title')), 'abstain' => array('title' => t('Abstain','title')),
+ 'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
+ );
+
+
+
+
+ if($r) {
+
+ foreach($r as $item) {
+ builtin_activity_puller($item, $conv_responses);
+ }
+
+
+ $like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : '');
+ $like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : '');
+ if (count($like_list) > MAX_LIKERS) {
+ $like_list_part = array_slice($like_list, 0, MAX_LIKERS);
+ array_push($like_list_part, '' . t('View all') . '');
+ } else {
+ $like_list_part = '';
+ }
+ $like_button_label = tt('Like','Likes',$like_count,'noun');
+
+ //if (feature_enabled($conv->get_profile_owner(),'dislike')) {
+ $dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : '');
+ $dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : '');
+ $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun');
+ if (count($dislike_list) > MAX_LIKERS) {
+ $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
+ array_push($dislike_list_part, '' . t('View all') . '');
+ } else {
+ $dislike_list_part = '';
+ }
+ //}
+
+
+ $like = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']],$alike[$link_item['mid'] . '-l'],'like',$link_item['mid']) : '');
+ $dislike = ((isset($dlike[$link_item['mid']])) ? format_like($dlike[$link_item['mid']],$dlike[$link_item['mid'] . '-l'],'dislike',$link_item['mid']) : '');
+
+ // display comments
+
+ foreach($r as $item) {
+ $comment = '';
+ $template = $tpl;
+ $sparkle = '';
+
+ if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
+ continue;
+
+ $redirect_url = z_root() . '/redir/' . $item['cid'] ;
+
+
+ $profile_url = zid($item['author']['xchan_url']);
+ $sparkle = '';
+
+
+ $profile_name = $item['author']['xchan_name'];
+ $profile_avatar = $item['author']['xchan_photo_m'];
+
+ $profile_link = $profile_url;
+
+ $drop = '';
+
+ if($observer['xchan_hash'] === $item['author_xchan'] || $observer['xchan_hash'] === $item['owner_xchan'])
+ $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+
+ $name_e = $profile_name;
+ $title_e = $item['title'];
+ unobscure($item);
+ $body_e = prepare_text($item['body'],$item['mimetype']);
+
+ $comments .= replace_macros($template,array(
+ '$id' => $item['id'],
+ '$mode' => 'photos',
+ '$profile_url' => $profile_link,
+ '$name' => $name_e,
+ '$thumb' => $profile_avatar,
+ '$sparkle' => $sparkle,
+ '$title' => $title_e,
+ '$body' => $body_e,
+ '$ago' => relative_date($item['created']),
+ '$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''),
+ '$drop' => $drop,
+ '$comment' => $comment
+ ));
+
+ }
+
+ if($can_post || $can_comment) {
+ $commentbox = replace_macros($cmnt_tpl,array(
+ '$return_path' => '',
+ '$jsreload' => $return_url,
+ '$type' => 'wall-comment',
+ '$id' => $link_item['id'],
+ '$parent' => $link_item['id'],
+ '$profile_uid' => $owner_uid,
+ '$mylink' => $observer['xchan_url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $observer['xchan_photo_s'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$ww' => ''
+ ));
+ }
+
+ }
+ $paginate = paginate($a);
+ }
+
+ $album_e = array($album_link,$ph[0]['album']);
+ $like_e = $like;
+ $dislike_e = $dislike;
+
+
+ $response_verbs = array('like');
+ if(feature_enabled($owner_uid,'dislike'))
+ $response_verbs[] = 'dislike';
+
+
+ $responses = get_responses($conv_responses,$response_verbs,'',$link_item);
+
+ $photo_tpl = get_markup_template('photo_view.tpl');
+ $o .= replace_macros($photo_tpl, array(
+ '$id' => $ph[0]['id'],
+ '$album' => $album_e,
+ '$tools_label' => t('Photo Tools'),
+ '$tools' => $tools,
+ '$lock' => $lockstate[1],
+ '$photo' => $photo,
+ '$prevlink' => $prevlink,
+ '$nextlink' => $nextlink,
+ '$desc' => $ph[0]['description'],
+ '$filename' => $ph[0]['filename'],
+ '$unknown' => t('Unknown'),
+ '$tag_hdr' => t('In This Photo:'),
+ '$tags' => $tags,
+ 'responses' => $responses,
+ '$edit' => $edit,
+ '$map' => $map,
+ '$map_text' => t('Map'),
+ '$likebuttons' => $likebuttons,
+ '$like' => $like_e,
+ '$dislike' => $dislike_e,
+ '$like_count' => $like_count,
+ '$like_list' => $like_list,
+ '$like_list_part' => $like_list_part,
+ '$like_button_label' => $like_button_label,
+ '$like_modal_title' => t('Likes','noun'),
+ '$dislike_modal_title' => t('Dislikes','noun'),
+ '$dislike_count' => $dislike_count, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''),
+ '$dislike_list' => $dislike_list, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''),
+ '$dislike_list_part' => $dislike_list_part, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''),
+ '$dislike_button_label' => $dislike_button_label, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_button_label : ''),
+ '$modal_dismiss' => t('Close'),
+ '$comments' => $comments,
+ '$commentbox' => $commentbox,
+ '$paginate' => $paginate,
+ ));
+
+ \App::$data['photo_html'] = $o;
+
+ return $o;
+ }
+
+ // Default - show recent photos with upload link (if applicable)
+ //$o = '';
+
+ \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n";
+
+
+ $r = q("SELECT `resource_id`, max(`imgscale`) AS `imgscale` FROM `photo` WHERE `uid` = %d
+ and photo_usage in ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
+ intval(\App::$data['channel']['channel_id']),
+ intval(PHOTO_NORMAL),
+ intval(PHOTO_PROFILE),
+ intval($unsafe)
+ );
+ if($r) {
+ \App::set_pager_total(count($r));
+ \App::set_pager_itemspage(60);
+ }
+
+ $r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created FROM photo p
+ INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo
+ WHERE uid = %d AND photo_usage IN ( %d, %d )
+ AND is_nsfw = %d $sql_extra group by resource_id ) ph
+ ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale)
+ ORDER by p.created DESC LIMIT %d OFFSET %d",
+ intval(\App::$data['channel']['channel_id']),
+ intval(PHOTO_NORMAL),
+ intval(PHOTO_PROFILE),
+ intval($unsafe),
+ intval(\App::$pager['itemspage']),
+ intval(\App::$pager['start'])
+ );
+
+
+
+ $photos = array();
+ if($r) {
+ $twist = 'rotright';
+ foreach($r as $rr) {
+ if($twist == 'rotright')
+ $twist = 'rotleft';
+ else
+ $twist = 'rotright';
+ $ext = $phototypes[$rr['mimetype']];
+
+ if(\App::get_template_engine() === 'internal') {
+ $alt_e = template_escape($rr['filename']);
+ $name_e = template_escape($rr['album']);
+ }
+ else {
+ $alt_e = $rr['filename'];
+ $name_e = $rr['album'];
+ }
+
+ $photos[] = array(
+ 'id' => $rr['id'],
+ 'twist' => ' ' . $twist . rand(2,4),
+ 'link' => z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'],
+ 'title' => t('View Photo'),
+ 'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['imgscale']) == 6) ? 4 : $rr['imgscale']) . '.' . $ext,
+ 'alt' => $alt_e,
+ 'album' => array(
+ 'link' => z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($rr['album']),
+ 'name' => $name_e,
+ 'alt' => t('View Album'),
+ ),
+
+ );
+ }
+ }
+
+ if($_REQUEST['aj']) {
+ if($photos) {
+ $o = replace_macros(get_markup_template('photosajax.tpl'),array(
+ '$photos' => $photos,
+ '$album_id' => bin2hex(t('Recent Photos'))
+ ));
+ }
+ else {
+ $o = '';
+ }
+ echo $o;
+ killme();
+ }
+ else {
+ $o .= "";
+ $tpl = get_markup_template('photos_recent.tpl');
+ $o .= replace_macros($tpl, array(
+ '$title' => t('Recent Photos'),
+ '$album_id' => bin2hex(t('Recent Photos')),
+ '$can_post' => $can_post,
+ '$upload' => array(t('Upload'), z_root().'/photos/'.\App::$data['channel']['channel_address'].'/upload'),
+ '$photos' => $photos,
+ '$upload_form' => $upload_form,
+ '$usage' => $usage_message
+ ));
+
+ }
+
+ if((! $photos) && ($_REQUEST['aj'])) {
+ $o .= '';
+ echo $o;
+ killme();
+ }
+
+ // paginate($a);
+ return $o;
+ }
+
+
+}
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
new file mode 100644
index 000000000..5cbf45daa
--- /dev/null
+++ b/Zotlabs/Module/Ping.php
@@ -0,0 +1,498 @@
+ $m);
+ }
+ unset($_SESSION['sysmsg']);
+ }
+ if(x($_SESSION, 'sysmsg_info')){
+ foreach ($_SESSION['sysmsg_info'] as $m){
+ $result['info'][] = array('message' => $m);
+ }
+ unset($_SESSION['sysmsg_info']);
+ }
+ if(! ($vnotify & VNOTIFY_INFO))
+ $result['info'] = array();
+ if(! ($vnotify & VNOTIFY_ALERT))
+ $result['notice'] = array();
+
+
+ if(\App::$install) {
+ echo json_encode($result);
+ killme();
+ }
+
+ /**
+ * Update chat presence indication (if applicable)
+ */
+
+ if(get_observer_hash() && (! $result['invalid'])) {
+ $r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1",
+ dbesc(get_observer_hash()),
+ dbesc($_SERVER['REMOTE_ADDR'])
+ );
+ $basic_presence = false;
+ if($r) {
+ $basic_presence = true;
+ q("update chatpresence set cp_last = '%s' where cp_id = %d",
+ dbesc(datetime_convert()),
+ intval($r[0]['cp_id'])
+ );
+ }
+ if(! $basic_presence) {
+ q("insert into chatpresence ( cp_xchan, cp_last, cp_status, cp_client)
+ values( '%s', '%s', '%s', '%s' ) ",
+ dbesc(get_observer_hash()),
+ dbesc(datetime_convert()),
+ dbesc('online'),
+ dbesc($_SERVER['REMOTE_ADDR'])
+ );
+ }
+ }
+
+ /**
+ * Chatpresence continued... if somebody hasn't pinged recently, they've most likely left the page
+ * and shouldn't count as online anymore. We allow an expection for bots.
+ */
+
+ q("delete from chatpresence where cp_last < %s - INTERVAL %s and cp_client != 'auto' ",
+ db_utcnow(), db_quoteinterval('3 MINUTE')
+ );
+
+ if((! local_channel()) || ($result['invalid'])) {
+ echo json_encode($result);
+ killme();
+ }
+
+ /**
+ * Everything following is only permitted under the context of a locally authenticated site member.
+ */
+
+
+ /**
+ * Handle "mark all xyz notifications read" requests.
+ */
+
+ // mark all items read
+ if(x($_REQUEST, 'markRead') && local_channel()) {
+ switch($_REQUEST['markRead']) {
+ case 'network':
+ $r = q("update item set item_unseen = 0 where item_unseen = 1 and uid = %d",
+ intval(local_channel())
+ );
+ break;
+ case 'home':
+ $r = q("update item set item_unseen = 0 where item_unseen = 1 and item_wall = 1 and uid = %d",
+ intval(local_channel())
+ );
+ break;
+ case 'messages':
+ $r = q("update mail set mail_seen = 1 where mail_seen = 0 and channel_id = %d ",
+ intval(local_channel())
+ );
+ break;
+ case 'all_events':
+ $r = q("update event set `dimissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
+ intval(local_channel()),
+ dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
+ dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+ );
+ break;
+ case 'notify':
+ $r = q("update notify set seen = 1 where uid = %d",
+ intval(local_channel())
+ );
+ break;
+ default:
+ break;
+ }
+ }
+
+ if(x($_REQUEST, 'markItemRead') && local_channel()) {
+ $r = q("update item set item_unseen = 0 where parent = %d and uid = %d",
+ intval($_REQUEST['markItemRead']),
+ intval(local_channel())
+ );
+ }
+
+
+
+ /**
+ * URL ping/something will return detail for "something", e.g. a json list with which to populate a notification
+ * dropdown menu.
+ */
+
+ if(argc() > 1 && argv(1) === 'notify') {
+ $t = q("select count(*) as total from notify where uid = %d and seen = 0",
+ intval(local_channel())
+ );
+ if($t && intval($t[0]['total']) > 49) {
+ $z = q("select * from notify where uid = %d
+ and seen = 0 order by created desc limit 50",
+ intval(local_channel())
+ );
+ }
+ else {
+ $z1 = q("select * from notify where uid = %d
+ and seen = 0 order by created desc limit 50",
+ intval(local_channel())
+ );
+ $z2 = q("select * from notify where uid = %d
+ and seen = 1 order by created desc limit %d",
+ intval(local_channel()),
+ intval(50 - intval($t[0]['total']))
+ );
+ $z = array_merge($z1,$z2);
+ }
+
+ if(count($z)) {
+ foreach($z as $zz) {
+ $notifs[] = array(
+ 'notify_link' => z_root() . '/notify/view/' . $zz['id'],
+ 'name' => $zz['xname'],
+ 'url' => $zz['url'],
+ 'photo' => $zz['photo'],
+ 'when' => relative_date($zz['created']),
+ 'hclass' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'),
+ 'message' => strip_tags(bbcode($zz['msg']))
+ );
+ }
+ }
+
+ echo json_encode(array('notify' => $notifs));
+ killme();
+ }
+
+ if(argc() > 1 && argv(1) === 'messages') {
+ $channel = \App::get_channel();
+ $t = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan
+ where channel_id = %d and mail_seen = 0 and mail_deleted = 0
+ and from_xchan != '%s' order by created desc limit 50",
+ intval(local_channel()),
+ dbesc($channel['channel_hash'])
+ );
+
+ if($t) {
+ foreach($t as $zz) {
+ $notifs[] = array(
+ 'notify_link' => z_root() . '/mail/' . $zz['id'],
+ 'name' => $zz['xchan_name'],
+ 'url' => $zz['xchan_url'],
+ 'photo' => $zz['xchan_photo_s'],
+ 'when' => relative_date($zz['created']),
+ 'hclass' => (intval($zz['mail_seen']) ? 'notify-seen' : 'notify-unseen'),
+ 'message' => t('sent you a private message'),
+ );
+ }
+ }
+
+ echo json_encode(array('notify' => $notifs));
+ killme();
+ }
+
+ if(argc() > 1 && (argv(1) === 'network' || argv(1) === 'home')) {
+ $result = array();
+
+ $r = q("SELECT * FROM item
+ WHERE item_unseen = 1 and uid = %d $item_normal
+ and author_xchan != '%s' ORDER BY created DESC limit 300",
+ intval(local_channel()),
+ dbesc($ob_hash)
+ );
+
+ if($r) {
+ xchan_query($r);
+ foreach($r as $item) {
+ if((argv(1) === 'home') && (! intval($item['item_wall'])))
+ continue;
+ $result[] = \Zotlabs\Lib\Enotify::format($item);
+ }
+ }
+ // logger('ping (network||home): ' . print_r($result, true), LOGGER_DATA);
+ echo json_encode(array('notify' => $result));
+ killme();
+ }
+
+ if(argc() > 1 && (argv(1) === 'intros')) {
+ $result = array();
+
+ $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ORDER BY abook_created DESC LIMIT 50",
+ intval(local_channel())
+ );
+
+ if($r) {
+ foreach($r as $rr) {
+ $result[] = array(
+ 'notify_link' => z_root() . '/connections/ifpending',
+ 'name' => $rr['xchan_name'],
+ 'url' => $rr['xchan_url'],
+ 'photo' => $rr['xchan_photo_s'],
+ 'when' => relative_date($rr['abook_created']),
+ 'hclass' => ('notify-unseen'),
+ 'message' => t('added your channel')
+ );
+ }
+ }
+ logger('ping (intros): ' . print_r($result, true), LOGGER_DATA);
+ echo json_encode(array('notify' => $result));
+ killme();
+ }
+
+ if(argc() > 1 && (argv(1) === 'all_events')) {
+ $bd_format = t('g A l F d') ; // 8 AM Friday January 18
+
+ $result = array();
+
+ $r = q("SELECT * FROM event left join xchan on event_xchan = xchan_hash
+ WHERE `event`.`uid` = %d AND dtstart < '%s' AND dtstart > '%s' and `dismissed` = 0
+ and etype in ( 'event', 'birthday' )
+ ORDER BY `dtstart` DESC LIMIT 1000",
+ intval(local_channel()),
+ dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
+ dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+ );
+
+ if($r) {
+ foreach($r as $rr) {
+ if($rr['adjust'])
+ $md = datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'Y/m');
+ else
+ $md = datetime_convert('UTC', 'UTC', $rr['dtstart'], 'Y/m');
+
+ $strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']);
+ $today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false);
+
+ $when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ? ' ' . t('[today]') : '');
+
+ $result[] = array(
+ 'notify_link' => z_root() . '/events', // FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event --> '/events/event/' . $rr['event_hash'],
+ 'name' => $rr['xchan_name'],
+ 'url' => $rr['xchan_url'],
+ 'photo' => $rr['xchan_photo_s'],
+ 'when' => $when,
+ 'hclass' => ('notify-unseen'),
+ 'message' => t('posted an event')
+ );
+ }
+ }
+ logger('ping (all_events): ' . print_r($result, true), LOGGER_DATA);
+ echo json_encode(array('notify' => $result));
+ killme();
+ }
+
+
+
+ /**
+ * Normal ping - just the counts, no detail
+ */
+
+ if($vnotify & VNOTIFY_SYSTEM) {
+ $t = q("select count(*) as total from notify where uid = %d and seen = 0",
+ intval(local_channel())
+ );
+ if($t)
+ $result['notify'] = intval($t[0]['total']);
+ }
+
+ $t1 = dba_timer();
+
+ if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
+ $r = q("SELECT id, item_wall FROM item
+ WHERE item_unseen = 1 and uid = %d
+ $item_normal
+ and author_xchan != '%s'",
+ intval(local_channel()),
+ dbesc($ob_hash)
+ );
+
+ if($r) {
+ $arr = array('items' => $r);
+ call_hooks('network_ping', $arr);
+
+ foreach ($r as $it) {
+ if(intval($it['item_wall']))
+ $result['home'] ++;
+ else
+ $result['network'] ++;
+ }
+ }
+ }
+ if(! ($vnotify & VNOTIFY_NETWORK))
+ $result['network'] = 0;
+ if(! ($vnotify & VNOTIFY_CHANNEL))
+ $result['home'] = 0;
+
+
+ $t2 = dba_timer();
+
+ if($vnotify & VNOTIFY_INTRO) {
+ $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
+ intval(local_channel())
+ );
+
+ $t3 = dba_timer();
+
+ if($intr)
+ $result['intros'] = intval($intr[0]['total']);
+ }
+
+ $t4 = dba_timer();
+ $channel = \App::get_channel();
+
+ if($vnotify & VNOTIFY_MAIL) {
+ $mails = q("SELECT count(id) as total from mail
+ WHERE channel_id = %d AND mail_seen = 0 and from_xchan != '%s' ",
+ intval(local_channel()),
+ dbesc($channel['channel_hash'])
+ );
+ if($mails)
+ $result['mail'] = intval($mails[0]['total']);
+ }
+
+ if($vnotify & VNOTIFY_REGISTER) {
+ if (\App::$config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
+ $regs = q("SELECT count(account_id) as total from account where (account_flags & %d) > 0",
+ intval(ACCOUNT_PENDING)
+ );
+ if($regs)
+ $result['register'] = intval($regs[0]['total']);
+ }
+ }
+
+ $t5 = dba_timer();
+
+ if($vnotify & (VNOTIFY_EVENT|VNOTIFY_EVENTTODAY|VNOTIFY_BIRTHDAY)) {
+ $events = q("SELECT etype, dtstart, adjust FROM `event`
+ WHERE `event`.`uid` = %d AND dtstart < '%s' AND dtstart > '%s' and `dismissed` = 0
+ and etype in ( 'event', 'birthday' )
+ ORDER BY `dtstart` ASC ",
+ intval(local_channel()),
+ dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
+ dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+ );
+
+ if($events) {
+ $result['all_events'] = count($events);
+
+ if($result['all_events']) {
+ $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
+ foreach($events as $x) {
+ $bd = false;
+ if($x['etype'] === 'birthday') {
+ $result['birthdays'] ++;
+ $bd = true;
+ }
+ else {
+ $result['events'] ++;
+ }
+ if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['dtstart'], 'Y-m-d') === $str_now) {
+ $result['all_events_today'] ++;
+ if($bd)
+ $result['birthdays_today'] ++;
+ else
+ $result['events_today'] ++;
+ }
+ }
+ }
+ }
+ }
+ if(! ($vnotify & VNOTIFY_EVENT))
+ $result['all_events'] = $result['events'] = 0;
+ if(! ($vnotify & VNOTIFY_EVENTTODAY))
+ $result['all_events_today'] = $result['events_today'] = 0;
+ if(! ($vnotify & VNOTIFY_BIRTHDAY))
+ $result['birthdays'] = 0;
+
+
+ $x = json_encode($result);
+
+ $t6 = dba_timer();
+
+ // logger('ping timer: ' . sprintf('%01.4f %01.4f %01.4f %01.4f %01.4f %01.4f',$t6 - $t5, $t5 - $t4, $t4 - $t3, $t3 - $t2, $t2 - $t1, $t1 - $t0));
+
+ echo $x;
+ killme();
+ }
+
+}
diff --git a/Zotlabs/Module/Poco.php b/Zotlabs/Module/Poco.php
new file mode 100644
index 000000000..85c9348c0
--- /dev/null
+++ b/Zotlabs/Module/Poco.php
@@ -0,0 +1,13 @@
+' : $channel['channel_allow_cid']);
+ $allow_gid = (($item_private) ? '' : $channel['channel_allow_gid']);
+ $deny_cid = (($item_private) ? '' : $channel['channel_deny_cid']);
+ $deny_gid = (($item_private) ? '' : $channel['channel_deny_gid']);
+ }
+
+
+ $arr = array();
+
+ $arr['item_wall'] = 1;
+ $arr['owner_xchan'] = (($parent_item) ? $parent_item['owner_xchan'] : $channel['channel_hash']);
+ $arr['parent_mid'] = (($parent_mid) ? $parent_mid : $mid);
+ $arr['title'] = '';
+ $arr['allow_cid'] = $allow_cid;
+ $arr['allow_gid'] = $allow_gid;
+ $arr['deny_cid'] = $deny_cid;
+ $arr['deny_gid'] = $deny_gid;
+ $arr['verb'] = $activity;
+ $arr['item_private'] = $item_private;
+ $arr['obj_type'] = ACTIVITY_OBJ_PERSON;
+ $arr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t($verbs[$verb][0]) . ' ' . '[zrl=' . $target['xchan_url'] . ']' . $target['xchan_name'] . '[/zrl]';
+
+ $obj = array(
+ 'type' => ACTIVITY_OBJ_PERSON,
+ 'title' => $target['xchan_name'],
+ 'id' => $target['xchan_hash'],
+ 'link' => array(
+ array('rel' => 'alternate', 'type' => 'text/html', 'href' => $target['xchan_url']),
+ array('rel' => 'photo', 'type' => $target['xchan_photo_mimetype'], 'href' => $target['xchan_photo_l'])
+ ),
+ );
+
+ $arr['obj'] = json_encode($obj);
+
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = 1;
+ $arr['item_unseen'] = 1;
+ if(! $parent_item)
+ $item['item_thread_top'] = 1;
+
+
+ post_activity_item($arr);
+
+ return;
+ }
+
+
+
+ function get() {
+
+ if(! local_channel()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $name = '';
+ $id = '';
+
+ if(intval($_REQUEST['c'])) {
+ $r = q("select abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash
+ where abook_id = %d and abook_channel = %d limit 1",
+ intval($_REQUEST['c']),
+ intval(local_channel())
+ );
+ if($r) {
+ $name = $r[0]['xchan_name'];
+ $id = $r[0]['abook_id'];
+ }
+ }
+
+ $parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : '0');
+
+ $verbs = get_poke_verbs();
+
+ $shortlist = array();
+ foreach($verbs as $k => $v)
+ if($v[1] !== 'NOTRANSLATION')
+ $shortlist[] = array($k,$v[1]);
+
+
+ $poke_basic = get_config('system','poke_basic');
+ if($poke_basic) {
+ $title = t('Poke');
+ $desc = t('Poke somebody');
+ }
+ else {
+ $title = t('Poke/Prod');
+ $desc = t('Poke, prod or do other things to somebody');
+ }
+
+ $o = replace_macros(get_markup_template('poke_content.tpl'),array(
+ '$title' => $title,
+ '$poke_basic' => $poke_basic,
+ '$desc' => $desc,
+ '$clabel' => t('Recipient'),
+ '$choice' => t('Choose what you wish to do to recipient'),
+ '$verbs' => $shortlist,
+ '$parent' => $parent,
+ '$prv_desc' => t('Make this post private'),
+ '$private' => array('private', t('Make this post private'), false, ''),
+ '$submit' => t('Submit'),
+ '$name' => $name,
+ '$id' => $id
+ ));
+
+ return $o;
+
+ }
+}
diff --git a/Zotlabs/Module/Post.php b/Zotlabs/Module/Post.php
new file mode 100644
index 000000000..af231ab50
--- /dev/null
+++ b/Zotlabs/Module/Post.php
@@ -0,0 +1,36 @@
+ $r[0]['xlink_rating'],'rating_text' => $r[0]['xlink_rating_text']));
+ killme();
+ }
+
+ function post() {
+
+ if(! local_channel())
+ return;
+
+ $channel = \App::get_channel();
+
+ $target = trim($_REQUEST['target']);
+ if(! $target)
+ return;
+
+ if($target === $channel['channel_hash'])
+ return;
+
+ $rating = intval($_POST['rating']);
+ if($rating < (-10))
+ $rating = (-10);
+ if($rating > 10)
+ $rating = 10;
+
+ $rating_text = trim(escape_tags($_REQUEST['rating_text']));
+
+ $signed = $target . '.' . $rating . '.' . $rating_text;
+
+ $sig = base64url_encode(rsa_sign($signed,$channel['channel_prvkey']));
+
+
+ $z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
+ dbesc($channel['channel_hash']),
+ dbesc($target)
+ );
+ if($z) {
+ $record = $z[0]['xlink_id'];
+ $w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s'
+ where xlink_id = %d",
+ intval($rating),
+ dbesc($rating_text),
+ dbesc($sig),
+ dbesc(datetime_convert()),
+ intval($record)
+ );
+ }
+ else {
+ $w = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ",
+ dbesc($channel['channel_hash']),
+ dbesc($target),
+ intval($rating),
+ dbesc($rating_text),
+ dbesc($sig),
+ dbesc(datetime_convert())
+ );
+ $z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
+ dbesc($channel['channel_hash']),
+ dbesc($orig_record[0]['abook_xchan'])
+ );
+ if($z)
+ $record = $z[0]['xlink_id'];
+ }
+ if($record) {
+ \Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record));
+ }
+
+ json_return_and_die(array('result' => true));;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/Zotlabs/Module/Pretheme.php b/Zotlabs/Module/Pretheme.php
new file mode 100644
index 000000000..120fd5359
--- /dev/null
+++ b/Zotlabs/Module/Pretheme.php
@@ -0,0 +1,28 @@
+ get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits));
+ }
+ killme();
+ }
+
+}
diff --git a/Zotlabs/Module/Probe.php b/Zotlabs/Module/Probe.php
new file mode 100644
index 000000000..7fc0e8ff5
--- /dev/null
+++ b/Zotlabs/Module/Probe.php
@@ -0,0 +1,45 @@
+Probe Diagnostic';
+
+ $o .= '';
+
+ $o .= '' . t('Edit System Page Description') . '
'; + $files = glob('Zotlabs/Module/*.php'); + if($files) { + foreach($files as $f) { + $name = lcfirst(basename($f,'.php')); + $x = theme_include('mod_' . $name . '.pdl'); + if($x) { + $o .= '' . $name . ''; + } + } + } + + $o .= '
'; + + if(x($_GET,'addr')) { + $channel = \App::get_channel(); + $addr = trim($_GET['addr']); + $do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false); + + $j = \Zotlabs\Zot\Finger::run($addr,$channel,false); + + $o .= '
';
+ if(! $j['success']) {
+ $o .= sprintf( t('Fetching URL returns error: %1$s'),$res['error'] . "\r\n\r\n");
+ $o .= "https connection failed. Trying again with auto failover to http.\r\n\r\n";
+ $j = \Zotlabs\Zot\Finger::run($addr,$channel,true);
+ if(! $j['success'])
+ $o .= sprintf( t('Fetching URL returns error: %1$s'),$res['error'] . "\r\n\r\n");
+
+ }
+ if($do_import && $j)
+ $x = import_xchan($j);
+ if($j && $j['permissions'] && $j['permissions']['iv'])
+ $j['permissions'] = json_decode(crypto_unencapsulate($j['permissions'],$channel['channel_prvkey']),true);
+ $o .= str_replace("\n",'
',print_r($j,true));
+ $o .= '';
+ }
+ return $o;
+ }
+
+}
diff --git a/Zotlabs/Module/Profile.php b/Zotlabs/Module/Profile.php
new file mode 100644
index 000000000..9e868db92
--- /dev/null
+++ b/Zotlabs/Module/Profile.php
@@ -0,0 +1,90 @@
+ 1)
+ $which = argv(1);
+ else {
+ notice( t('Requested profile is not available.') . EOL );
+ \App::$error = 404;
+ return;
+ }
+
+ $profile = '';
+ $channel = \App::get_channel();
+
+ if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+ $which = $channel['channel_address'];
+ $profile = argv(1);
+ $r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
+ intval($profile),
+ intval(local_channel())
+ );
+ if(! $r)
+ $profile = '';
+ $profile = $r[0]['profile_guid'];
+ }
+
+ \App::$page['htmlhead'] .= '' . "\r\n" ;
+
+ if(! $profile) {
+ $x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
+ dbesc(argv(1))
+ );
+ if($x) {
+ \App::$profile = $x[0];
+ }
+ }
+
+ profile_load($which,$profile);
+
+
+ }
+
+ function get() {
+
+ if(observer_prohibited(true)) {
+ return login();
+ }
+
+ $groups = array();
+
+ $tab = 'profile';
+ $o = '';
+
+ if(! (perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(), 'view_profile'))) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+
+ $is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false);
+
+ if(\App::$profile['hidewall'] && (! $is_owner) && (! remote_channel())) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+
+ \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n";
+
+ $o .= advanced_profile($a);
+ call_hooks('profile_advanced',$o);
+ return $o;
+
+ }
+
+}
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
new file mode 100644
index 000000000..f459f7deb
--- /dev/null
+++ b/Zotlabs/Module/Profile_photo.php
@@ -0,0 +1,461 @@
+is_valid()) {
+
+ $im->cropImage(300,$srcX,$srcY,$srcW,$srcH);
+
+ $aid = get_account_id();
+
+ $p = [
+ 'aid' => $aid,
+ 'uid' => local_channel(),
+ 'resource_id' => $base_image['resource_id'],
+ 'filename' => $base_image['filename'],
+ 'album' => t('Profile Photos')
+ ];
+
+ $p['imgscale'] = PHOTO_RES_PROFILE_300;
+ $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
+
+ $r1 = $im->save($p);
+
+ $im->scaleImage(80);
+ $p['imgscale'] = PHOTO_RES_PROFILE_80;
+
+ $r2 = $im->save($p);
+
+ $im->scaleImage(48);
+ $p['imgscale'] = PHOTO_RES_PROFILE_48;
+
+ $r3 = $im->save($p);
+
+ if($r1 === false || $r2 === false || $r3 === false) {
+ // if one failed, delete them all so we can start over.
+ notice( t('Image resize failed.') . EOL );
+ $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ",
+ dbesc($base_image['resource_id']),
+ local_channel(),
+ intval(PHOTO_RES_PROFILE_300),
+ intval(PHOTO_RES_PROFILE_80),
+ intval(PHOTO_RES_PROFILE_48)
+ );
+ return;
+ }
+
+ $channel = \App::get_channel();
+
+ // If setting for the default profile, unset the profile photo flag from any other photos I own
+
+ if($is_default_profile) {
+ $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d
+ AND resource_id != '%s' AND `uid` = %d",
+ intval(PHOTO_NORMAL),
+ intval(PHOTO_PROFILE),
+ dbesc($base_image['resource_id']),
+ intval(local_channel())
+ );
+
+ send_profile_photo_activity($channel,$base_image,$profile);
+
+ }
+ else {
+ $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
+ dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-4'),
+ dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-5'),
+ intval($_REQUEST['profile']),
+ intval(local_channel())
+ );
+ }
+
+ profiles_build_sync(local_channel());
+
+ // We'll set the updated profile-photo timestamp even if it isn't the default profile,
+ // so that browsers will do a cache update unconditionally
+
+
+ $r = q("UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s'
+ where xchan_hash = '%s'",
+ dbesc($im->getType()),
+ dbesc(datetime_convert()),
+ dbesc($channel['xchan_hash'])
+ );
+ // Similarly, tell the nav bar to bypass the cache and update the avater image.
+ $_SESSION['reload_avatar'] = true;
+
+ info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
+
+ // Update directory in background
+ \Zotlabs\Daemon\Master::Summon(array('Directory',$channel['channel_id']));
+
+ // Now copy profile-permissions to pictures, to prevent privacyleaks by automatically created folder 'Profile Pictures'
+
+ profile_photo_set_profile_perms(local_channel(),$_REQUEST['profile']);
+ }
+ else
+ notice( t('Unable to process image') . EOL);
+ }
+
+ goaway(z_root() . '/profiles');
+ return; // NOTREACHED
+ }
+
+ // A new photo was uploaded. Store it and save some important details
+ // in App::$data for use in the cropping function
+
+
+ $hash = photo_new_resource();
+ $smallest = 0;
+
+ require_once('include/attach.php');
+
+ $res = attach_store(\App::get_channel(), get_observer_hash(), '', array('album' => t('Profile Photos'), 'hash' => $hash));
+
+ logger('attach_store: ' . print_r($res,true));
+
+ if($res && intval($res['data']['is_photo'])) {
+ $i = q("select * from photo where resource_id = '%s' and uid = %d order by imgscale",
+ dbesc($hash),
+ intval(local_channel())
+ );
+
+ if(! $i) {
+ notice( t('Image upload failed.') . EOL );
+ return;
+ }
+ $os_storage = false;
+
+ foreach($i as $ii) {
+ if(intval($ii['imgscale']) < PHOTO_RES_640) {
+ $smallest = intval($ii['imgscale']);
+ $os_storage = intval($ii['os_storage']);
+ $imagedata = $ii['content'];
+ $filetype = $ii['mimetype'];
+ }
+ }
+ }
+
+ $imagedata = (($os_storage) ? @file_get_contents($imagedata) : $imagedata);
+ $ph = photo_factory($imagedata, $filetype);
+
+ if(! $ph->is_valid()) {
+ notice( t('Unable to process image.') . EOL );
+ return;
+ }
+
+ return $this->profile_photo_crop_ui_head($a, $ph, $hash, $smallest);
+
+ // This will "fall through" to the get() method, and since
+ // App::$data['imagecrop'] is set, it will proceed to cropping
+ // rather than present the upload form
+ }
+
+
+ /* @brief Generate content of profile-photo view
+ *
+ * @param $a Current application
+ * @return void
+ *
+ */
+
+
+ function get() {
+
+ if(! local_channel()) {
+ notice( t('Permission denied.') . EOL );
+ return;
+ }
+
+ $channel = \App::get_channel();
+
+ $newuser = false;
+
+ if(argc() == 2 && argv(1) === 'new')
+ $newuser = true;
+
+ if(argv(1) === 'use') {
+ if (argc() < 3) {
+ notice( t('Permission denied.') . EOL );
+ return;
+ };
+
+ $resource_id = argv(2);
+
+ // When using an existing photo, we don't have a dialogue to offer a choice of profiles,
+ // so it gets attached to the default
+
+ $p = q("select id from profile where is_default = 1 and uid = %d",
+ intval(local_channel())
+ );
+ if($p) {
+ $_REQUEST['profile'] = $p[0]['id'];
+ }
+
+
+ $r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC",
+ intval(local_channel()),
+ dbesc($resource_id)
+ );
+ if(! $r) {
+ notice( t('Photo not available.') . EOL );
+ return;
+ }
+ $havescale = false;
+ foreach($r as $rr) {
+ if($rr['imgscale'] == PHOTO_RES_PROFILE_80)
+ $havescale = true;
+ }
+
+ // set an already loaded and cropped photo as profile photo
+
+ if(($r[0]['album'] == t('Profile Photos')) && ($havescale)) {
+ // unset any existing profile photos
+ $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
+ intval(PHOTO_NORMAL),
+ intval(PHOTO_PROFILE),
+ intval(local_channel()));
+
+ $r = q("UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'",
+ intval(PHOTO_PROFILE),
+ intval(local_channel()),
+ dbesc($resource_id)
+ );
+
+ $r = q("UPDATE xchan set xchan_photo_date = '%s'
+ where xchan_hash = '%s'",
+ dbesc(datetime_convert()),
+ dbesc($channel['xchan_hash'])
+ );
+
+ profile_photo_set_profile_perms(local_channel()); // Reset default photo permissions to public
+ \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
+ goaway(z_root() . '/profiles');
+ }
+
+ $r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
+ intval($r[0]['id']),
+ intval(local_channel())
+
+ );
+ if(! $r) {
+ notice( t('Photo not available.') . EOL );
+ return;
+ }
+
+ if(intval($r[0]['os_storage']))
+ $data = @file_get_contents($r[0]['content']);
+ else
+ $data = dbunescbin($r[0]['content']);
+
+ $ph = photo_factory($data, $r[0]['mimetype']);
+ $smallest = 0;
+ if($ph->is_valid()) {
+ // go ahead as if we have just uploaded a new photo to crop
+ $i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale",
+ dbesc($r[0]['resource_id']),
+ intval(local_channel())
+ );
+
+ if($i) {
+ $hash = $i[0]['resource_id'];
+ foreach($i as $ii) {
+ if(intval($ii['imgscale']) < PHOTO_RES_640) {
+ $smallest = intval($ii['imgscale']);
+ }
+ }
+ }
+ }
+
+ $this->profile_photo_crop_ui_head($a, $ph, $hash, $smallest);
+
+ // falls through with App::$data['imagecrop'] set so we go straight to the cropping section
+ }
+
+
+ // present an upload form
+
+ $profiles = q("select id, profile_name as name, is_default from profile where uid = %d order by id asc",
+ intval(local_channel())
+ );
+
+ if(! x(\App::$data,'imagecrop')) {
+
+ $tpl = get_markup_template('profile_photo.tpl');
+
+ $o .= replace_macros($tpl,array(
+ '$user' => \App::$channel['channel_address'],
+ '$lbl_upfile' => t('Upload File:'),
+ '$lbl_profiles' => t('Select a profile:'),
+ '$title' => t('Upload Profile Photo'),
+ '$submit' => t('Upload'),
+ '$profiles' => $profiles,
+ '$single' => ((count($profiles) == 1) ? true : false),
+ '$profile0' => $profiles[0],
+ '$form_security_token' => get_form_security_token("profile_photo"),
+ // FIXME - yuk
+ '$select' => sprintf('%s %s', t('or'), ($newuser) ? '' . t('skip this step') . '' : '' . t('select a photo from your photo albums') . '')
+ ));
+
+ call_hooks('profile_photo_content_end', $o);
+
+ return $o;
+ }
+ else {
+
+ // present a cropping form
+
+ $filename = \App::$data['imagecrop'] . '-' . \App::$data['imagecrop_resolution'];
+ $resolution = \App::$data['imagecrop_resolution'];
+ $tpl = get_markup_template("cropbody.tpl");
+ $o .= replace_macros($tpl,array(
+ '$filename' => $filename,
+ '$profile' => intval($_REQUEST['profile']),
+ '$resource' => \App::$data['imagecrop'] . '-' . \App::$data['imagecrop_resolution'],
+ '$image_url' => z_root() . '/photo/' . $filename,
+ '$title' => t('Crop Image'),
+ '$desc' => t('Please adjust the image cropping for optimum viewing.'),
+ '$form_security_token' => get_form_security_token("profile_photo"),
+ '$done' => t('Done Editing')
+ ));
+ return $o;
+ }
+
+ return; // NOTREACHED
+ }
+
+ /* @brief Generate the UI for photo-cropping
+ *
+ * @param $a Current application
+ * @param $ph Photo-Factory
+ * @return void
+ *
+ */
+
+
+
+ function profile_photo_crop_ui_head(&$a, $ph, $hash, $smallest){
+
+ $max_length = get_config('system','max_image_length');
+ if(! $max_length)
+ $max_length = MAX_IMAGE_LENGTH;
+ if($max_length > 0)
+ $ph->scaleImage($max_length);
+
+ \App::$data['width'] = $ph->getWidth();
+ \App::$data['height'] = $ph->getHeight();
+
+ if(\App::$data['width'] < 500 || \App::$data['height'] < 500) {
+ $ph->scaleImageUp(400);
+ \App::$data['width'] = $ph->getWidth();
+ \App::$data['height'] = $ph->getHeight();
+ }
+
+
+ \App::$data['imagecrop'] = $hash;
+ \App::$data['imagecrop_resolution'] = $smallest;
+ \App::$page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
+ return;
+ }
+
+
+}
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
new file mode 100644
index 000000000..4b05182c2
--- /dev/null
+++ b/Zotlabs/Module/Profiles.php
@@ -0,0 +1,789 @@
+ 2) && (argv(1) === "drop") && intval(argv(2))) {
+ $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1",
+ intval(argv(2)),
+ intval(local_channel())
+ );
+ if(! count($r)) {
+ notice( t('Profile not found.') . EOL);
+ goaway(z_root() . '/profiles');
+ return; // NOTREACHED
+ }
+ $profile_guid = $r['profile_guid'];
+
+ check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+
+ // move every contact using this profile as their default to the user default
+
+ $r = q("UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
+ intval(local_channel()),
+ dbesc($profile_guid),
+ intval(local_channel())
+ );
+ $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d",
+ intval(argv(2)),
+ intval(local_channel())
+ );
+ if($r)
+ info( t('Profile deleted.') . EOL);
+
+ // @fixme this is a much more complicated sync - add any changed abook entries and
+ // also add deleted flag to profile structure
+ // profiles_build_sync is just here as a placeholder - it doesn't work at all here
+
+ // profiles_build_sync(local_channel());
+
+ goaway(z_root() . '/profiles');
+ return; // NOTREACHED
+ }
+
+
+
+
+
+ if((argc() > 1) && (argv(1) === 'new')) {
+
+ // check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+
+ $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+ intval(local_channel()));
+ $num_profiles = count($r0);
+
+ $name = t('Profile-') . ($num_profiles + 1);
+
+ $r1 = q("SELECT `fullname`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is_default` = 1 LIMIT 1",
+ intval(local_channel()));
+
+ $r2 = q("INSERT INTO `profile` (`aid`, `uid` , `profile_guid`, `profile_name` , `fullname`, `photo`, `thumb`)
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
+ intval(get_account_id()),
+ intval(local_channel()),
+ dbesc(random_string()),
+ dbesc($name),
+ dbesc($r1[0]['fullname']),
+ dbesc($r1[0]['photo']),
+ dbesc($r1[0]['thumb'])
+ );
+
+ $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1",
+ intval(local_channel()),
+ dbesc($name)
+ );
+
+ info( t('New profile created.') . EOL);
+ if(count($r3) == 1)
+ goaway(z_root() . '/profiles/' . $r3[0]['id']);
+
+ goaway(z_root() . '/profiles');
+ }
+
+ if((argc() > 2) && (argv(1) === 'clone')) {
+
+ check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+
+ $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+ intval(local_channel()));
+ $num_profiles = count($r0);
+
+ $name = t('Profile-') . ($num_profiles + 1);
+ $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+ intval(local_channel()),
+ intval(\App::$argv[2])
+ );
+ if(! count($r1)) {
+ notice( t('Profile unavailable to clone.') . EOL);
+ \App::$error = 404;
+ return;
+ }
+ unset($r1[0]['id']);
+ $r1[0]['is_default'] = 0;
+ $r1[0]['publish'] = 0;
+ $r1[0]['profile_name'] = dbesc($name);
+ $r1[0]['profile_guid'] = dbesc(random_string());
+
+ dbesc_array($r1[0]);
+
+ $r2 = dbq("INSERT INTO `profile` (`"
+ . implode("`, `", array_keys($r1[0]))
+ . "`) VALUES ('"
+ . implode("', '", array_values($r1[0]))
+ . "')" );
+
+ $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1",
+ intval(local_channel()),
+ dbesc($name)
+ );
+ info( t('New profile created.') . EOL);
+
+ profiles_build_sync(local_channel());
+
+ if(($r3) && (count($r3) == 1))
+ goaway(z_root() . '/profiles/' . $r3[0]['id']);
+
+ goaway(z_root() . '/profiles');
+
+ return; // NOTREACHED
+ }
+
+ if((argc() > 2) && (argv(1) === 'export')) {
+
+ $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+ intval(local_channel()),
+ intval(argv(2))
+ );
+ if(! $r1) {
+ notice( t('Profile unavailable to export.') . EOL);
+ \App::$error = 404;
+ return;
+ }
+ header('content-type: application/octet_stream');
+ header('content-disposition: attachment; filename="' . $r1[0]['profile_name'] . '.json"' );
+
+ unset($r1[0]['id']);
+ unset($r1[0]['aid']);
+ unset($r1[0]['uid']);
+ unset($r1[0]['is_default']);
+ unset($r1[0]['publish']);
+ unset($r1[0]['profile_name']);
+ unset($r1[0]['profile_guid']);
+ echo json_encode($r1[0]);
+ killme();
+ }
+
+
+
+
+ // Run profile_load() here to make sure the theme is set before
+ // we start loading content
+ if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(),'multi_profiles')) {
+ if(feature_enabled(local_channel(),'multi_profiles'))
+ $id = \App::$argv[1];
+ else {
+ $x = q("select id from profile where uid = %d and is_default = 1",
+ intval(local_channel())
+ );
+ if($x)
+ $id = $x[0]['id'];
+ }
+ $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($id),
+ intval(local_channel())
+ );
+ if(! count($r)) {
+ notice( t('Profile not found.') . EOL);
+ \App::$error = 404;
+ return;
+ }
+
+ $chan = \App::get_channel();
+
+ profile_load($chan['channel_address'],$r[0]['id']);
+ }
+ }
+
+ function post() {
+
+ if(! local_channel()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ require_once('include/activities.php');
+
+ $namechanged = false;
+
+
+ // import from json export file.
+ // Only import fields that are allowed on this hub
+
+ if(x($_FILES,'userfile')) {
+ $src = $_FILES['userfile']['tmp_name'];
+ $filesize = intval($_FILES['userfile']['size']);
+ if($filesize) {
+ $j = @json_decode(@file_get_contents($src),true);
+ @unlink($src);
+ if($j) {
+ $fields = get_profile_fields_advanced();
+ if($fields) {
+ foreach($j as $jj => $v) {
+ foreach($fields as $f => $n) {
+ if($jj == $f) {
+ $_POST[$f] = $v;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ call_hooks('profile_post', $_POST);
+
+
+ if((argc() > 1) && (argv(1) !== "new") && intval(argv(1))) {
+ $orig = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval(\App::$argv[1]),
+ intval(local_channel())
+ );
+ if(! count($orig)) {
+ notice( t('Profile not found.') . EOL);
+ return;
+ }
+
+ check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
+
+ $is_default = (($orig[0]['is_default']) ? 1 : 0);
+
+ $profile_name = notags(trim($_POST['profile_name']));
+ if(! strlen($profile_name)) {
+ notice( t('Profile Name is required.') . EOL);
+ return;
+ }
+
+ $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated?
+
+ $y = substr($dob,0,4);
+ if((! ctype_digit($y)) || ($y < 1900))
+ $ignore_year = true;
+ else
+ $ignore_year = false;
+
+ if($dob != '0000-00-00') {
+ if(strpos($dob,'0000-') === 0) {
+ $ignore_year = true;
+ $dob = substr($dob,5);
+ }
+ $dob = datetime_convert('UTC','UTC',(($ignore_year) ? '1900-' . $dob : $dob),(($ignore_year) ? 'm-d' : 'Y-m-d'));
+ if($ignore_year)
+ $dob = '0000-' . $dob;
+ }
+
+ $name = escape_tags(trim($_POST['name']));
+
+ if($orig[0]['fullname'] != $name) {
+ $namechanged = true;
+
+ $v = validate_channelname($name);
+ if($v) {
+ notice($v);
+ $namechanged = false;
+ $name = $orig[0]['fullname'];
+ }
+ }
+
+ $pdesc = escape_tags(trim($_POST['pdesc']));
+ $gender = escape_tags(trim($_POST['gender']));
+ $address = escape_tags(trim($_POST['address']));
+ $locality = escape_tags(trim($_POST['locality']));
+ $region = escape_tags(trim($_POST['region']));
+ $postal_code = escape_tags(trim($_POST['postal_code']));
+ $country_name = escape_tags(trim($_POST['country_name']));
+ $keywords = escape_tags(trim($_POST['keywords']));
+ $marital = escape_tags(trim($_POST['marital']));
+ $howlong = escape_tags(trim($_POST['howlong']));
+ $sexual = escape_tags(trim($_POST['sexual']));
+ $homepage = escape_tags(trim($_POST['homepage']));
+ $hometown = escape_tags(trim($_POST['hometown']));
+ $politic = escape_tags(trim($_POST['politic']));
+ $religion = escape_tags(trim($_POST['religion']));
+
+ $likes = fix_mce_lf(escape_tags(trim($_POST['likes'])));
+ $dislikes = fix_mce_lf(escape_tags(trim($_POST['dislikes'])));
+
+ $about = fix_mce_lf(escape_tags(trim($_POST['about'])));
+ $interest = fix_mce_lf(escape_tags(trim($_POST['interest'])));
+ $contact = fix_mce_lf(escape_tags(trim($_POST['contact'])));
+ $channels = fix_mce_lf(escape_tags(trim($_POST['channels'])));
+ $music = fix_mce_lf(escape_tags(trim($_POST['music'])));
+ $book = fix_mce_lf(escape_tags(trim($_POST['book'])));
+ $tv = fix_mce_lf(escape_tags(trim($_POST['tv'])));
+ $film = fix_mce_lf(escape_tags(trim($_POST['film'])));
+ $romance = fix_mce_lf(escape_tags(trim($_POST['romance'])));
+ $work = fix_mce_lf(escape_tags(trim($_POST['work'])));
+ $education = fix_mce_lf(escape_tags(trim($_POST['education'])));
+
+ $hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0);
+
+ require_once('include/text.php');
+ linkify_tags($a, $likes, local_channel());
+ linkify_tags($a, $dislikes, local_channel());
+ linkify_tags($a, $about, local_channel());
+ linkify_tags($a, $interest, local_channel());
+ linkify_tags($a, $interest, local_channel());
+ linkify_tags($a, $contact, local_channel());
+ linkify_tags($a, $channels, local_channel());
+ linkify_tags($a, $music, local_channel());
+ linkify_tags($a, $book, local_channel());
+ linkify_tags($a, $tv, local_channel());
+ linkify_tags($a, $film, local_channel());
+ linkify_tags($a, $romance, local_channel());
+ linkify_tags($a, $work, local_channel());
+ linkify_tags($a, $education, local_channel());
+
+
+ $with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : '');
+
+ if(! strlen($howlong))
+ $howlong = NULL_DATE;
+ else
+ $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
+
+ // linkify the relationship target if applicable
+
+ $withchanged = false;
+
+ if(strlen($with)) {
+ if($with != strip_tags($orig[0]['partner'])) {
+ $withchanged = true;
+ $prf = '';
+ $lookup = $with;
+ if(strpos($lookup,'@') === 0)
+ $lookup = substr($lookup,1);
+ $lookup = str_replace('_',' ', $lookup);
+ $newname = $lookup;
+
+ $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1",
+ dbesc($newname),
+ intval(local_channel())
+ );
+ if(! $r) {
+ $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_addr = '%s' AND abook_channel = %d LIMIT 1",
+ dbesc($lookup . '@%'),
+ intval(local_channel())
+ );
+ }
+ if($r) {
+ $prf = $r[0]['xchan_url'];
+ $newname = $r[0]['xchan_name'];
+ }
+
+
+ if($prf) {
+ $with = str_replace($lookup,'' . $newname . '', $with);
+ if(strpos($with,'@') === 0)
+ $with = substr($with,1);
+ }
+ }
+ else
+ $with = $orig[0]['partner'];
+ }
+
+ $profile_fields_basic = get_profile_fields_basic();
+ $profile_fields_advanced = get_profile_fields_advanced();
+ $advanced = ((feature_enabled(local_channel(),'advanced_profiles')) ? true : false);
+ if($advanced)
+ $fields = $profile_fields_advanced;
+ else
+ $fields = $profile_fields_basic;
+
+ $z = q("select * from profdef where true");
+ if($z) {
+ foreach($z as $zz) {
+ if(array_key_exists($zz['field_name'],$fields)) {
+ $w = q("select * from profext where channel_id = %d and hash = '%s' and k = '%s' limit 1",
+ intval(local_channel()),
+ dbesc($orig[0]['profile_guid']),
+ dbesc($zz['field_name'])
+ );
+ if($w) {
+ q("update profext set v = '%s' where id = %d",
+ dbesc(escape_tags(trim($_POST[$zz['field_name']]))),
+ intval($w[0]['id'])
+ );
+ }
+ else {
+ q("insert into profext ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ",
+ intval(local_channel()),
+ dbesc($orig[0]['profile_guid']),
+ dbesc($zz['field_name']),
+ dbesc(escape_tags(trim($_POST[$zz['field_name']])))
+ );
+ }
+ }
+ }
+ }
+
+ $changes = array();
+ $value = '';
+ if($is_default) {
+ if($marital != $orig[0]['marital']) {
+ $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
+ $value = $marital;
+ }
+ if($withchanged) {
+ $changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
+ $value = strip_tags($with);
+ }
+ if($likes != $orig[0]['likes']) {
+ $changes[] = t('Likes');
+ $value = $likes;
+ }
+ if($dislikes != $orig[0]['dislikes']) {
+ $changes[] = t('Dislikes');
+ $value = $dislikes;
+ }
+ if($work != $orig[0]['employment']) {
+ $changes[] = t('Work/Employment');
+ }
+ if($religion != $orig[0]['religion']) {
+ $changes[] = t('Religion');
+ $value = $religion;
+ }
+ if($politic != $orig[0]['politic']) {
+ $changes[] = t('Political Views');
+ $value = $politic;
+ }
+ if($gender != $orig[0]['gender']) {
+ $changes[] = t('Gender');
+ $value = $gender;
+ }
+ if($sexual != $orig[0]['sexual']) {
+ $changes[] = t('Sexual Preference');
+ $value = $sexual;
+ }
+ if($homepage != $orig[0]['homepage']) {
+ $changes[] = t('Homepage');
+ $value = $homepage;
+ }
+ if($interest != $orig[0]['interest']) {
+ $changes[] = t('Interests');
+ $value = $interest;
+ }
+ if($address != $orig[0]['address']) {
+ $changes[] = t('Address');
+ // New address not sent in notifications, potential privacy issues
+ // in case this leaks to unintended recipients. Yes, it's in the public
+ // profile but that doesn't mean we have to broadcast it to everybody.
+ }
+ if($locality != $orig[0]['locality'] || $region != $orig[0]['region']
+ || $country_name != $orig[0]['country_name']) {
+ $changes[] = t('Location');
+ $comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
+ $comma2 = (($region && $country_name) ? ', ' : '');
+ $value = $locality . $comma1 . $region . $comma2 . $country_name;
+ }
+
+ profile_activity($changes,$value);
+
+ }
+
+ $r = q("UPDATE `profile`
+ SET `profile_name` = '%s',
+ `fullname` = '%s',
+ `pdesc` = '%s',
+ `gender` = '%s',
+ `dob` = '%s',
+ `address` = '%s',
+ `locality` = '%s',
+ `region` = '%s',
+ `postal_code` = '%s',
+ `country_name` = '%s',
+ `marital` = '%s',
+ `partner` = '%s',
+ `howlong` = '%s',
+ `sexual` = '%s',
+ `homepage` = '%s',
+ `hometown` = '%s',
+ `politic` = '%s',
+ `religion` = '%s',
+ `keywords` = '%s',
+ `likes` = '%s',
+ `dislikes` = '%s',
+ `about` = '%s',
+ `interest` = '%s',
+ `contact` = '%s',
+ `channels` = '%s',
+ `music` = '%s',
+ `book` = '%s',
+ `tv` = '%s',
+ `film` = '%s',
+ `romance` = '%s',
+ `employment` = '%s',
+ `education` = '%s',
+ `hide_friends` = %d
+ WHERE `id` = %d AND `uid` = %d",
+ dbesc($profile_name),
+ dbesc($name),
+ dbesc($pdesc),
+ dbesc($gender),
+ dbesc($dob),
+ dbesc($address),
+ dbesc($locality),
+ dbesc($region),
+ dbesc($postal_code),
+ dbesc($country_name),
+ dbesc($marital),
+ dbesc($with),
+ dbesc($howlong),
+ dbesc($sexual),
+ dbesc($homepage),
+ dbesc($hometown),
+ dbesc($politic),
+ dbesc($religion),
+ dbesc($keywords),
+ dbesc($likes),
+ dbesc($dislikes),
+ dbesc($about),
+ dbesc($interest),
+ dbesc($contact),
+ dbesc($channels),
+ dbesc($music),
+ dbesc($book),
+ dbesc($tv),
+ dbesc($film),
+ dbesc($romance),
+ dbesc($work),
+ dbesc($education),
+ intval($hide_friends),
+ intval(argv(1)),
+ intval(local_channel())
+ );
+
+ if($r)
+ info( t('Profile updated.') . EOL);
+
+ $r = q("select * from profile where id = %d and uid = %d limit 1",
+ intval(argv(1)),
+ intval(local_channel())
+ );
+ if($r) {
+ require_once('include/zot.php');
+ build_sync_packet(local_channel(),array('profile' => $r));
+ }
+
+ $channel = \App::get_channel();
+
+ if($namechanged && $is_default) {
+ $r = q("UPDATE xchan SET xchan_name = '%s', xchan_name_date = '%s' WHERE xchan_hash = '%s'",
+ dbesc($name),
+ dbesc(datetime_convert()),
+ dbesc($channel['xchan_hash'])
+ );
+ $r = q("UPDATE channel SET channel_name = '%s' WHERE channel_hash = '%s'",
+ dbesc($name),
+ dbesc($channel['xchan_hash'])
+ );
+ }
+
+ if($is_default) {
+ // reload the info for the sidebar widget - why does this not work?
+ profile_load($channel['channel_address']);
+ \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
+ }
+ }
+ }
+
+
+ function get() {
+
+ $o = '';
+
+ $channel = \App::get_channel();
+
+ if(! local_channel()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ require_once('include/channel.php');
+
+ $profile_fields_basic = get_profile_fields_basic();
+ $profile_fields_advanced = get_profile_fields_advanced();
+
+ if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(),'multi_profiles')) {
+ if(feature_enabled(local_channel(),'multi_profiles'))
+ $id = \App::$argv[1];
+ else {
+ $x = q("select id from profile where uid = %d and is_default = 1",
+ intval(local_channel())
+ );
+ if($x)
+ $id = $x[0]['id'];
+ }
+ $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($id),
+ intval(local_channel())
+ );
+ if(! count($r)) {
+ notice( t('Profile not found.') . EOL);
+ return;
+ }
+
+ $editselect = 'none';
+
+ \App::$page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
+ '$baseurl' => z_root(),
+ '$editselect' => $editselect,
+ ));
+
+ $advanced = ((feature_enabled(local_channel(),'advanced_profiles')) ? true : false);
+ if($advanced)
+ $fields = $profile_fields_advanced;
+ else
+ $fields = $profile_fields_basic;
+
+ $hide_friends = array(
+ 'hide_friends',
+ t('Hide your connections list from viewers of this profile'),
+ $r[0]['hide_friends'],
+ '',
+ array(t('No'),t('Yes'))
+ );
+
+ $q = q("select * from profdef where true");
+ if($q) {
+ $extra_fields = array();
+
+ foreach($q as $qq) {
+ $mine = q("select v from profext where k = '%s' and hash = '%s' and channel_id = %d limit 1",
+ dbesc($qq['field_name']),
+ dbesc($r[0]['profile_guid']),
+ intval(local_channel())
+ );
+
+ if(array_key_exists($qq['field_name'],$fields)) {
+ $extra_fields[] = array($qq['field_name'],$qq['field_desc'],(($mine) ? $mine[0]['v'] : ''), $qq['field_help']);
+ }
+ }
+ }
+
+ //logger('extra_fields: ' . print_r($extra_fields,true));
+
+ $f = get_config('system','birthday_input_format');
+ if(! $f)
+ $f = 'ymd';
+
+ $is_default = (($r[0]['is_default']) ? 1 : 0);
+
+ $tpl = get_markup_template("profile_edit.tpl");
+ $o .= replace_macros($tpl,array(
+
+ '$form_security_token' => get_form_security_token("profile_edit"),
+ '$profile_clone_link' => ((feature_enabled(local_channel(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t='
+ . get_form_security_token("profile_clone") : ''),
+ '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t='
+ . get_form_security_token("profile_drop"),
+
+ '$fields' => $fields,
+ '$guid' => $r[0]['profile_guid'],
+ '$banner' => t('Edit Profile Details'),
+ '$submit' => t('Submit'),
+ '$viewprof' => t('View this profile'),
+ '$editvis' => t('Edit visibility'),
+ '$tools_label' => t('Profile Tools'),
+ '$coverpic' => t('Change cover photo'),
+ '$profpic' => t('Change profile photo'),
+ '$cr_prof' => t('Create a new profile using these settings'),
+ '$cl_prof' => t('Clone this profile'),
+ '$del_prof' => t('Delete this profile'),
+ '$addthing' => t('Add profile things'),
+ '$personal' => t('Personal'),
+ '$location' => t('Location'),
+ '$relation' => t('Relation'),
+ '$miscellaneous'=> t('Miscellaneous'),
+ '$exportable' => feature_enabled(local_channel(),'profile_export'),
+ '$lbl_import' => t('Import profile from file'),
+ '$lbl_export' => t('Export profile to file'),
+ '$lbl_gender' => t('Your gender'),
+ '$lbl_marital' => t('Marital status'),
+ '$lbl_sexual' => t('Sexual preference'),
+ '$baseurl' => z_root(),
+ '$profile_id' => $r[0]['id'],
+ '$profile_name' => array('profile_name', t('Profile name'), $r[0]['profile_name'], t('Required'), '*'),
+ '$is_default' => $is_default,
+ '$default' => t('This is your default profile.') . EOL . translate_scope(map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_profile'))),
+ '$advanced' => $advanced,
+ '$name' => array('name', t('Your full name'), $r[0]['fullname'], t('Required'), '*'),
+ '$pdesc' => array('pdesc', t('Title/Description'), $r[0]['pdesc']),
+ '$dob' => dob($r[0]['dob']),
+ '$hide_friends' => $hide_friends,
+ '$address' => array('address', t('Street address'), $r[0]['address']),
+ '$locality' => array('locality', t('Locality/City'), $r[0]['locality']),
+ '$region' => array('region', t('Region/State'), $r[0]['region']),
+ '$postal_code' => array('postal_code', t('Postal/Zip code'), $r[0]['postal_code']),
+ '$country_name' => array('country_name', t('Country'), $r[0]['country_name']),
+ '$gender' => gender_selector($r[0]['gender']),
+ '$gender_min' => gender_selector_min($r[0]['gender']),
+ '$marital' => marital_selector($r[0]['marital']),
+ '$marital_min' => marital_selector_min($r[0]['marital']),
+ '$with' => array('with', t("Who (if applicable)"), $r[0]['partner'], t('Examples: cathy123, Cathy Williams, cathy@example.com')),
+ '$howlong' => array('howlong', t('Since (date)'), ($r[0]['howlong'] === NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
+ '$sexual' => sexpref_selector($r[0]['sexual']),
+ '$sexual_min' => sexpref_selector_min($r[0]['sexual']),
+ '$about' => array('about', t('Tell us about yourself'), $r[0]['about']),
+ '$homepage' => array('homepage', t('Homepage URL'), $r[0]['homepage']),
+ '$hometown' => array('hometown', t('Hometown'), $r[0]['hometown']),
+ '$politic' => array('politic', t('Political views'), $r[0]['politic']),
+ '$religion' => array('religion', t('Religious views'), $r[0]['religion']),
+ '$keywords' => array('keywords', t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')),
+ '$likes' => array('likes', t('Likes'), $r[0]['likes']),
+ '$dislikes' => array('dislikes', t('Dislikes'), $r[0]['dislikes']),
+ '$music' => array('music', t('Musical interests'), $r[0]['music']),
+ '$book' => array('book', t('Books, literature'), $r[0]['book']),
+ '$tv' => array('tv', t('Television'), $r[0]['tv']),
+ '$film' => array('film', t('Film/Dance/Culture/Entertainment'), $r[0]['film']),
+ '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
+ '$romance' => array('romance',t('Love/Romance'), $r[0]['romance']),
+ '$work' => array('work', t('Work/Employment'), $r[0]['employment']),
+ '$education' => array('education', t('School/Education'), $r[0]['education']),
+ '$contact' => array('contact', t('Contact information and social networks'), $r[0]['contact']),
+ '$channels' => array('channels', t('My other channels'), $r[0]['channels']),
+ '$extra_fields' => $extra_fields,
+ ));
+
+ $arr = array('profile' => $r[0], 'entry' => $o);
+ call_hooks('profile_edit', $arr);
+
+ return $o;
+ }
+ else {
+
+ $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
+ local_channel());
+ if($r) {
+
+ $tpl = get_markup_template('profile_entry.tpl');
+ foreach($r as $rr) {
+ $profiles .= replace_macros($tpl, array(
+ '$photo' => $rr['thumb'],
+ '$id' => $rr['id'],
+ '$alt' => t('Profile Image'),
+ '$profile_name' => $rr['profile_name'],
+ '$visible' => (($rr['is_default'])
+ ? '' . translate_scope(map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_profile'))) . ''
+ : '' . t('Edit visibility') . '')
+ ));
+ }
+
+ $tpl_header = get_markup_template('profile_listing_header.tpl');
+ $o .= replace_macros($tpl_header,array(
+ '$header' => t('Edit Profiles'),
+ '$cr_new' => t('Create New'),
+ '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
+ '$profiles' => $profiles
+ ));
+
+ }
+ return $o;
+ }
+
+ }
+
+}
diff --git a/Zotlabs/Module/Profperm.php b/Zotlabs/Module/Profperm.php
new file mode 100644
index 000000000..b1da147c1
--- /dev/null
+++ b/Zotlabs/Module/Profperm.php
@@ -0,0 +1,172 @@
+ 2) && intval(argv(1)) && intval(argv(2))) {
+ $r = q("SELECT abook_id FROM abook WHERE abook_id = %d and abook_channel = %d limit 1",
+ intval(argv(2)),
+ intval(local_channel())
+ );
+ if($r)
+ $change = intval(argv(2));
+ }
+
+
+ if((argc() > 1) && (intval(argv(1)))) {
+ $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1",
+ intval(argv(1)),
+ intval(local_channel())
+ );
+ if(! $r) {
+ notice( t('Invalid profile identifier.') . EOL );
+ return;
+ }
+
+ $profile = $r[0];
+
+ $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'",
+ intval(local_channel()),
+ dbesc($profile['profile_guid'])
+ );
+
+ $ingroup = array();
+ if($r)
+ foreach($r as $member)
+ $ingroup[] = $member['abook_id'];
+
+ $members = $r;
+
+ if($change) {
+ if(in_array($change,$ingroup)) {
+ q("UPDATE abook SET abook_profile = '' WHERE abook_id = %d AND abook_channel = %d",
+ intval($change),
+ intval(local_channel())
+ );
+ }
+ else {
+ q("UPDATE abook SET abook_profile = '%s' WHERE abook_id = %d AND abook_channel = %d",
+ dbesc($profile['profile_guid']),
+ intval($change),
+ intval(local_channel())
+ );
+
+ }
+
+
+ //Time to update the permissions on the profile-pictures as well
+
+ profile_photo_set_profile_perms(local_channel(),$profile['id']);
+
+ $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'",
+ intval(local_channel()),
+ dbesc($profile['profile_guid'])
+ );
+
+ $members = $r;
+
+ $ingroup = array();
+ if(count($r))
+ foreach($r as $member)
+ $ingroup[] = $member['abook_id'];
+ }
+
+ $o .= '' . t('Profile Visibility Editor') . '
'; + + $o .= '' . t('Profile') . ' \'' . $profile['profile_name'] . '\'
'; + + $o .= '' . t('Click on a contact to add or remove.') . '
';
+
+ }
+
+ $o .= '';
+ if($change)
+ $o = '';
+
+ $o .= '
'; + + $o .= '
';
+ return $o;
+
+ }
+
+
+}
diff --git a/Zotlabs/Module/Pubsites.php b/Zotlabs/Module/Pubsites.php
new file mode 100644
index 000000000..0dda08e6d
--- /dev/null
+++ b/Zotlabs/Module/Pubsites.php
@@ -0,0 +1,60 @@
+';
+
+ $o .= '';
+ $o .= '
';
+ $o .= '' . t('Visible To') . '
'; + $o .= '';
+
+ $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
+
+ foreach($members as $member) {
+ if($member['xchan_url']) {
+ $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;';
+ $o .= micropro($member,true,'mpprof', $textmode);
+ }
+ }
+ $o .= '
';
+ $o .= ''; + + $o .= '
';
+ $o .= '
';
+ $o .= '' . t("All Connections") . '
'; + $o .= '';
+
+ $r = abook_connections(local_channel());
+
+ if($r) {
+ $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
+ foreach($r as $member) {
+ if(! in_array($member['abook_id'],$ingroup)) {
+ $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;';
+ $o .= micropro($member,true,'mpprof',$textmode);
+ }
+ }
+ }
+
+ $o .= '
';
+
+ if($change) {
+ echo $o;
+ killme();
+ }
+ $o .= '' . t('Public Hubs') . '
' .
+ t('The listed hubs allow public registration for the $Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself may provide additional details.') . '
' . EOL;
+
+ $ret = z_fetch_url($url);
+ if($ret['success']) {
+ $j = json_decode($ret['body'],true);
+ if($j) {
+ $o .= '| ' . t('Hub URL') . ' | ' . t('Access Type') . ' | ' . t('Registration Policy') . ' | ' . t('Stats') . ' | ' . t('Software') . ' | ' . t('Ratings') . ' | ' . t('Rate') . ' | ' : ''); + $location = ''; + if(!empty($jj['location'])) { + $location = '
| ' . $urltext . '' . $location . ' | ' . $jj['access'] . ' | ' . $jj['register'] . ' | ' . ' | ' . ucwords($jj['project']) . ' | ' . t('View') . ' | ' . $rate_links . '|
' . login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); + return $o; + } + + if(! is_site_admin()) { + notice( t('Permission denied.') . EOL); + return ''; + } + + if(argc() != 3) + killme(); + + $cmd = argv(1); + $hash = argv(2); + + if($cmd === 'deny') { + if (! account_deny($hash)) killme(); + } + + if($cmd === 'allow') { + if (! account_allow($hash)) killme(); + } + } + +} diff --git a/Zotlabs/Module/Regver.php b/Zotlabs/Module/Regver.php new file mode 100644 index 000000000..82b162f56 --- /dev/null +++ b/Zotlabs/Module/Regver.php @@ -0,0 +1,28 @@ + d1) { + notice( t('Account removals are not allowed within 48 hours of changing the account password.') . EOL); + return; + } + } + + $global_remove = intval($_POST['global']); + + account_remove($account_id, 1 - $global_remove); + } + + function get() { + + if(! local_channel()) + goaway(z_root()); + + $hash = random_string(); + + $_SESSION['remove_account_verify'] = $hash; + $tpl = get_markup_template('removeaccount.tpl'); + $o .= replace_macros($tpl, array( + '$basedir' => z_root(), + '$hash' => $hash, + '$title' => t('Remove This Account'), + '$desc' => array(t('WARNING: '), t('This account and all its channels will be completely removed from the network. '), t('This action is permanent and can not be undone!')), + '$passwd' => t('Please enter your password for verification:'), + '$global' => array('global', t('Remove this account, all its channels and all its channel clones from the network'), false, t('By default only the instances of the channels located on this hub will be removed from the network')), + '$submit' => t('Remove Account') + )); + + return $o; + + } + +} diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php new file mode 100644 index 000000000..bc18fe0f8 --- /dev/null +++ b/Zotlabs/Module/Removeme.php @@ -0,0 +1,71 @@ + d1) { + notice( t('Channel removals are not allowed within 48 hours of changing the account password.') . EOL); + return; + } + } + + $global_remove = intval($_POST['global']); + + channel_remove(local_channel(),1 - $global_remove,true); + + } + + + function get() { + + if(! local_channel()) + goaway(z_root()); + + $hash = random_string(); + + $_SESSION['remove_account_verify'] = $hash; + + $tpl = get_markup_template('removeme.tpl'); + $o .= replace_macros($tpl, array( + '$basedir' => z_root(), + '$hash' => $hash, + '$title' => t('Remove This Channel'), + '$desc' => array(t('WARNING: '), t('This channel will be completely removed from the network. '), t('This action is permanent and can not be undone!')), + '$passwd' => t('Please enter your password for verification:'), + '$global' => array('global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), array(t('No'),t('Yes'))), + '$submit' => t('Remove Channel') + )); + + return $o; + + } + +} diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php new file mode 100644 index 000000000..26b0c46a6 --- /dev/null +++ b/Zotlabs/Module/Rmagic.php @@ -0,0 +1,95 @@ + $address); + call_hooks('reverse_magic_auth', $arr); + + try { + require_once('library/openid/openid.php'); + $openid = new \LightOpenID(z_root()); + $openid->identity = $address; + $openid->returnUrl = z_root() . '/openid'; + $openid->required = array('namePerson/friendly', 'namePerson'); + $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); + goaway($openid->authUrl()); + } catch (\Exception $e) { + notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'
'. t('The error message was:').' '.$e->getMessage()); + } + + // if they're still here... + notice( t('Authentication failed.') . EOL); + return; + } + else { + + // Presumed Red identity. Perform reverse magic auth + + if(strpos($address,'@') === false) { + notice('Invalid address.'); + return; + } + + $r = null; + if($address) { + $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1", + dbesc($address) + ); + } + if($r) { + $url = $r[0]['hubloc_url']; + } + else { + $url = 'https://' . substr($address,strpos($address,'@')+1); + } + + if($url) { + if($_SESSION['return_url']) + $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); + else + $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',\App::$query_string)); + + goaway($url . '/magic' . '?f=&dest=' . $dest); + } + } + } + + + function get() { + + $o = replace_macros(get_markup_template('rmagic.tpl'),array( + '$title' => t('Remote Authentication'), + '$desc' => t('Enter your channel address (e.g. channel@example.com)'), + '$submit' => t('Authenticate') + )); + return $o; + + } +} diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php new file mode 100644 index 000000000..9e3043d10 --- /dev/null +++ b/Zotlabs/Module/Rpost.php @@ -0,0 +1,144 @@ + $arg) { + $url .= '&' . $key . '=' . $arg; + } + goaway($url); + } + } + + // The login procedure is going to bugger our $_REQUEST variables + // so save them in the session. + + if(array_key_exists('body',$_REQUEST)) { + $_SESSION['rpost'] = $_REQUEST; + } + return login(); + } + + // If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables + + if((! array_key_exists('body',$_REQUEST)) && (array_key_exists('rpost',$_SESSION))) { + $_REQUEST = $_SESSION['rpost']; + unset($_SESSION['rpost']); + } + + if(array_key_exists('channel',$_REQUEST)) { + $r = q("select channel_id from channel where channel_account_id = %d and channel_address = '%s' limit 1", + intval(get_account_id()), + dbesc($_REQUEST['channel']) + ); + if($r) { + require_once('include/security.php'); + $change = change_channel($r[0]['channel_id']); + } + } + + if($_REQUEST['remote_return']) { + $_SESSION['remote_return'] = $_REQUEST['remote_return']; + } + if(argc() > 1 && argv(1) === 'return') { + if($_SESSION['remote_return']) + goaway($_SESSION['remote_return']); + goaway(z_root() . '/network'); + } + + $plaintext = true; + // if(feature_enabled(local_channel(),'richtext')) + // $plaintext = false; + + if(array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html') { + require_once('include/html2bbcode.php'); + $_REQUEST['body'] = html2bbcode($_REQUEST['body']); + } + + $channel = \App::get_channel(); + + + $acl = new \Zotlabs\Access\AccessList($channel); + + $channel_acl = $acl->get(); + + if($_REQUEST['url']) { + $x = z_fetch_url(z_root() . '/linkinfo?f=&url=' . urlencode($_REQUEST['url'])); + if($x['success']) + $_REQUEST['body'] = $_REQUEST['body'] . $x['body']; + } + + $x = array( + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), + 'acl' => populate_acl($channel_acl, true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'bang' => '', + 'visitor' => true, + 'profile_uid' => local_channel(), + 'title' => $_REQUEST['title'], + 'body' => $_REQUEST['body'], + 'attachment' => $_REQUEST['attachment'], + 'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''), + 'return_path' => 'rpost/return', + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true + ); + + $editor = status_editor($a,$x); + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit post'), + '$editor' => $editor + )); + + return $o; + + } + + + +} diff --git a/Zotlabs/Module/Rsd_xml.php b/Zotlabs/Module/Rsd_xml.php new file mode 100644 index 000000000..e5059834b --- /dev/null +++ b/Zotlabs/Module/Rsd_xml.php @@ -0,0 +1,17 @@ + \Zotlabs\Lib\System::get_platform_name(), + '$baseurl' => z_root(), + '$apipath' => z_root() . '/api/' + )); + killme(); + } + +} + diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php new file mode 100644 index 000000000..402a27d40 --- /dev/null +++ b/Zotlabs/Module/Search.php @@ -0,0 +1,228 @@ +' . "\r\n"; + + $o = '
' . "\r\n";
+
+ $o .= '
';
+
+ return $o;
+ }
+
+
+}
diff --git a/Zotlabs/Module/Search_ac.php b/Zotlabs/Module/Search_ac.php
new file mode 100644
index 000000000..4e936d97b
--- /dev/null
+++ b/Zotlabs/Module/Search_ac.php
@@ -0,0 +1,82 @@
+ $g['xchan_photo_s'],
+ "name" => '@'.$g['xchan_name'],
+ "id" => $g['abook_id'],
+ "link" => $g['xchan_url'],
+ "label" => '',
+ "nick" => '',
+ );
+ }
+ }
+
+ $r = q("select distinct term, tid, url from term where ttype in ( %d, %d ) $tag_sql_extra group by term order by term asc",
+ intval(TERM_HASHTAG),
+ intval(TERM_COMMUNITYTAG)
+ );
+
+ if(count($r)) {
+ foreach($r as $g) {
+ $results[] = array(
+ "photo" => z_root() . '/images/hashtag.png',
+ "name" => '#'.$g['term'],
+ "id" => $g['tid'],
+ "link" => $g['url'],
+ "label" => '',
+ "nick" => '',
+ );
+ }
+ }
+
+ header("content-type: application/json");
+ $o = array(
+ 'start' => $start,
+ 'count' => $count,
+ 'items' => $results,
+ );
+ echo json_encode($o);
+
+ logger('search_ac: ' . print_r($x,true));
+
+ killme();
+ }
+
+
+
+}
diff --git a/Zotlabs/Module/Service_limits.php b/Zotlabs/Module/Service_limits.php
new file mode 100644
index 000000000..2a1f78054
--- /dev/null
+++ b/Zotlabs/Module/Service_limits.php
@@ -0,0 +1,28 @@
+ 1) && (argv(1) === 'oauth') && x($_POST,'remove')){
+ check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+
+ $key = $_POST['remove'];
+ q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
+ dbesc($key),
+ local_channel());
+ goaway(z_root()."/settings/oauth/");
+ return;
+ }
+
+ if((argc() > 2) && (argv(1) === 'oauth') && (argv(2) === 'edit'||(argv(2) === 'add')) && x($_POST,'submit')) {
+
+ check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+
+ $name = ((x($_POST,'name')) ? $_POST['name'] : '');
+ $key = ((x($_POST,'key')) ? $_POST['key'] : '');
+ $secret = ((x($_POST,'secret')) ? $_POST['secret'] : '');
+ $redirect = ((x($_POST,'redirect')) ? $_POST['redirect'] : '');
+ $icon = ((x($_POST,'icon')) ? $_POST['icon'] : '');
+ $ok = true;
+ if($name == '') {
+ $ok = false;
+ notice( t('Name is required') . EOL);
+ }
+ if($key == '' || $secret == '') {
+ $ok = false;
+ notice( t('Key and Secret are required') . EOL);
+ }
+
+ if($ok) {
+ if ($_POST['submit']==t("Update")){
+ $r = q("UPDATE clients SET
+ client_id='%s',
+ pw='%s',
+ clname='%s',
+ redirect_uri='%s',
+ icon='%s',
+ uid=%d
+ WHERE client_id='%s'",
+ dbesc($key),
+ dbesc($secret),
+ dbesc($name),
+ dbesc($redirect),
+ dbesc($icon),
+ intval(local_channel()),
+ dbesc($key));
+ } else {
+ $r = q("INSERT INTO clients (client_id, pw, clname, redirect_uri, icon, uid)
+ VALUES ('%s','%s','%s','%s','%s',%d)",
+ dbesc($key),
+ dbesc($secret),
+ dbesc($name),
+ dbesc($redirect),
+ dbesc($icon),
+ intval(local_channel())
+ );
+ $r = q("INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ",
+ dbesc($key),
+ intval(local_channel()),
+ dbesc('all')
+ );
+ }
+ }
+ goaway(z_root()."/settings/oauth/");
+ return;
+ }
+
+ if((argc() > 1) && (argv(1) == 'featured')) {
+ check_form_security_token_redirectOnErr('/settings/featured', 'settings_featured');
+
+ call_hooks('feature_settings_post', $_POST);
+
+ build_sync_packet();
+ return;
+ }
+
+
+ if((argc() > 1) && (argv(1) == 'tokens')) {
+ check_form_security_token_redirectOnErr('/settings/tokens', 'settings_tokens');
+ $token_errs = 0;
+ if(array_key_exists('token',$_POST)) {
+ $atoken_id = (($_POST['atoken_id']) ? intval($_POST['atoken_id']) : 0);
+ $name = trim(escape_tags($_POST['name']));
+ $token = trim($_POST['token']);
+ if((! $name) || (! $token))
+ $token_errs ++;
+ if(trim($_POST['expires']))
+ $expires = datetime_convert(date_default_timezone_get(),'UTC',$_POST['expires']);
+ else
+ $expires = NULL_DATE;
+ $max_atokens = service_class_fetch(local_channel(),'access_tokens');
+ if($max_atokens) {
+ $r = q("select count(atoken_id) as total where atoken_uid = %d",
+ intval(local_channel())
+ );
+ if($r && intval($r[0]['total']) >= $max_tokens) {
+ notice( sprintf( t('This channel is limited to %d tokens'), $max_tokens) . EOL);
+ return;
+ }
+ }
+ }
+ if($token_errs) {
+ notice( t('Name and Password are required.') . EOL);
+ return;
+ }
+ if($atoken_id) {
+ $r = q("update atoken set atoken_name = '%s', atoken_token = '%s' atoken_expires = '%s'
+ where atoken_id = %d and atoken_uid = %d",
+ dbesc($name),
+ dbesc($token),
+ dbesc($expires),
+ intval($atoken_id),
+ intval($channel['channel_id'])
+ );
+ }
+ else {
+ $r = q("insert into atoken ( atoken_aid, atoken_uid, atoken_name, atoken_token, atoken_expires )
+ values ( %d, %d, '%s', '%s', '%s' ) ",
+ intval($channel['channel_account_id']),
+ intval($channel['channel_id']),
+ dbesc($name),
+ dbesc($token),
+ dbesc($expires)
+ );
+ }
+
+ info( t('Token saved.') . EOL);
+ return;
+ }
+
+
+
+ if((argc() > 1) && (argv(1) === 'features')) {
+ check_form_security_token_redirectOnErr('/settings/features', 'settings_features');
+
+ // Build list of features and check which are set
+ $features = get_features();
+ $all_features = array();
+ foreach($features as $k => $v) {
+ foreach($v as $f)
+ $all_features[] = $f[0];
+ }
+ foreach($all_features as $k) {
+ if(x($_POST,"feature_$k"))
+ set_pconfig(local_channel(),'feature',$k, 1);
+ else
+ set_pconfig(local_channel(),'feature',$k, 0);
+ }
+ build_sync_packet();
+ return;
+ }
+
+ if((argc() > 1) && (argv(1) == 'display')) {
+
+ check_form_security_token_redirectOnErr('/settings/display', 'settings_display');
+
+ $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : \App::$channel['channel_theme']);
+ $mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme'])) : '');
+ $preload_images = ((x($_POST,'preload_images')) ? intval($_POST['preload_images']) : 0);
+ $user_scalable = ((x($_POST,'user_scalable')) ? intval($_POST['user_scalable']) : 0);
+ $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0);
+ $title_tosource = ((x($_POST,'title_tosource')) ? intval($_POST['title_tosource']) : 0);
+ $channel_list_mode = ((x($_POST,'channel_list_mode')) ? intval($_POST['channel_list_mode']) : 0);
+ $network_list_mode = ((x($_POST,'network_list_mode')) ? intval($_POST['network_list_mode']) : 0);
+
+ $channel_divmore_height = ((x($_POST,'channel_divmore_height')) ? intval($_POST['channel_divmore_height']) : 400);
+ if($channel_divmore_height < 50)
+ $channel_divmore_height = 50;
+ $network_divmore_height = ((x($_POST,'network_divmore_height')) ? intval($_POST['network_divmore_height']) : 400);
+ if($network_divmore_height < 50)
+ $network_divmore_height = 50;
+
+ $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
+ $browser_update = $browser_update * 1000;
+ if($browser_update < 10000)
+ $browser_update = 10000;
+
+ $itemspage = ((x($_POST,'itemspage')) ? intval($_POST['itemspage']) : 20);
+ if($itemspage > 100)
+ $itemspage = 100;
+
+
+ if ($mobile_theme == "---")
+ del_pconfig(local_channel(),'system','mobile_theme');
+ else {
+ set_pconfig(local_channel(),'system','mobile_theme',$mobile_theme);
+ }
+
+ set_pconfig(local_channel(),'system','preload_images',$preload_images);
+ set_pconfig(local_channel(),'system','user_scalable',$user_scalable);
+ set_pconfig(local_channel(),'system','update_interval', $browser_update);
+ set_pconfig(local_channel(),'system','itemspage', $itemspage);
+ set_pconfig(local_channel(),'system','no_smilies',1-intval($nosmile));
+ set_pconfig(local_channel(),'system','title_tosource',$title_tosource);
+ set_pconfig(local_channel(),'system','channel_list_mode', $channel_list_mode);
+ set_pconfig(local_channel(),'system','network_list_mode', $network_list_mode);
+ set_pconfig(local_channel(),'system','channel_divmore_height', $channel_divmore_height);
+ set_pconfig(local_channel(),'system','network_divmore_height', $network_divmore_height);
+
+ if ($theme == \App::$channel['channel_theme']){
+ // call theme_post only if theme has not been changed
+ if( ($themeconfigfile = $this->get_theme_config_file($theme)) != null){
+ require_once($themeconfigfile);
+ theme_post($a);
+ }
+ }
+
+ $r = q("UPDATE channel SET channel_theme = '%s' WHERE channel_id = %d",
+ dbesc($theme),
+ intval(local_channel())
+ );
+
+ call_hooks('display_settings_post', $_POST);
+ build_sync_packet();
+ goaway(z_root() . '/settings/display' );
+ return; // NOTREACHED
+ }
+
+
+ if(argc() > 1 && argv(1) === 'account') {
+
+ check_form_security_token_redirectOnErr('/settings/account', 'settings_account');
+
+ call_hooks('account_settings_post', $_POST);
+ // call_hooks('settings_account', $_POST);
+
+ $errs = array();
+
+ $email = ((x($_POST,'email')) ? trim(notags($_POST['email'])) : '');
+ $account = \App::get_account();
+ if($email != $account['account_email']) {
+ if(! valid_email($email))
+ $errs[] = t('Not valid email.');
+ $adm = trim(get_config('system','admin_email'));
+ if(($adm) && (strcasecmp($email,$adm) == 0)) {
+ $errs[] = t('Protected email address. Cannot change to that email.');
+ $email = \App::$user['email'];
+ }
+ if(! $errs) {
+ $r = q("update account set account_email = '%s' where account_id = %d",
+ dbesc($email),
+ intval($account['account_id'])
+ );
+ if(! $r)
+ $errs[] = t('System failure storing new email. Please try again.');
+ }
+ }
+
+ if($errs) {
+ foreach($errs as $err)
+ notice($err . EOL);
+ $errs = array();
+ }
+
+
+ if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
+
+ $origpass = trim($_POST['origpass']);
+
+ require_once('include/auth.php');
+ if(! account_verify_password($email,$origpass)) {
+ $errs[] = t('Password verification failed.');
+ }
+
+ $newpass = trim($_POST['npassword']);
+ $confirm = trim($_POST['confirm']);
+
+ if($newpass != $confirm ) {
+ $errs[] = t('Passwords do not match. Password unchanged.');
+ }
+
+ if((! x($newpass)) || (! x($confirm))) {
+ $errs[] = t('Empty passwords are not allowed. Password unchanged.');
+ }
+
+ if(! $errs) {
+ $salt = random_string(32);
+ $password_encoded = hash('whirlpool', $salt . $newpass);
+ $r = q("update account set account_salt = '%s', account_password = '%s', account_password_changed = '%s'
+ where account_id = %d",
+ dbesc($salt),
+ dbesc($password_encoded),
+ dbesc(datetime_convert()),
+ intval(get_account_id())
+ );
+ if($r)
+ info( t('Password changed.') . EOL);
+ else
+ $errs[] = t('Password update failed. Please try again.');
+ }
+ }
+
+
+ if($errs) {
+ foreach($errs as $err)
+ notice($err . EOL);
+ }
+ goaway(z_root() . '/settings/account' );
+ }
+
+
+ check_form_security_token_redirectOnErr('/settings', 'settings');
+
+ call_hooks('settings_post', $_POST);
+
+ $set_perms = '';
+
+ $role = ((x($_POST,'permissions_role')) ? notags(trim($_POST['permissions_role'])) : '');
+ $oldrole = get_pconfig(local_channel(),'system','permissions_role');
+
+ if(($role != $oldrole) || ($role === 'custom')) {
+
+ if($role === 'custom') {
+ $hide_presence = (((x($_POST,'hide_presence')) && (intval($_POST['hide_presence']) == 1)) ? 1: 0);
+ $publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
+ $def_group = ((x($_POST,'group-selection')) ? notags(trim($_POST['group-selection'])) : '');
+ $r = q("update channel set channel_default_group = '%s' where channel_id = %d",
+ dbesc($def_group),
+ intval(local_channel())
+ );
+
+ $global_perms = \Zotlabs\Access\Permissions::Perms();
+
+ foreach($global_perms as $k => $v) {
+ \Zotlabs\Access\PermissionLimits::Set(local_channel(),$k,intval($_POST[$k]));
+ }
+ $acl = new \Zotlabs\Access\AccessList($channel);
+ $acl->set_from_array($_POST);
+ $x = $acl->get();
+
+ $r = q("update channel set channel_allow_cid = '%s', channel_allow_gid = '%s',
+ channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d",
+ dbesc($x['allow_cid']),
+ dbesc($x['allow_gid']),
+ dbesc($x['deny_cid']),
+ dbesc($x['deny_gid']),
+ intval(local_channel())
+ );
+ }
+ else {
+ $role_permissions = \Zotlabs\Access\PermissionRoles::role_perms($_POST['permissions_role']);
+ if(! $role_permissions) {
+ notice('Permissions category could not be found.');
+ return;
+ }
+ $hide_presence = 1 - (intval($role_permissions['online']));
+ if($role_permissions['default_collection']) {
+ $r = q("select hash from groups where uid = %d and gname = '%s' limit 1",
+ intval(local_channel()),
+ dbesc( t('Friends') )
+ );
+ if(! $r) {
+ require_once('include/group.php');
+ group_add(local_channel(), t('Friends'));
+ group_add_member(local_channel(),t('Friends'),$channel['channel_hash']);
+ $r = q("select hash from groups where uid = %d and gname = '%s' limit 1",
+ intval(local_channel()),
+ dbesc( t('Friends') )
+ );
+ }
+ if($r) {
+ q("update channel set channel_default_group = '%s', channel_allow_gid = '%s', channel_allow_cid = '', channel_deny_gid = '', channel_deny_cid = '' where channel_id = %d",
+ dbesc($r[0]['hash']),
+ dbesc('<' . $r[0]['hash'] . '>'),
+ intval(local_channel())
+ );
+ }
+ else {
+ notice( sprintf('Default privacy group \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL);
+ return;
+ }
+ }
+ // no default collection
+ else {
+ q("update channel set channel_default_group = '', channel_allow_gid = '', channel_allow_cid = '', channel_deny_gid = '',
+ channel_deny_cid = '' where channel_id = %d",
+ intval(local_channel())
+ );
+ }
+
+ $x = \Zotlabs\Access\Permissions::FilledPerms($role_permissions['perms_connect']);
+ foreach($x as $k => $v) {
+ set_abconfig(local_channel(),$channel['channel_hash'],'my_perms',$k, $v);
+ if($role_permissions['perms_auto']) {
+ set_pconfig(local_channel(),'autoperms',$k,$v);
+ }
+ else {
+ del_pconfig(local_channel(),'autoperms',$k);
+ }
+ }
+
+ if($role_permissions['limits']) {
+ foreach($role_permissions['limits'] as $k => $v) {
+ \Zotlabs\Access\PermissionLimits::Set(local_channel(),$k,$v);
+ }
+ }
+ if(array_key_exists('directory_publish',$role_permissions)) {
+ $publish = intval($role_permissions['directory_publish']);
+ }
+ }
+
+ set_pconfig(local_channel(),'system','hide_online_status',$hide_presence);
+ set_pconfig(local_channel(),'system','permissions_role',$role);
+ }
+
+ $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
+ $timezone = ((x($_POST,'timezone_select')) ? notags(trim($_POST['timezone_select'])) : '');
+ $defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : '');
+ $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
+ $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
+ $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0);
+ $evdays = ((x($_POST,'evdays')) ? intval($_POST['evdays']) : 3);
+ $photo_path = ((x($_POST,'photo_path')) ? escape_tags(trim($_POST['photo_path'])) : '');
+ $attach_path = ((x($_POST,'attach_path')) ? escape_tags(trim($_POST['attach_path'])) : '');
+
+ $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']),ENT_QUOTES) : '');
+
+ $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
+ $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
+ $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0);
+ $expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0);
+
+ $allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
+
+ $blocktags = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
+ $unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
+ $cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
+ $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
+
+ $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0);
+ $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0);
+ $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
+ $adult = (($_POST['adult'] == 1) ? 1 : 0);
+
+ $cal_first_day = (((x($_POST,'first_day')) && (intval($_POST['first_day']) == 1)) ? 1: 0);
+
+ $channel = \App::get_channel();
+ $pageflags = $channel['channel_pageflags'];
+ $existing_adult = (($pageflags & PAGE_ADULT) ? 1 : 0);
+ if($adult != $existing_adult)
+ $pageflags = ($pageflags ^ PAGE_ADULT);
+
+
+ $notify = 0;
+
+ if(x($_POST,'notify1'))
+ $notify += intval($_POST['notify1']);
+ if(x($_POST,'notify2'))
+ $notify += intval($_POST['notify2']);
+ if(x($_POST,'notify3'))
+ $notify += intval($_POST['notify3']);
+ if(x($_POST,'notify4'))
+ $notify += intval($_POST['notify4']);
+ if(x($_POST,'notify5'))
+ $notify += intval($_POST['notify5']);
+ if(x($_POST,'notify6'))
+ $notify += intval($_POST['notify6']);
+ if(x($_POST,'notify7'))
+ $notify += intval($_POST['notify7']);
+ if(x($_POST,'notify8'))
+ $notify += intval($_POST['notify8']);
+
+
+ $vnotify = 0;
+
+ if(x($_POST,'vnotify1'))
+ $vnotify += intval($_POST['vnotify1']);
+ if(x($_POST,'vnotify2'))
+ $vnotify += intval($_POST['vnotify2']);
+ if(x($_POST,'vnotify3'))
+ $vnotify += intval($_POST['vnotify3']);
+ if(x($_POST,'vnotify4'))
+ $vnotify += intval($_POST['vnotify4']);
+ if(x($_POST,'vnotify5'))
+ $vnotify += intval($_POST['vnotify5']);
+ if(x($_POST,'vnotify6'))
+ $vnotify += intval($_POST['vnotify6']);
+ if(x($_POST,'vnotify7'))
+ $vnotify += intval($_POST['vnotify7']);
+ if(x($_POST,'vnotify8'))
+ $vnotify += intval($_POST['vnotify8']);
+ if(x($_POST,'vnotify9'))
+ $vnotify += intval($_POST['vnotify9']);
+ if(x($_POST,'vnotify10'))
+ $vnotify += intval($_POST['vnotify10']);
+ if(x($_POST,'vnotify11'))
+ $vnotify += intval($_POST['vnotify11']);
+
+ $always_show_in_notices = x($_POST,'always_show_in_notices') ? 1 : 0;
+
+ $channel = \App::get_channel();
+
+ $err = '';
+
+ $name_change = false;
+
+ if($username != $channel['channel_name']) {
+ $name_change = true;
+ require_once('include/channel.php');
+ $err = validate_channelname($username);
+ if($err) {
+ notice($err);
+ return;
+ }
+ }
+
+ if($timezone != $channel['channel_timezone']) {
+ if(strlen($timezone))
+ date_default_timezone_set($timezone);
+ }
+
+ set_pconfig(local_channel(),'system','use_browser_location',$allow_location);
+ set_pconfig(local_channel(),'system','suggestme', $suggestme);
+ set_pconfig(local_channel(),'system','post_newfriend', $post_newfriend);
+ set_pconfig(local_channel(),'system','post_joingroup', $post_joingroup);
+ set_pconfig(local_channel(),'system','post_profilechange', $post_profilechange);
+ set_pconfig(local_channel(),'system','blocktags',$blocktags);
+ set_pconfig(local_channel(),'system','channel_menu',$channel_menu);
+ set_pconfig(local_channel(),'system','vnotify',$vnotify);
+ set_pconfig(local_channel(),'system','always_show_in_notices',$always_show_in_notices);
+ set_pconfig(local_channel(),'system','evdays',$evdays);
+ set_pconfig(local_channel(),'system','photo_path',$photo_path);
+ set_pconfig(local_channel(),'system','attach_path',$attach_path);
+ set_pconfig(local_channel(),'system','cal_first_day',$cal_first_day);
+
+ $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d",
+ dbesc($username),
+ intval($pageflags),
+ dbesc($timezone),
+ dbesc($defloc),
+ intval($notify),
+ intval($unkmail),
+ intval($maxreq),
+ intval($expire),
+ intval(local_channel())
+ );
+ if($r)
+ info( t('Settings updated.') . EOL);
+
+ if(! is_null($publish)) {
+ $r = q("UPDATE profile SET publish = %d WHERE is_default = 1 AND uid = %d",
+ intval($publish),
+ intval(local_channel())
+ );
+ }
+
+ if($name_change) {
+ $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_hash = '%s'",
+ dbesc($username),
+ dbesc(datetime_convert()),
+ dbesc($channel['channel_hash'])
+ );
+ $r = q("update profile set fullname = '%s' where uid = %d and is_default = 1",
+ dbesc($username),
+ intval($channel['channel_id'])
+ );
+ }
+
+ \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
+
+ build_sync_packet();
+
+
+ //$_SESSION['theme'] = $theme;
+ if($email_changed && \App::$config['system']['register_policy'] == REGISTER_VERIFY) {
+
+ // FIXME - set to un-verified, blocked and redirect to logout
+ // Why? Are we verifying people or email addresses?
+
+ }
+
+ goaway(z_root() . '/settings' );
+ return; // NOTREACHED
+ }
+
+
+
+ function get() {
+
+ $o = '';
+ nav_set_selected('settings');
+
+
+ if((! local_channel()) || ($_SESSION['delegate'])) {
+ notice( t('Permission denied.') . EOL );
+ return login();
+ }
+
+
+ $channel = \App::get_channel();
+ if($channel)
+ head_set_icon($channel['xchan_photo_s']);
+
+ $yes_no = array(t('No'),t('Yes'));
+
+ if((argc() > 1) && (argv(1) === 'oauth')) {
+
+ if((argc() > 2) && (argv(2) === 'add')) {
+ $tpl = get_markup_template("settings_oauth_edit.tpl");
+ $o .= replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("settings_oauth"),
+ '$title' => t('Add application'),
+ '$submit' => t('Submit'),
+ '$cancel' => t('Cancel'),
+ '$name' => array('name', t('Name'), '', t('Name of application')),
+ '$key' => array('key', t('Consumer Key'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
+ '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
+ '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')),
+ '$icon' => array('icon', t('Icon url'), '', t('Optional')),
+ ));
+ return $o;
+ }
+
+ if((argc() > 3) && (argv(2) === 'edit')) {
+ $r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
+ dbesc(argv(3)),
+ local_channel());
+
+ if (!count($r)){
+ notice(t('Application not found.'));
+ return;
+ }
+ $app = $r[0];
+
+ $tpl = get_markup_template("settings_oauth_edit.tpl");
+ $o .= replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("settings_oauth"),
+ '$title' => t('Add application'),
+ '$submit' => t('Update'),
+ '$cancel' => t('Cancel'),
+ '$name' => array('name', t('Name'), $app['clname'] , ''),
+ '$key' => array('key', t('Consumer Key'), $app['client_id'], ''),
+ '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''),
+ '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''),
+ '$icon' => array('icon', t('Icon url'), $app['icon'], ''),
+ ));
+ return $o;
+ }
+
+ if((argc() > 3) && (argv(2) === 'delete')) {
+ check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
+
+ $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
+ dbesc(argv(3)),
+ local_channel());
+ goaway(z_root()."/settings/oauth/");
+ return;
+ }
+
+
+ $r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
+ FROM clients
+ LEFT JOIN tokens ON clients.client_id=tokens.client_id
+ WHERE clients.uid IN (%d,0)",
+ local_channel(),
+ local_channel());
+
+
+ $tpl = get_markup_template("settings_oauth.tpl");
+ $o .= replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("settings_oauth"),
+ '$baseurl' => z_root(),
+ '$title' => t('Connected Apps'),
+ '$add' => t('Add application'),
+ '$edit' => t('Edit'),
+ '$delete' => t('Delete'),
+ '$consumerkey' => t('Client key starts with'),
+ '$noname' => t('No name'),
+ '$remove' => t('Remove authorization'),
+ '$apps' => $r,
+ ));
+ return $o;
+
+ }
+ if((argc() > 1) && (argv(1) === 'featured')) {
+ $settings_addons = "";
+
+ $o = '';
+
+ $r = q("SELECT * FROM `hook` WHERE `hook` = 'feature_settings' ");
+ if(! $r)
+ $settings_addons = t('No feature settings configured');
+
+ call_hooks('feature_settings', $settings_addons);
+
+ $tpl = get_markup_template("settings_addons.tpl");
+ $o .= replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("settings_featured"),
+ '$title' => t('Feature/Addon Settings'),
+ '$settings_addons' => $settings_addons
+ ));
+ return $o;
+ }
+
+
+ /*
+ * ACCOUNT SETTINGS
+ */
+
+
+ if((argc() > 1) && (argv(1) === 'account')) {
+ $account_settings = "";
+
+ call_hooks('account_settings', $account_settings);
+
+ $email = \App::$account['account_email'];
+
+
+ $tpl = get_markup_template("settings_account.tpl");
+ $o .= replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("settings_account"),
+ '$title' => t('Account Settings'),
+ '$origpass' => array('origpass', t('Current Password'), ' ',''),
+ '$password1'=> array('npassword', t('Enter New Password'), '', ''),
+ '$password2'=> array('confirm', t('Confirm New Password'), '', t('Leave password fields blank unless changing')),
+ '$submit' => t('Submit'),
+ '$email' => array('email', t('Email Address:'), $email, ''),
+ '$removeme' => t('Remove Account'),
+ '$removeaccount' => t('Remove this account including all its channels'),
+ '$account_settings' => $account_settings
+ ));
+ return $o;
+ }
+
+ if((argc() > 1) && (argv(1) === 'tokens')) {
+ $atoken = null;
+ if(argc() > 2) {
+ $id = argv(2);
+
+ $atoken = q("select * from atoken where atoken_id = %d and atoken_uid = %d",
+ intval($id),
+ intval(local_channel())
+ );
+
+ if($atoken)
+ $atoken = $atoken[0];
+
+ if($atoken && argc() > 3 && argv(3) === 'drop') {
+ $r = q("delete from atoken where atoken_id = %d",
+ intval($id)
+ );
+ }
+ }
+ $t = q("select * from atoken where atoken_uid = %d",
+ intval(local_channel())
+ );
+
+ $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content.');
+
+ $desc2 = t('You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:');
+
+ $tpl = get_markup_template("settings_tokens.tpl");
+ $o .= replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("settings_tokens"),
+ '$title' => t('Guest Access Tokens'),
+ '$desc' => $desc,
+ '$desc2' => $desc2,
+ '$tokens' => $t,
+ '$atoken' => $atoken,
+ '$url1' => z_root() . '/channel/' . $channel['channel_address'],
+ '$url2' => z_root() . '/photos/' . $channel['channel_address'],
+ '$name' => array('name', t('Login Name') . ' *', (($atoken) ? $atoken['atoken_name'] : ''),''),
+ '$token'=> array('token', t('Login Password') . ' *',(($atoken) ? $atoken['atoken_token'] : autoname(8)), ''),
+ '$expires'=> array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] != NULL_DATE) ? datetime_convert('UTC',date_default_timezone_get(),$atoken['atoken_expires']) : ''), ''),
+ '$submit' => t('Submit')
+ ));
+ return $o;
+ }
+
+
+
+
+
+ if((argc() > 1) && (argv(1) === 'features')) {
+ $arr = array();
+ $features = get_features();
+
+ foreach($features as $fname => $fdata) {
+ $arr[$fname] = array();
+ $arr[$fname][0] = $fdata[0];
+ foreach(array_slice($fdata,1) as $f) {
+ $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
+ }
+ }
+
+ $tpl = get_markup_template("settings_features.tpl");
+ $o .= replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("settings_features"),
+ '$title' => t('Additional Features'),
+ '$features' => $arr,
+ '$submit' => t('Submit'),
+ ));
+
+ return $o;
+ }
+
+
+
+
+
+ if((argc() > 1) && (argv(1) === 'connectors')) {
+
+ $settings_connectors = "";
+
+ call_hooks('connector_settings', $settings_connectors);
+
+ $r = null;
+
+ $tpl = get_markup_template("settings_connectors.tpl");
+
+ $o .= replace_macros($tpl, array(
+ '$form_security_token' => get_form_security_token("settings_connectors"),
+ '$title' => t('Connector Settings'),
+ '$submit' => t('Submit'),
+ '$settings_connectors' => $settings_connectors
+ ));
+
+ call_hooks('display_settings', $o);
+ return $o;
+ }
+
+ /*
+ * DISPLAY SETTINGS
+ */
+
+ if((argc() > 1) && (argv(1) === 'display')) {
+ $default_theme = get_config('system','theme');
+ if(! $default_theme)
+ $default_theme = 'default';
+ $default_mobile_theme = get_config('system','mobile_theme');
+ if(! $mobile_default_theme)
+ $mobile_default_theme = 'none';
+
+ $allowed_themes_str = get_config('system','allowed_themes');
+ $allowed_themes_raw = explode(',',$allowed_themes_str);
+ $allowed_themes = array();
+ if(count($allowed_themes_raw))
+ foreach($allowed_themes_raw as $x)
+ if(strlen(trim($x)) && is_dir("view/theme/$x"))
+ $allowed_themes[] = trim($x);
+
+
+ $themes = array();
+ $files = glob('view/theme/*');
+ if($allowed_themes) {
+ foreach($allowed_themes as $th) {
+ $f = $th;
+ $is_experimental = file_exists('view/theme/' . $th . '/experimental');
+ $unsupported = file_exists('view/theme/' . $th . '/unsupported');
+ $is_mobile = file_exists('view/theme/' . $th . '/mobile');
+ $is_library = file_exists('view/theme/'. $th . '/library');
+ $mobile_themes["---"] = t("No special theme for mobile devices");
+
+ if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){
+ $theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f);
+ if (! $is_library) {
+ if($is_mobile) {
+ $mobile_themes[$f] = $themes[$f] = $theme_name . ' (' . t('mobile') . ')';
+ }
+ else {
+ $mobile_themes[$f] = $themes[$f] = $theme_name;
+ }
+ }
+ }
+
+ }
+ }
+ $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);
+ $mobile_theme_selected = (!x($_SESSION,'mobile_theme')? $default_mobile_theme : $_SESSION['mobile_theme']);
+
+ $preload_images = get_pconfig(local_channel(),'system','preload_images');
+ $preload_images = (($preload_images===false)? '0': $preload_images); // default if not set: 0
+
+ $user_scalable = get_pconfig(local_channel(),'system','user_scalable');
+ $user_scalable = (($user_scalable===false)? '1': $user_scalable); // default if not set: 1
+
+ $browser_update = intval(get_pconfig(local_channel(), 'system','update_interval'));
+ $browser_update = (($browser_update == 0) ? 80 : $browser_update / 1000); // default if not set: 40 seconds
+
+ $itemspage = intval(get_pconfig(local_channel(), 'system','itemspage'));
+ $itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items
+
+ $nosmile = get_pconfig(local_channel(),'system','no_smilies');
+ $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
+
+ $title_tosource = get_pconfig(local_channel(),'system','title_tosource');
+ $title_tosource = (($title_tosource===false)? '0': $title_tosource); // default if not set: 0
+
+ $theme_config = "";
+ if( ($themeconfigfile = $this->get_theme_config_file($theme_selected)) != null){
+ require_once($themeconfigfile);
+ $theme_config = theme_content($a);
+ }
+
+ $tpl = get_markup_template("settings_display.tpl");
+ $o = replace_macros($tpl, array(
+ '$ptitle' => t('Display Settings'),
+ '$d_tset' => t('Theme Settings'),
+ '$d_ctset' => t('Custom Theme Settings'),
+ '$d_cset' => t('Content Settings'),
+ '$form_security_token' => get_form_security_token("settings_display"),
+ '$submit' => t('Submit'),
+ '$baseurl' => z_root(),
+ '$uid' => local_channel(),
+
+ '$theme' => (($themes) ? array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview') : false),
+ '$mobile_theme' => (($mobile_themes) ? array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, '') : false),
+ '$preload_images' => array('preload_images', t("Preload images before rendering the page"), $preload_images, t("The subjective page load time will be longer but the page will be ready when displayed"), $yes_no),
+ '$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, '', $yes_no),
+ '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
+ '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')),
+ '$nosmile' => array('nosmile', t("Show emoticons (smilies) as images"), 1-intval($nosmile), '', $yes_no),
+ '$title_tosource' => array('title_tosource', t("Link post titles to source"), $title_tosource, '', $yes_no),
+ '$layout_editor' => t('System Page Layout Editor - (advanced)'),
+ '$theme_config' => $theme_config,
+ '$expert' => feature_enabled(local_channel(),'expert'),
+ '$channel_list_mode' => array('channel_list_mode', t('Use blog/list mode on channel page'), get_pconfig(local_channel(),'system','channel_list_mode'), t('(comments displayed separately)'), $yes_no),
+ '$network_list_mode' => array('network_list_mode', t('Use blog/list mode on grid page'), get_pconfig(local_channel(),'system','network_list_mode'), t('(comments displayed separately)'), $yes_no),
+ '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')),
+ '$network_divmore_height' => array('network_divmore_height', t('Grid page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')),
+
+
+ ));
+
+ return $o;
+ }
+
+ if(argv(1) === 'channel') {
+
+ require_once('include/acl_selectors.php');
+ require_once('include/permissions.php');
+
+
+ $p = q("SELECT * FROM `profile` WHERE `is_default` = 1 AND `uid` = %d LIMIT 1",
+ intval(local_channel())
+ );
+ if(count($p))
+ $profile = $p[0];
+
+ load_pconfig(local_channel(),'expire');
+
+ $channel = \App::get_channel();
+
+ $global_perms = \Zotlabs\Access\Permissions::Perms();
+
+ $permiss = array();
+
+ $perm_opts = array(
+ array( t('Nobody except yourself'), 0),
+ array( t('Only those you specifically allow'), PERMS_SPECIFIC),
+ array( t('Approved connections'), PERMS_CONTACTS),
+ array( t('Any connections'), PERMS_PENDING),
+ array( t('Anybody on this website'), PERMS_SITE),
+ array( t('Anybody in this network'), PERMS_NETWORK),
+ array( t('Anybody authenticated'), PERMS_AUTHED),
+ array( t('Anybody on the internet'), PERMS_PUBLIC)
+ );
+
+ $limits = \Zotlabs\Access\PermissionLimits::Get(local_channel());
+
+ foreach($global_perms as $k => $perm) {
+ $options = array();
+ foreach($perm_opts as $opt) {
+ $options[$opt[1]] = $opt[0];
+ }
+ $permiss[] = array($k,$perm,$limits[$k],'',$options);
+ }
+
+
+ //logger('permiss: ' . print_r($permiss,true));
+
+
+
+ $username = $channel['channel_name'];
+ $nickname = $channel['channel_address'];
+ $timezone = $channel['channel_timezone'];
+ $notify = $channel['channel_notifyflags'];
+ $defloc = $channel['channel_location'];
+
+ $maxreq = $channel['channel_max_friend_req'];
+ $expire = $channel['channel_expire_days'];
+ $adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT);
+ $sys_expire = get_config('system','default_expire_days');
+
+ // $unkmail = \App::$user['unkmail'];
+ // $cntunkmail = \App::$user['cntunkmail'];
+
+ $hide_presence = intval(get_pconfig(local_channel(), 'system','hide_online_status'));
+
+
+ $expire_items = get_pconfig(local_channel(), 'expire','items');
+ $expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1
+
+ $expire_notes = get_pconfig(local_channel(), 'expire','notes');
+ $expire_notes = (($expire_notes===false)? '1' : $expire_notes); // default if not set: 1
+
+ $expire_starred = get_pconfig(local_channel(), 'expire','starred');
+ $expire_starred = (($expire_starred===false)? '1' : $expire_starred); // default if not set: 1
+
+ $expire_photos = get_pconfig(local_channel(), 'expire','photos');
+ $expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
+
+ $expire_network_only = get_pconfig(local_channel(), 'expire','network_only');
+ $expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0
+
+
+ $suggestme = get_pconfig(local_channel(), 'system','suggestme');
+ $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
+
+ $post_newfriend = get_pconfig(local_channel(), 'system','post_newfriend');
+ $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0
+
+ $post_joingroup = get_pconfig(local_channel(), 'system','post_joingroup');
+ $post_joingroup = (($post_joingroup===false)? '0': $post_joingroup); // default if not set: 0
+
+ $post_profilechange = get_pconfig(local_channel(), 'system','post_profilechange');
+ $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0
+
+ $blocktags = get_pconfig(local_channel(),'system','blocktags');
+ $blocktags = (($blocktags===false) ? '0' : $blocktags);
+
+ $timezone = date_default_timezone_get();
+
+ $opt_tpl = get_markup_template("field_checkbox.tpl");
+ if(get_config('system','publish_all')) {
+ $profile_in_dir = '';
+ }
+ else {
+ $profile_in_dir = replace_macros($opt_tpl,array(
+ '$field' => array('profile_in_directory', t('Publish your default profile in the network directory'), $profile['publish'], '', $yes_no),
+ ));
+ }
+
+ $suggestme = replace_macros($opt_tpl,array(
+ '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', $yes_no),
+
+ ));
+
+ $subdir = ((strlen(\App::get_path())) ? '' . t('Search') . '
'; + + if(x(\App::$data,'search')) + $search = trim(\App::$data['search']); + else + $search = ((x($_GET,'search')) ? trim(rawurldecode($_GET['search'])) : ''); + + $tag = false; + if(x($_GET,'tag')) { + $tag = true; + $search = ((x($_GET,'tag')) ? trim(rawurldecode($_GET['tag'])) : ''); + } + + if((! local_channel()) || (! feature_enabled(local_channel(),'savedsearch'))) + $o .= search($search,'search-box','/search',((local_channel()) ? true : false)); + + if(strpos($search,'#') === 0) { + $tag = true; + $search = substr($search,1); + } + if(strpos($search,'@') === 0) { + $search = substr($search,1); + goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); + } + if(strpos($search,'?') === 0) { + $search = substr($search,1); + goaway(z_root() . '/help' . '?f=1&navsearch=1&search=' . $search); + } + + // look for a naked webbie + if(strpos($search,'@') !== false) { + goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); + } + + if(! $search) + return $o; + + if($tag) { + $sql_extra = sprintf(" AND `item`.`id` IN (select `oid` from term where otype = %d and ttype in ( %d , %d) and term = '%s') ", + intval(TERM_OBJ_POST), + intval(TERM_HASHTAG), + intval(TERM_COMMUNITYTAG), + dbesc(protect_sprintf($search)) + ); + } + else { + $regstr = db_getfunc('REGEXP'); + $sql_extra = sprintf(" AND `item`.`body` $regstr '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + } + + // Here is the way permissions work in the search module... + // Only public posts can be shown + // OR your own posts if you are a logged in member + // No items will be shown if the member has a blocked profile wall. + + if((! $update) && (! $load)) { + + // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + // because browser prefetching might change it on us. We have to deliver it with the page. + + $o .= '' . "\r\n"; + $o .= "\r\n"; + + \App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( + '$baseurl' => z_root(), + '$pgtype' => 'search', + '$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'), + '$gid' => '0', + '$cid' => '0', + '$cmin' => '0', + '$cmax' => '0', + '$star' => '0', + '$liked' => '0', + '$conv' => '0', + '$spam' => '0', + '$fh' => '0', + '$nouveau' => '0', + '$wall' => '0', + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), + '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), + '$search' => (($tag) ? urlencode('#') : '') . $search, + '$order' => '', + '$file' => '', + '$cats' => '', + '$tags' => '', + '$mid' => '', + '$verb' => '', + '$dend' => '', + '$dbegin' => '' + )); + + + } + + $item_normal = item_normal(); + $pub_sql = public_permissions_sql($observer_hash); + + require_once('include/channel.php'); + + $sys = get_sys_channel(); + + if(($update) && ($load)) { + $itemspage = get_pconfig(local_channel(),'system','itemspage'); + \App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); + + // in case somebody turned off public access to sys channel content with permissions + + if(! perm_is_allowed($sys['channel_id'],$observer_hash,'view_stream')) + $sys['xchan_hash'] .= 'disabled'; + + if($load) { + $r = null; + + if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { + $prefix = 'distinct on (created, mid)'; + $suffix = 'ORDER BY created DESC, mid'; + } else { + $prefix = 'distinct'; + $suffix = 'group by mid ORDER BY created DESC'; + } + if(local_channel()) { + $r = q("SELECT $prefix mid, item.id as item_id, item.* from item + WHERE ((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND item_private = 0 ) + OR ( `item`.`uid` = %d )) OR item.owner_xchan = '%s' ) + $item_normal + $sql_extra + $suffix $pager_sql ", + intval(local_channel()), + dbesc($sys['xchan_hash']) + ); + } + if($r === null) { + $r = q("SELECT $prefix mid, item.id as item_id, item.* from item + WHERE (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' + AND `item`.`deny_gid` = '' AND item_private = 0 ) + and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) + $pub_sql ) OR owner_xchan = '%s') + $item_normal + $sql_extra + $suffix $pager_sql", + dbesc($sys['xchan_hash']) + ); + } + } + else { + $r = array(); + } + } + + if($r) { + xchan_query($r); + $items = fetch_post_tags($r,true); + } else { + $items = array(); + } + + + if($format == 'json') { + $result = array(); + require_once('include/conversation.php'); + foreach($items as $item) { + $item['html'] = bbcode($item['body']); + $x = encode_item($item); + $x['html'] = prepare_text($item['body'],$item['mimetype']); + $result[] = $x; + } + json_return_and_die(array('success' => true,'messages' => $result)); + } + + if($tag) + $o .= '' . sprintf( t('Items tagged with: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '
'; + else + $o .= '' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '
'; + + $o .= conversation($a,$items,'search',$update,'client'); + + $o .= '' . t('or') . ' ' . z_root() . '/channel/' . $nickname : ''); + + $tpl_addr = get_markup_template("settings_nick_set.tpl"); + + $prof_addr = replace_macros($tpl_addr,array( + '$desc' => t('Your channel address is'), + '$nickname' => $nickname, + '$subdir' => $subdir, + '$basepath' => \App::get_hostname() + )); + + $stpl = get_markup_template('settings.tpl'); + + $acl = new \Zotlabs\Access\AccessList($channel); + $perm_defaults = $acl->get(); + + require_once('include/group.php'); + $group_select = mini_group_select(local_channel(),$channel['channel_default_group']); + + require_once('include/menu.php'); + $m1 = menu_list(local_channel()); + $menu = false; + if($m1) { + $menu = array(); + $current = get_pconfig(local_channel(),'system','channel_menu'); + $menu[] = array('name' => '', 'selected' => ((! $current) ? true : false)); + foreach($m1 as $m) { + $menu[] = array('name' => htmlspecialchars($m['menu_name'],ENT_COMPAT,'UTF-8'), 'selected' => (($m['menu_name'] === $current) ? ' selected="selected" ' : false)); + } + } + + $evdays = get_pconfig(local_channel(),'system','evdays'); + if(! $evdays) + $evdays = 3; + + $permissions_role = get_pconfig(local_channel(),'system','permissions_role'); + if(! $permissions_role) + $permissions_role = 'custom'; + + $permissions_set = (($permissions_role != 'custom') ? true : false); + + $vnotify = get_pconfig(local_channel(),'system','vnotify'); + $always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices'); + if($vnotify === false) + $vnotify = (-1); + + $o .= replace_macros($stpl,array( + '$ptitle' => t('Channel Settings'), + + '$submit' => t('Submit'), + '$baseurl' => z_root(), + '$uid' => local_channel(), + '$form_security_token' => get_form_security_token("settings"), + '$nickname_block' => $prof_addr, + '$h_basic' => t('Basic Settings'), + '$username' => array('username', t('Full Name:'), $username,''), + '$email' => array('email', t('Email Address:'), $email, ''), + '$timezone' => array('timezone_select' , t('Your Timezone:'), $timezone, '', get_timezones()), + '$defloc' => array('defloc', t('Default Post Location:'), $defloc, t('Geographical location to display on your posts')), + '$allowloc' => array('allow_location', t('Use Browser Location:'), ((get_pconfig(local_channel(),'system','use_browser_location')) ? 1 : ''), '', $yes_no), + + '$adult' => array('adult', t('Adult Content'), $adult_flag, t('This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)'), $yes_no), + + '$h_prv' => t('Security and Privacy Settings'), + '$permissions_set' => $permissions_set, + '$server_role' => \Zotlabs\Lib\System::get_server_role(), + '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'), + + '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no), + + '$lbl_pmacro' => t('Simple Privacy Settings:'), + '$pmacro3' => t('Very Public - extremely permissive (should be used with caution)'), + '$pmacro2' => t('Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)'), + '$pmacro1' => t('Private - default private, never open or public'), + '$pmacro0' => t('Blocked - default blocked to/from everybody'), + '$permiss_arr' => $permiss, + '$blocktags' => array('blocktags',t('Allow others to tag your posts'), 1-$blocktags, t('Often used by the community to retro-actively flag inappropriate content'), $yes_no), + + '$lbl_p2macro' => t('Advanced Privacy Settings'), + + '$expire' => array('expire',t('Expire other channel content after this many days'),$expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf( t('This website expires after %d days.'),intval($sys_expire)) : t('This website does not expire imported content.')) . ' ' . t('The website limit takes precedence if lower than your limit.')), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), + '$permissions' => t('Default Post and Publish Permissions'), + '$permdesc' => t("\x28click to open/close\x29"), + '$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), + '$suggestme' => $suggestme, + '$group_select' => $group_select, + '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()), + + '$profile_in_dir' => $profile_in_dir, + '$hide_friends' => $hide_friends, + '$hide_wall' => $hide_wall, + '$unkmail' => $unkmail, + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), intval($channel['channel_max_anon_mail']) ,t("Useful to reduce spamming")), + + + '$h_not' => t('Notification Settings'), + '$activity_options' => t('By default post a status message when:'), + '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, '', $yes_no), + '$post_joingroup' => array('post_joingroup', t('joining a forum/community'), $post_joingroup, '', $yes_no), + '$post_profilechange' => array('post_profilechange', t('making an interesting profile change'), $post_profilechange, '', $yes_no), + '$lbl_not' => t('Send a notification email when:'), + '$notify1' => array('notify1', t('You receive a connection request'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, '', $yes_no), + '$notify2' => array('notify2', t('Your connections are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, '', $yes_no), + '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, '', $yes_no), + '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, '', $yes_no), + '$notify5' => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, '', $yes_no), + '$notify6' => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, '', $yes_no), + '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, '', $yes_no), + '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, '', $yes_no), + + + '$lbl_vnot' => t('Show visual notifications including:'), + + '$vnotify1' => array('vnotify1', t('Unseen grid activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no), + '$vnotify2' => array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no), + '$vnotify3' => array('vnotify3', t('Unseen private messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no), + '$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, '', $yes_no), + '$vnotify5' => array('vnotify5', t('Events today'), ($vnotify & VNOTIFY_EVENTTODAY), VNOTIFY_EVENTTODAY, '', $yes_no), + '$vnotify6' => array('vnotify6', t('Upcoming birthdays'), ($vnotify & VNOTIFY_BIRTHDAY), VNOTIFY_BIRTHDAY, t('Not available in all themes'), $yes_no), + '$vnotify7' => array('vnotify7', t('System (personal) notifications'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, '', $yes_no), + '$vnotify8' => array('vnotify8', t('System info messages'), ($vnotify & VNOTIFY_INFO), VNOTIFY_INFO, t('Recommended'), $yes_no), + '$vnotify9' => array('vnotify9', t('System critical alerts'), ($vnotify & VNOTIFY_ALERT), VNOTIFY_ALERT, t('Recommended'), $yes_no), + '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no), + '$vnotify11' => array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no), + '$always_show_in_notices' => array('always_show_in_notices', t('Also show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no), + + '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')), + + '$h_advn' => t('Advanced Account/Page Type Settings'), + '$h_descadvn' => t('Change the behaviour of this account for special situations'), + '$pagetype' => $pagetype, + '$expert' => feature_enabled(local_channel(),'expert'), + '$hint' => t('Please enable expert mode (in Settings > Additional features) to adjust!'), + '$lbl_misc' => t('Miscellaneous Settings'), + '$photo_path' => array('photo_path', t('Default photo upload folder'), get_pconfig(local_channel(),'system','photo_path'), t('%Y - current year, %m - current month')), + '$attach_path' => array('attach_path', t('Default file upload folder'), get_pconfig(local_channel(),'system','attach_path'), t('%Y - current year, %m - current month')), + '$menus' => $menu, + '$menu_desc' => t('Personal menu to display in your channel pages'), + '$removeme' => t('Remove Channel'), + '$removechannel' => t('Remove this channel.'), + '$firefoxshare' => t('Firefox Share $Projectname provider'), + '$cal_first_day' => array('first_day', t('Start calendar week on monday'), ((get_pconfig(local_channel(),'system','cal_first_day')) ? 1 : ''), '', $yes_no), + )); + + call_hooks('settings_form',$o); + + $o .= '' . "\r\n"; + + return $o; + } + } + + function get_theme_config_file($theme){ + + $base_theme = \App::$theme_info['extends']; + + if (file_exists("view/theme/$theme/php/config.php")){ + return "view/theme/$theme/php/config.php"; + } + if (file_exists("view/theme/$base_theme/php/config.php")){ + return "view/theme/$base_theme/php/config.php"; + } + return null; + } + + +} diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php new file mode 100644 index 000000000..802f0c216 --- /dev/null +++ b/Zotlabs/Module/Setup.php @@ -0,0 +1,737 @@ +install_wizard_pass = intval($_POST['pass']); + else + $this->install_wizard_pass = 1; + + } + + /** + * @brief Handle the actions of the different setup steps. + * + */ + + function post() { + + switch($this->install_wizard_pass) { + case 1: + case 2: + return; + // implied break; + case 3: + $urlpath = \App::get_path(); + $dbhost = trim($_POST['dbhost']); + $dbport = intval(trim($_POST['dbport'])); + $dbuser = trim($_POST['dbuser']); + $dbpass = trim($_POST['dbpass']); + $dbdata = trim($_POST['dbdata']); + $dbtype = intval(trim($_POST['dbtype'])); + $phpath = trim($_POST['phpath']); + $adminmail = trim($_POST['adminmail']); + $siteurl = trim($_POST['siteurl']); + $advanced = ((intval($_POST['advanced'])) ? 1 : 0); + + // $siteurl should not have a trailing slash + + $siteurl = rtrim($siteurl,'/'); + + require_once('include/dba/dba_driver.php'); + + $db = \DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true); + + if(! \DBA::$dba->connected) { + echo 'Database Connect failed: ' . DBA::$dba->error; + killme(); + } + return; + // implied break; + case 4: + $urlpath = \App::get_path(); + $dbhost = notags(trim($_POST['dbhost'])); + $dbport = intval(notags(trim($_POST['dbport']))); + $dbuser = notags(trim($_POST['dbuser'])); + $dbpass = notags(trim($_POST['dbpass'])); + $dbdata = notags(trim($_POST['dbdata'])); + $dbtype = intval(notags(trim($_POST['dbtype']))); + $phpath = notags(trim($_POST['phpath'])); + $timezone = notags(trim($_POST['timezone'])); + $adminmail = notags(trim($_POST['adminmail'])); + $siteurl = notags(trim($_POST['siteurl'])); + $advanced = ((intval($_POST['advanced'])) ? 1 : 0); + + if($siteurl != z_root()) { + $test = z_fetch_url($siteurl."/setup/testrewrite"); + if((! $test['success']) || ($test['body'] != 'ok')) { + \App::$data['url_fail'] = true; + \App::$data['url_error'] = $test['error']; + return; + } + } + + if(! \DBA::$dba->connected) { + // connect to db + $db = \DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true); + } + + if(! \DBA::$dba->connected) { + echo 'CRITICAL: DB not connected.'; + killme(); + } + + $tpl = get_intltext_template('htconfig.tpl'); + $txt = replace_macros($tpl,array( + '$dbhost' => $dbhost, + '$dbport' => $dbport, + '$dbuser' => $dbuser, + '$dbpass' => $dbpass, + '$dbdata' => $dbdata, + '$dbtype' => $dbtype, + '$uno' => 1 - $advanced, + '$timezone' => $timezone, + '$siteurl' => $siteurl, + '$site_id' => random_string(), + '$phpath' => $phpath, + '$adminmail' => $adminmail + )); + + $result = file_put_contents('.htconfig.php', $txt); + if(! $result) { + \App::$data['txt'] = $txt; + } + + $errors = $this->load_database($db); + + if($errors) + \App::$data['db_failed'] = $errors; + else + \App::$data['db_installed'] = true; + + return; + // implied break; + default: + break; + } + } + + function get_db_errno() { + if(class_exists('mysqli')) + return mysqli_connect_errno(); + else + return mysql_errno(); + } + + /** + * @brief Get output for the setup page. + * + * Depending on the state we are currently in it returns different content. + * + * @return string parsed HTML output + */ + + function get() { + + $o = ''; + $wizard_status = ''; + $install_title = t('$Projectname Server - Setup'); + + if(x(\App::$data, 'db_conn_failed')) { + $this->install_wizard_pass = 2; + $wizard_status = t('Could not connect to database.'); + } + if(x(\App::$data, 'url_fail')) { + $this->install_wizard_pass = 3; + $wizard_status = t('Could not connect to specified site URL. Possible SSL certificate or DNS issue.'); + if(\App::$data['url_error']) + $wizard_status .= ' ' . \App::$data['url_error']; + } + + if(x(\App::$data, 'db_create_failed')) { + $this->install_wizard_pass = 2; + $wizard_status = t('Could not create table.'); + } + $db_return_text = ''; + if(x(\App::$data, 'db_installed')) { + $txt = '
'; + $txt .= t('Your site database has been installed.') . EOL; + $db_return_text .= $txt; + } + if(x(\App::$data, 'db_failed')) { + $txt = t('You may need to import the file "install/schema_xxx.sql" manually using a database client.') . EOL; + $txt .= t('Please see the file "install/INSTALL.txt".') . EOL ."
" ; + $txt .= "
".\App::$data['db_failed'] . "". EOL ; + $db_return_text .= $txt; + } + if(\DBA::$dba && \DBA::$dba->connected) { + $r = q("SELECT COUNT(*) as `total` FROM `account`"); + if($r && count($r) && $r[0]['total']) { + $tpl = get_markup_template('install.tpl'); + return replace_macros($tpl, array( + '$title' => $install_title, + '$pass' => '', + '$status' => t('Permission denied.'), + '$text' => '', + )); + } + } + + if(x(\App::$data, 'txt') && strlen(\App::$data['txt'])) { + $db_return_text .= $this->manual_config($a); + } + + if ($db_return_text != "") { + $tpl = get_markup_template('install.tpl'); + return replace_macros($tpl, array( + '$title' => $install_title, + '$pass' => '', + '$text' => $db_return_text . $this->what_next(), + )); + } + + switch ($this->install_wizard_pass){ + case 1: { // System check + + $checks = array(); + + $this->check_funcs($checks); + + $this->check_htconfig($checks); + + $this->check_store($checks); + + $this->check_smarty3($checks); + + $this->check_keys($checks); + + if (x($_POST, 'phpath')) + $phpath = notags(trim($_POST['phpath'])); + + $this->check_php($phpath, $checks); + + $this->check_phpconfig($checks); + + $this->check_htaccess($checks); + + $checkspassed = array_reduce($checks, "self::check_passed", true); + + $tpl = get_markup_template('install_checks.tpl'); + $o .= replace_macros($tpl, array( + '$title' => $install_title, + '$pass' => t('System check'), + '$checks' => $checks, + '$passed' => $checkspassed, + '$see_install' => t('Please see the file "install/INSTALL.txt".'), + '$next' => t('Next'), + '$reload' => t('Check again'), + '$phpath' => $phpath, + '$baseurl' => z_root(), + )); + return $o; + }; break; + + case 2: { // Database config + + $dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : '127.0.0.1'); + $dbuser = notags(trim($_POST['dbuser'])); + $dbport = intval(notags(trim($_POST['dbport']))); + $dbpass = notags(trim($_POST['dbpass'])); + $dbdata = notags(trim($_POST['dbdata'])); + $dbtype = intval(notags(trim($_POST['dbtype']))); + $phpath = notags(trim($_POST['phpath'])); + $adminmail = notags(trim($_POST['adminmail'])); + $siteurl = notags(trim($_POST['siteurl'])); + + $tpl = get_markup_template('install_db.tpl'); + $o .= replace_macros($tpl, array( + '$title' => $install_title, + '$pass' => t('Database connection'), + '$info_01' => t('In order to install $Projectname we need to know how to connect to your database.'), + '$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'), + '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'), + + '$status' => $wizard_status, + + '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, t('Default is 127.0.0.1')), + '$dbport' => array('dbport', t('Database Port'), $dbport, t('Communication port number - use 0 for default')), + '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''), + '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''), + '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''), + '$dbtype' => array('dbtype', t('Database Type'), $dbtype, '', array( 0=>'MySQL', 1=>'PostgreSQL' )), + + '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')), + '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), + '$lbl_10' => t('Please select a default timezone for your website'), + + '$baseurl' => z_root(), + + '$phpath' => $phpath, + + '$submit' => t('Submit'), + )); + return $o; + }; break; + case 3: { // Site settings + require_once('include/datetime.php'); + $dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : '127.0.0.1'); + $dbport = intval(notags(trim($_POST['dbuser']))); + $dbuser = notags(trim($_POST['dbuser'])); + $dbpass = notags(trim($_POST['dbpass'])); + $dbdata = notags(trim($_POST['dbdata'])); + $dbtype = intval(notags(trim($_POST['dbtype']))); + $phpath = notags(trim($_POST['phpath'])); + + $adminmail = notags(trim($_POST['adminmail'])); + $siteurl = notags(trim($_POST['siteurl'])); + $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); + + $tpl = get_markup_template('install_settings.tpl'); + $o .= replace_macros($tpl, array( + '$title' => $install_title, + '$pass' => t('Site settings'), + '$status' => $wizard_status, + + '$dbhost' => $dbhost, + '$dbport' => $dbport, + '$dbuser' => $dbuser, + '$dbpass' => $dbpass, + '$dbdata' => $dbdata, + '$phpath' => $phpath, + '$dbtype' => $dbtype, + + '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')), + + '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), + '$advanced' => array('advanced', t('Enable $Projectname advanced features?'), 1, t('Some advanced features, while useful - may be best suited for technically proficient audiences')), + + '$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()), + + '$baseurl' => z_root(), + + '$submit' => t('Submit'), + )); + return $o; + }; break; + } + } + + /** + * @brief Add a check result to the array for output. + * + * @param[in,out] array &$checks array passed to template + * @param string $title a title for the check + * @param boolean $status + * @param boolean $required + * @param[optional] string $help optional help string + */ + function check_add(&$checks, $title, $status, $required, $help = '') { + $checks[] = array( + 'title' => $title, + 'status' => $status, + 'required' => $required, + 'help' => $help + ); + } + + /** + * @brief Checks the PHP environment. + * + * @param[in,out] string &$phpath + * @param[out] array &$checks + */ + function check_php(&$phpath, &$checks) { + $help = ''; + + if(version_compare(PHP_VERSION, '5.5') < 0) { + $help .= t('PHP version 5.5 or greater is required.'); + $this->check_add($checks, t('PHP version'), false, false, $help); + } + + if (strlen($phpath)) { + $passed = file_exists($phpath); + } else { + if(is_windows()) + $phpath = trim(shell_exec('where php')); + else + $phpath = trim(shell_exec('which php')); + + $passed = strlen($phpath); + } + + if(!$passed) { + $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL; + $help .= t('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.') . EOL; + $help .= EOL . EOL ; + $tpl = get_markup_template('field_input.tpl'); + $help .= replace_macros($tpl, array( + '$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')), + )); + $phpath = ''; + } + + $this->check_add($checks, t('Command line PHP').($passed?" ($phpath)":""), $passed, false, $help); + + if($passed) { + $str = autoname(8); + $cmd = "$phpath install/testargs.php $str"; + $result = trim(shell_exec($cmd)); + $passed2 = $result == $str; + $help = ''; + if(!$passed2) { + $help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL; + $help .= t('This is required for message delivery to work.'); + } + + $this->check_add($checks, t('PHP register_argc_argv'), $passed, true, $help); + } + } + + /** + * @brief Some PHP configuration checks. + * + * @todo Change how we display such informational text. Add more description + * how to change them. + * + * @param[out] array &$checks + */ + function check_phpconfig(&$checks) { + require_once 'include/environment.php'; + + $help = ''; + + $result = getPhpiniUploadLimits(); + $help = sprintf(t('Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once.'), + userReadableSize($result['post_max_size']), + userReadableSize($result['max_upload_filesize']), + $result['max_file_uploads'] + ); + $help .= '
' . t('You can adjust these settings in the servers php.ini.'); + + $this->check_add($checks, t('PHP upload limits'), true, false, $help); + } + + /** + * @brief Check if the openssl implementation can generate keys. + * + * @param[out] array $checks + */ + function check_keys(&$checks) { + $help = ''; + $res = false; + + if (function_exists('openssl_pkey_new')) { + $res = openssl_pkey_new(array( + 'digest_alg' => 'sha1', + 'private_key_bits' => 4096, + 'encrypt_key' => false) + ); + } + + // Get private key + + if (! $res) { + $help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'). EOL; + $help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'); + } + + $this->check_add($checks, t('Generate encryption keys'), $res, true, $help); + } + + /** + * @brief Check for some PHP functions and modules. + * + * @param[in,out] array &$checks + */ + function check_funcs(&$checks) { + $ck_funcs = array(); + + // add check metadata, the real check is done bit later and return values set + $this->check_add($ck_funcs, t('libCurl PHP module'), true, true); + $this->check_add($ck_funcs, t('GD graphics PHP module'), true, true); + $this->check_add($ck_funcs, t('OpenSSL PHP module'), true, true); + $this->check_add($ck_funcs, t('mysqli or postgres PHP module'), true, true); + $this->check_add($ck_funcs, t('mb_string PHP module'), true, true); + $this->check_add($ck_funcs, t('xml PHP module'), true, true); + + if(function_exists('apache_get_modules')){ + if (! in_array('mod_rewrite', apache_get_modules())) { + $this->check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.')); + } else { + $this->check_add($ck_funcs, t('Apache mod_rewrite module'), true, true); + } + } + if((! function_exists('proc_open')) || strstr(ini_get('disable_functions'),'proc_open')) { + $this->check_add($ck_funcs, t('proc_open'), false, true, t('Error: proc_open is required but is either not installed or has been disabled in php.ini')); + } + else { + $this->check_add($ck_funcs, t('proc_open'), true, true); + } + + if(! function_exists('curl_init')) { + $ck_funcs[0]['status'] = false; + $ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.'); + } + if(! function_exists('imagecreatefromjpeg')) { + $ck_funcs[1]['status'] = false; + $ck_funcs[1]['help'] = t('Error: GD graphics PHP module with JPEG support required but not installed.'); + } + if(! function_exists('openssl_public_encrypt')) { + $ck_funcs[2]['status'] = false; + $ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.'); + } + if(! function_exists('mysqli_connect') && !function_exists('pg_connect')) { + $ck_funcs[3]['status'] = false; + $ck_funcs[3]['help'] = t('Error: mysqli or postgres PHP module required but neither are installed.'); + } + if(! function_exists('mb_strlen')) { + $ck_funcs[4]['status'] = false; + $ck_funcs[4]['help'] = t('Error: mb_string PHP module required but not installed.'); + } + if(! extension_loaded('xml')) { + $ck_funcs[6]['status'] = false; + $ck_funcs[6]['help'] = t('Error: xml PHP module required for DAV but not installed.'); + } + + $checks = array_merge($checks, $ck_funcs); + } + + /** + * @brief Check for .htconfig requirements. + * + * @param[out] array &$checks + */ + function check_htconfig(&$checks) { + $status = true; + $help = ''; + + if( (file_exists('.htconfig.php') && !is_writable('.htconfig.php')) || + (!file_exists('.htconfig.php') && !is_writable('.')) ) { + $status = false; + $help = t('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.') .EOL; + $help .= t('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.').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 Red top folder.').EOL; + $help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "install/INSTALL.txt" for instructions.').EOL; + } + + $this->check_add($checks, t('.htconfig.php is writable'), $status, false, $help); + } + + /** + * @brief Checks for our templating engine Smarty3 requirements. + * + * @param[out] array &$checks + */ + function check_smarty3(&$checks) { + $status = true; + $help = ''; + + if(! is_writable(TEMPLATE_BUILD_PATH) ) { + $status = false; + $help = t('Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL; + $help .= sprintf( t('In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder.'), TEMPLATE_BUILD_PATH) . EOL; + $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL; + $help .= sprintf( t('Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains.'), TEMPLATE_BUILD_PATH) . EOL; + } + + $this->check_add($checks, sprintf( t('%s is writable'), TEMPLATE_BUILD_PATH), $status, true, $help); + } + + /** + * @brief Check for store directory. + * + * @param[out] array &$checks + */ + function check_store(&$checks) { + $status = true; + $help = ''; + + @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); + + if(! is_writable('store')) { + $status = false; + $help = t('This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder') . EOL; + $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL; + } + + $this->check_add($checks, t('store is writable'), $status, true, $help); + } + + /** + * @brief Check URL rewrite und SSL certificate. + * + * @param[out] array &$checks + */ + function check_htaccess(&$checks) { + $a = get_app(); + $status = true; + $help = ''; + $ssl_error = false; + + $url = z_root() . '/setup/testrewrite'; + + if (function_exists('curl_init')){ + $test = z_fetch_url($url); + if(! $test['success']) { + if(strstr($url,'https://')) { + $test = z_fetch_url($url,false,0,array('novalidate' => true)); + if($test['success']) { + $ssl_error = true; + } + } + else { + $test = z_fetch_url(str_replace('http://','https://',$url),false,0,array('novalidate' => true)); + if($test['success']) { + $ssl_error = true; + } + } + + if($ssl_error) { + $help = t('SSL certificate cannot be validated. Fix certificate or disable https access to this site.') . EOL; + $help .= t('If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!') . EOL; + $help .= t('This restriction is incorporated because public posts from you may for example contain references to images on your own hub.') . EOL; + $help .= t('If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.') . EOL; + $help .= t('This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement.') .EOL; + $help .= t('Providers are available that issue free certificates which are browser-valid.'). EOL; + + $help .= t('If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications.') . EOL; + + + $this->check_add($checks, t('SSL certificate validation'), false, true, $help); + } + } + + if ((! $test['success']) || ($test['body'] != "ok")) { + $status = false; + $help = t('Url rewrite in .htaccess is not working. Check your server configuration.'.'Test: '.var_export($test,true)); + } + + $this->check_add($checks, t('Url rewrite is working'), $status, true, $help); + } else { + // cannot check modrewrite if libcurl is not installed + } + } + + + function manual_config(&$a) { + $data = htmlspecialchars(\App::$data['txt'], ENT_COMPAT, 'UTF-8'); + $o = t('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.'); + $o .= ""; + + return $o; + } + + function load_database_rem($v, $i){ + $l = trim($i); + if (strlen($l)>1 && ($l[0]=="-" || ($l[0]=="/" && $l[1]=="*"))){ + return $v; + } else { + return $v."\n".$i; + } + } + + + function load_database($db) { + $str = file_get_contents(\DBA::$dba->get_install_script()); + $arr = explode(';',$str); + $errors = false; + foreach($arr as $a) { + if(strlen(trim($a))) { + $r = dbq(trim($a)); + if(! $r) { + $errors .= t('Errors encountered creating database tables.') . $a . EOL; + } + } + } + + return $errors; + } + + function what_next() { + $a = get_app(); + // install the standard theme + set_config('system', 'allowed_themes', 'redbasic'); + + + // Set a lenient list of ciphers if using openssl. Other ssl engines + // (e.g. NSS used in RedHat) require different syntax, so hopefully + // the default curl cipher list will work for most sites. If not, + // this can set via config. Many distros are now disabling RC4, + // but many Red sites still use it and are unable to change it. + // We do not use SSL for encryption, only to protect session cookies. + // z_fetch_url() is also used to import shared links and other content + // so in theory most any cipher could show up and we should do our best + // to make the content available rather than tell folks that there's a + // weird SSL error which they can't do anything about. This does not affect + // the SSL server, but is only a client negotiation to find something workable. + // Hence it will not make your system susceptible to POODL or other nasties. + + $x = curl_version(); + if(stristr($x['ssl_version'],'openssl')) + set_config('system','curl_ssl_ciphers','ALL:!eNULL'); + + // Create a system channel + require_once ('include/channel.php'); + create_sys_channel(); + + $baseurl = z_root(); + return + t('
What next
') + ."".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') + .t('Please see the file "install/INSTALL.txt".') + ."
" + .t("Go to your new hub registration page and register as new member. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") + ."
"; + } + + + static private function check_passed($v, $c) { + if ($c['required']) + $v = $v && $c['status']; + + return $v; + } + + +} diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php new file mode 100644 index 000000000..fcc2486ba --- /dev/null +++ b/Zotlabs/Module/Share.php @@ -0,0 +1,93 @@ + 1) ? intval(argv(1)) : 0); + + if(! $post_id) + killme(); + + if(! (local_channel() || remote_channel())) + killme(); + + $r = q("SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1", + intval($post_id) + ); + if(! $r) + killme(); + if(($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) + killme(); + + $sql_extra = item_permissions_sql($r[0]['uid']); + + $r = q("select * from item where id = %d $sql_extra", + intval($post_id) + ); + if(! $r) + killme(); + + /** @FIXME we only share bbcode */ + + if($r[0]['mimetype'] !== 'text/bbcode') + killme(); + + /** @FIXME eventually we want to post remotely via rpost on your home site */ + // When that works remove this next bit: + + if(! local_channel()) + killme(); + + xchan_query($r); + + $is_photo = (($r[0]['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false); + if($is_photo) { + $object = json_decode($r[0]['obj'],true); + $photo_bb = $object['body']; + } + + if (strpos($r[0]['body'], "[/share]") !== false) { + $pos = strpos($r[0]['body'], "[share"); + $o = substr($r[0]['body'], $pos); + } else { + $o = "[share author='".urlencode($r[0]['author']['xchan_name']). + "' profile='".$r[0]['author']['xchan_url'] . + "' avatar='".$r[0]['author']['xchan_photo_s']. + "' link='".$r[0]['plink']. + "' posted='".$r[0]['created']. + "' message_id='".$r[0]['mid']."']"; + if($r[0]['title']) + $o .= '[b]'.$r[0]['title'].'[/b]'."\r\n"; + $o .= (($is_photo) ? $photo_bb . "\r\n" . $r[0]['body'] : $r[0]['body']); + $o .= "[/share]"; + } + + if(local_channel()) { + echo $o; + killme(); + } + + $observer = \App::get_observer(); + $parsed = $observer['xchan_url']; + if($parsed) { + $post_url = $parsed['scheme'] . ':' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '') + . '/rpost'; + + /** + * @FIXME we were probably called from JS so we don't know the return page. + * In fact we won't be able to load the remote page. + * we might need an iframe + */ + + $x = z_post_url($post_url, array('f' => '', 'body' => $o )); + killme(); + } + } + +} diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php new file mode 100644 index 000000000..25bc7dba3 --- /dev/null +++ b/Zotlabs/Module/Sharedwithme.php @@ -0,0 +1,113 @@ + 2) && (argv(2) === 'drop')) { + + $id = intval(argv(1)); + + q("DELETE FROM item WHERE id = %d AND uid = %d", + intval($id), + intval(local_channel()) + ); + + goaway(z_root() . '/sharedwithme'); + } + + //drop all files - localuser + if((argc() > 1) && (argv(1) === 'dropall')) { + + q("DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + intval(local_channel()) + ); + + goaway(z_root() . '/sharedwithme'); + } + + //list files + $r = q("SELECT id, uid, obj, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'", + dbesc(ACTIVITY_POST), + dbesc(ACTIVITY_OBJ_FILE), + intval(local_channel()), + dbesc($channel['channel_hash']) + ); + + $items =array(); + $ids = ''; + + if($r) { + + foreach($r as $rr) { + $object = json_decode($rr['obj'],true); + + $item = array(); + $item['id'] = $rr['id']; + $item['objfiletype'] = $object['filetype']; + $item['objfiletypeclass'] = getIconFromType($object['filetype']); + $item['objurl'] = rawurldecode(get_rel_link($object['link'],'alternate')) . '?f=&zid=' . $channel['xchan_addr']; + $item['objfilename'] = $object['filename']; + $item['objfilesize'] = userReadableSize($object['filesize']); + $item['objedited'] = $object['edited']; + $item['unseen'] = $rr['item_unseen']; + + $items[] = $item; + + if($item['unseen'] > 0) { + $ids .= " '" . $rr['id'] . "',"; + } + + } + + } + + if($ids) { + + //remove trailing , + $ids = rtrim($ids, ","); + + q("UPDATE item SET item_unseen = 0 WHERE id IN ( $ids ) AND uid = %d", + intval(local_channel()) + ); + + } + + $o = profile_tabs($a, $is_owner, $channel['channel_address']); + + $o .= replace_macros(get_markup_template('sharedwithme.tpl'), array( + '$header' => t('Files: shared with me'), + '$name' => t('Name'), + '$label_new' => t('NEW'), + '$size' => t('Size'), + '$lastmod' => t('Last Modified'), + '$dropall' => t('Remove all files'), + '$drop' => t('Remove this file'), + '$items' => $items + )); + + return $o; + + } + + +} diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php new file mode 100644 index 000000000..a15e2896d --- /dev/null +++ b/Zotlabs/Module/Siteinfo.php @@ -0,0 +1,77 @@ + 16) + $commit = ''; + } + else { + $version = $commit = ''; + } + + $plugins_list = implode(', ',visible_plugin_list()); + + if($plugins_list) + $plugins_text = t('Installed plugins/addons/apps:'); + else + $plugins_text = t('No installed plugins/addons/apps'); + + $txt = get_config('system','admininfo'); + $admininfo = bbcode($txt); + + if(file_exists('doc/site_donate.html')) + $donate .= file_get_contents('doc/site_donate.html'); + + if(function_exists('sys_getloadavg')) + $loadavg = sys_getloadavg(); + + $o = replace_macros(get_markup_template('siteinfo.tpl'), array( + '$title' => t('$Projectname'), + '$description' => t('This is a hub of $Projectname - a global cooperative network of decentralized privacy enhanced websites.'), + '$version' => $version, + '$tag_txt' => t('Tag: '), + '$tag' => $tag, + '$polled' => t('Last background fetch: '), + '$lastpoll' => get_poller_runtime(), + '$load_average' => t('Current load average: '), + '$loadavg_all' => $loadavg[0] . ', ' . $loadavg[1] . ', ' . $loadavg[2], + '$commit' => $commit, + '$web_location' => t('Running at web location') . ' ' . z_root(), + '$visit' => t('Please visit hubzilla.org to learn more about $Projectname.'), + '$bug_text' => t('Bug reports and issues: please visit'), + '$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues', + '$bug_link_text' => t('$projectname issues'), + '$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'), + '$donate' => $donate, + '$adminlabel' => t('Site Administrators'), + '$admininfo' => $admininfo, + '$plugins_text' => $plugins_text, + '$plugins_list' => $plugins_list + )); + + call_hooks('about_hook', $o); + + return $o; + + } + +} diff --git a/Zotlabs/Module/Siteinfo_json.php b/Zotlabs/Module/Siteinfo_json.php new file mode 100644 index 000000000..99c22610f --- /dev/null +++ b/Zotlabs/Module/Siteinfo_json.php @@ -0,0 +1,14 @@ + false); + + $r = q("select count(site_url) as total from site where site_type = %d $sql_extra ", + intval(SITE_TYPE_ZOT) + ); + + if($r) + $result['total'] = intval($r[0]['total']); + + $result['start'] = $start; + $result['limit'] = $limit; + + $r = q("select * from site where site_type = %d $sql_extra $sql_order $sql_limit", + intval(SITE_TYPE_ZOT) + ); + + $result['results'] = 0; + $result['entries'] = array(); + + if($r) { + $result['success'] = true; + $result['results'] = count($r); + + foreach($r as $rr) { + $result['entries'][] = array('url' => $rr['site_url']); + } + + } + + echo json_encode($result); + killme(); + + + } +} diff --git a/Zotlabs/Module/Smilies.php b/Zotlabs/Module/Smilies.php new file mode 100644 index 000000000..efac07f84 --- /dev/null +++ b/Zotlabs/Module/Smilies.php @@ -0,0 +1,21 @@ + $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]); + } + json_return_and_die($results); + } + else { + return smilies('',true); + } + } + +} diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php new file mode 100644 index 000000000..a180d9b6e --- /dev/null +++ b/Zotlabs/Module/Sources.php @@ -0,0 +1,180 @@ + t('Channel Sources'), + '$desc' => t('Manage remote sources of content for your channel.'), + '$new' => t('New Source'), + '$sources' => $r + )); + return $o; + } + + if(argc() == 2 && argv(1) === 'new') { + // TODO add the words 'or RSS feed' and corresponding code to manage feeds and frequency + + $o = replace_macros(get_markup_template('sources_new.tpl'), array( + '$title' => t('New Source'), + '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'), + '$words' => array( 'words', t('Only import content with these words (one per line)'),'',t('Leave blank to import all public content')), + '$name' => array( 'name', t('Channel Name'), '', ''), + '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),'',t('Optional')), + + '$submit' => t('Submit') + )); + return $o; + + } + + if(argc() == 2 && intval(argv(1))) { + // edit source + $r = q("select source.*, xchan.* from source left join xchan on src_xchan = xchan_hash where src_id = %d and src_channel_id = %d limit 1", + intval(argv(1)), + intval(local_channel()) + ); + if($r) { + $x = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($r[0]['src_xchan']), + intval(local_channel()) + ); + } + if(! $r) { + notice( t('Source not found.') . EOL); + return ''; + } + + $r[0]['src_patt'] = htmlspecialchars($r[0]['src_patt'], ENT_QUOTES,'UTF-8'); + + $o = replace_macros(get_markup_template('sources_edit.tpl'), array( + '$title' => t('Edit Source'), + '$drop' => t('Delete Source'), + '$id' => $r[0]['src_id'], + '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'), + '$words' => array( 'words', t('Only import content with these words (one per line)'),$r[0]['src_patt'],t('Leave blank to import all public content')), + '$xchan' => $r[0]['src_xchan'], + '$abook' => $x[0]['abook_id'], + '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),$r[0]['src_tag'],t('Optional')), + '$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''), + '$submit' => t('Submit') + )); + return $o; + + } + + if(argc() == 3 && intval(argv(1)) && argv(2) === 'drop') { + $r = q("select * from source where src_id = %d and src_channel_id = %d limit 1", + intval(argv(1)), + intval(local_channel()) + ); + if(! $r) { + notice( t('Source not found.') . EOL); + return ''; + } + $r = q("delete from source where src_id = %d and src_channel_id = %d", + intval(argv(1)), + intval(local_channel()) + ); + if($r) + info( t('Source removed') . EOL); + else + notice( t('Unable to remove source.') . EOL); + + goaway(z_root() . '/sources'); + + } + + // shouldn't get here. + + } +} diff --git a/Zotlabs/Module/Sslify.php b/Zotlabs/Module/Sslify.php new file mode 100644 index 000000000..db73f85e0 --- /dev/null +++ b/Zotlabs/Module/Sslify.php @@ -0,0 +1,30 @@ + 1) + $message_id = intval(argv(1)); + if(! $message_id) + killme(); + + $r = q("SELECT item_flags FROM item WHERE uid = %d AND id = %d LIMIT 1", + intval(local_channel()), + intval($message_id) + ); + if(! count($r)) + killme(); + + $item_starred = (intval($r[0]['item_starred']) ? 0 : 1); + + $r = q("UPDATE item SET item_starred = %d WHERE uid = %d and id = %d", + intval($item_starred), + intval(local_channel()), + intval($message_id) + ); + + $r = q("select * from item where id = %d", + intval($message_id) + ); + if($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + build_sync_packet(local_channel(),[ + 'item' => [ + encode_item($sync_item[0],true) + ] + ]); + } + + header('Content-type: application/json'); + echo json_encode(array('result' => $item_starred)); + killme(); + } + +} diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php new file mode 100644 index 000000000..0226664d7 --- /dev/null +++ b/Zotlabs/Module/Subthread.php @@ -0,0 +1,169 @@ + 2) ? notags(trim(argv(2))) : 0); + + if(argv(1) === 'sub') + $activity = ACTIVITY_FOLLOW; + elseif(argv(1) === 'unsub') + $activity = ACTIVITY_UNFOLLOW; + + + $r = q("SELECT parent FROM item WHERE id = '%s'", + dbesc($item_id) + ); + + if($r) { + $r = q("select * from item where id = parent and id = %d limit 1", + dbesc($r[0]['parent']) + ); + } + + if((! $item_id) || (! $r)) { + logger('subthread: no item ' . $item_id); + return; + } + + $item = $r[0]; + + $owner_uid = $item['uid']; + $observer = \App::get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + if(! perm_is_allowed($owner_uid,$ob_hash,'post_comments')) + return; + + $sys = get_sys_channel(); + + $owner_uid = $item['uid']; + $owner_aid = $item['aid']; + + // if this is a "discover" item, (item['uid'] is the sys channel), + // fallback to the item comment policy, which should've been + // respected when generating the conversation thread. + // Even if the activity is rejected by the item owner, it should still get attached + // to the local discover conversation on this site. + + if(($owner_uid != $sys['channel_id']) && (! perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_comments'))) { + notice( t('Permission denied') . EOL); + killme(); + } + + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['owner_xchan']) + ); + if($r) + $thread_owner = $r[0]; + else + killme(); + + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) + ); + if($r) + $item_author = $r[0]; + else + killme(); + + + + + $mid = item_message_id(); + + $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); + + $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink'])); + $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); + + $body = $item['body']; + + $obj = json_encode(array( + 'type' => $objtype, + 'id' => $item['mid'], + 'parent' => (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']), + 'link' => $links, + 'title' => $item['title'], + 'content' => $item['body'], + 'created' => $item['created'], + 'edited' => $item['edited'], + 'author' => array( + 'name' => $item_author['xchan_name'], + 'address' => $item_author['xchan_addr'], + 'guid' => $item_author['xchan_guid'], + 'guid_sig' => $item_author['xchan_guid_sig'], + 'link' => array( + array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']), + array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])), + ), + )); + + if(! intval($item['item_thread_top'])) + $post_type = 'comment'; + + if($activity === ACTIVITY_FOLLOW) + $bodyverb = t('%1$s is following %2$s\'s %3$s'); + if($activity === ACTIVITY_UNFOLLOW) + $bodyverb = t('%1$s stopped following %2$s\'s %3$s'); + + $arr = array(); + + $arr['mid'] = $mid; + $arr['aid'] = $owner_aid; + $arr['uid'] = $owner_uid; + $arr['parent'] = $item['id']; + $arr['parent_mid'] = $item['mid']; + $arr['thr_parent'] = $item['mid']; + $arr['owner_xchan'] = $thread_owner['xchan_hash']; + $arr['author_xchan'] = $observer['xchan_hash']; + $arr['item_origin'] = 1; + $arr['item_notshown'] = 1; + if(intval($item['item_wall'])) + $arr['item_wall'] = 1; + else + $arr['item_wall'] = 0; + + $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $plink = '[zrl=' . z_root() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]'; + + $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); + + $arr['verb'] = $activity; + $arr['obj_type'] = $objtype; + $arr['obj'] = $obj; + + $arr['allow_cid'] = $item['allow_cid']; + $arr['allow_gid'] = $item['allow_gid']; + $arr['deny_cid'] = $item['deny_cid']; + $arr['deny_gid'] = $item['deny_gid']; + + $post = item_store($arr); + $post_id = $post['item_id']; + + $arr['id'] = $post_id; + + call_hooks('post_local_end', $arr); + + killme(); + + + } + + + + +} diff --git a/Zotlabs/Module/Suggest.php b/Zotlabs/Module/Suggest.php new file mode 100644 index 000000000..367308d90 --- /dev/null +++ b/Zotlabs/Module/Suggest.php @@ -0,0 +1,72 @@ + chanlink_url($rr['xchan_url']), + 'common' => $rr['total'], + 'profile' => $rr['xchan_url'], + 'name' => $rr['xchan_name'], + 'photo' => $rr['xchan_photo_m'], + 'ignlnk' => z_root() . '/suggest?ignore=' . $rr['xchan_hash'], + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'ignore' => t('Ignore/Hide') + ); + } + + + $o = replace_macros(get_markup_template('suggest_page.tpl'),array( + '$title' => t('Channel Suggestions'), + '$entries' => $arr + )); + + return $o; + + } + +} diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php new file mode 100644 index 000000000..25f518d53 --- /dev/null +++ b/Zotlabs/Module/Tagger.php @@ -0,0 +1,145 @@ + 1) ? notags(trim(argv(1))) : 0); + + logger('tagger: tag ' . $term . ' item ' . $item_id); + + + $r = q("SELECT * FROM item left join xchan on xchan_hash = author_xchan WHERE id = '%s' and uid = %d LIMIT 1", + dbesc($item_id), + intval(local_channel()) + ); + + if((! $item_id) || (! $r)) { + logger('tagger: no item ' . $item_id); + return; + } + + $item = $r[0]; + + $owner_uid = $item['uid']; + + switch($item['resource_type']) { + case 'photo': + $targettype = ACTIVITY_OBJ_PHOTO; + $post_type = t('photo'); + break; + case 'event': + $targgettype = ACTIVITY_OBJ_EVENT; + $post_type = t('event'); + break; + default: + $targettype = ACTIVITY_OBJ_NOTE; + $post_type = t('post'); + if($item['mid'] != $item['parent_mid']) + $post_type = t('comment'); + break; + } + + + $links = array(array('rel' => 'alternate','type' => 'text/html', + 'href' => z_root() . '/display/' . $item['mid'])); + + $target = json_encode(array( + 'type' => $targettype, + 'id' => $item['mid'], + 'link' => $links, + 'title' => $item['title'], + 'content' => $item['body'], + 'created' => $item['created'], + 'edited' => $item['edited'], + 'author' => array( + 'name' => $item['xchan_name'], + 'address' => $item['xchan_addr'], + 'guid' => $item['xchan_guid'], + 'guid_sig' => $item['xchan_guid_sig'], + 'link' => array( + array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item['xchan_url']), + array('rel' => 'photo', 'type' => $item['xchan_photo_mimetype'], 'href' => $item['xchan_photo_m'])), + ), + )); + + + + $link = xmlify('' . "\n") ; + + $tagid = z_root() . '/search?tag=' . $term; + $objtype = ACTIVITY_OBJ_TAGTERM; + + $obj = json_encode(array( + 'type' => $objtype, + 'id' => $tagid, + 'link' => array(array('rel' => 'alternate','type' => 'text/html', 'href' => $tagid)), + 'title' => $term, + 'content' => $term + )); + + $bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s'); + + // saving here for reference + // also check out x22d5 and x2317 and x0d6b and x0db8 and x24d0 and xff20 !!! + + $termlink = html_entity_decode('⋕') . '[zrl=' . z_root() . '/search?tag=' . urlencode($term) . ']'. $term . '[/zrl]'; + + $channel = \App::get_channel(); + + $arr = array(); + + $arr['owner_xchan'] = $item['owner_xchan']; + $arr['author_xchan'] = $channel['channel_hash']; + + $arr['item_origin'] = 1; + $arr['item_wall'] = ((intval($item['item_wall'])) ? 1 : 0); + + $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]'; + $alink = '[zrl=' . $item['xchan_url'] . ']' . $item['xchan_name'] . '[/zrl]'; + $plink = '[zrl=' . $item['plink'] . ']' . $post_type . '[/zrl]'; + + $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink, $termlink ); + + $arr['verb'] = ACTIVITY_TAG; + $arr['tgt_type'] = $targettype; + $arr['target'] = $target; + $arr['obj_type'] = $objtype; + $arr['obj'] = $obj; + $arr['parent_mid'] = $item['mid']; + + store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$term,$tagid); + $ret = post_activity_item($arr); + + if($ret['success']) { + build_sync_packet(local_channel(), + [ + 'item' => [ encode_item($ret['activity'],true) ] + ] + ); + } + + killme(); + + } + +} diff --git a/Zotlabs/Module/Tagrm.php b/Zotlabs/Module/Tagrm.php new file mode 100644 index 000000000..42aa6e90f --- /dev/null +++ b/Zotlabs/Module/Tagrm.php @@ -0,0 +1,147 @@ +' . t('Remove Item Tag') . ''; + + $o .= '' . t('Select a tag to remove: ') . '
'; + + $o .= ''; + + return $o; + + } + + } + +} diff --git a/Zotlabs/Module/Tasks.php b/Zotlabs/Module/Tasks.php new file mode 100644 index 000000000..6d0a92d91 --- /dev/null +++ b/Zotlabs/Module/Tasks.php @@ -0,0 +1,104 @@ + 1 && argv(1) === 'fetch') { + if(argc() > 2 && argv(2) === 'all') + $arr['all'] = 1; + + $x = tasks_fetch($arr); + if($x['tasks']) { + $x['html'] = ''; + foreach($x['tasks'] as $y) { + $x['html'] .= ' ' . $y['summary'] . '
';
+ }
+ }
+ json_return_and_die($x);
+ }
+
+ }
+
+
+
+ function post() {
+
+
+ // logger('post: ' . print_r($_POST,true));
+
+
+ if(! local_channel())
+ return;
+
+ $channel = \App::get_channel();
+
+ if((argc() > 2) && (argv(1) === 'complete') && intval(argv(2))) {
+ $ret = array('success' => false);
+ $r = q("select * from event where `etype` = 'task' and uid = %d and id = %d limit 1",
+ intval(local_channel()),
+ intval(argv(2))
+ );
+ if($r) {
+ $event = $r[0];
+ if($event['event_status'] === 'COMPLETED') {
+ $event['event_status'] = 'IN-PROCESS';
+ $event['event_status_date'] = NULL_DATE;
+ $event['event_percent'] = 0;
+ $event['event_sequence'] = $event['event_sequence'] + 1;
+ $event['edited'] = datetime_convert();
+ }
+ else {
+ $event['event_status'] = 'COMPLETED';
+ $event['event_status_date'] = datetime_convert();
+ $event['event_percent'] = 100;
+ $event['event_sequence'] = $event['event_sequence'] + 1;
+ $event['edited'] = datetime_convert();
+ }
+ $x = event_store_event($event);
+ if($x)
+ $ret['success'] = true;
+ }
+ json_return_and_die($ret);
+ }
+
+ if(argc() == 2 && argv(1) === 'new') {
+ $text = escape_tags(trim($_REQUEST['summary']));
+ if(! $text)
+ return array('success' => false);
+ $event = array();
+ $event['account'] = $channel['channel_account_id'];
+ $event['uid'] = $channel['channel_id'];
+ $event['event_xchan'] = $channel['channel_hash'];
+ $event['etype'] = 'task';
+ $event['nofinish'] = true;
+ $event['created'] = $event['edited'] = $event['dtstart'] = datetime_convert();
+ $event['adjust'] = 1;
+ $event['allow_cid'] = '<' . $channel['channel_hash'] . '>';
+ $event['summary'] = escape_tags($_REQUEST['summary']);
+ $x = event_store_event($event);
+ if($x)
+ $x['success'] = true;
+ else
+ $x = array('success' => false);
+ json_return_and_die($x);
+ }
+ }
+
+ function get() {
+ if(! local_channel())
+ return;
+
+ return '';
+ }
+}
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
new file mode 100644
index 000000000..65fc0588e
--- /dev/null
+++ b/Zotlabs/Module/Thing.php
@@ -0,0 +1,368 @@
+set_from_array($_REQUEST);
+ }
+
+ $x = $acl->get();
+
+ if($term_hash) {
+ $t = q("select * from obj where obj_obj = '%s' and obj_channel = %d limit 1",
+ dbesc($term_hash),
+ intval(local_channel())
+ );
+ if(! $t) {
+ notice( t('Item not found.') . EOL);
+ return;
+ }
+ $orig_record = $t[0];
+ if($photo != $orig_record['obj_imgurl']) {
+ $arr = import_xchan_photo($photo,get_observer_hash(),true);
+ $local_photo = $arr[0];
+ $local_photo_type = $arr[3];
+ }
+ else
+ $local_photo = $orig_record['obj_imgurl'];
+
+ $r = q("update obj set obj_term = '%s', obj_url = '%s', obj_imgurl = '%s', obj_edited = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where obj_obj = '%s' and obj_channel = %d ",
+ dbesc($name),
+ dbesc(($url) ? $url : z_root() . '/thing/' . $term_hash),
+ dbesc($local_photo),
+ dbesc(datetime_convert()),
+ dbesc($x['allow_cid']),
+ dbesc($x['allow_gid']),
+ dbesc($x['deny_cid']),
+ dbesc($x['deny_gid']),
+ dbesc($term_hash),
+ intval(local_channel())
+ );
+
+ info( t('Thing updated') . EOL);
+
+ $r = q("select * from obj where obj_channel = %d and obj_obj = '%s' limit 1",
+ intval(local_channel()),
+ dbesc($term_hash)
+ );
+ if($r) {
+ build_sync_packet(0, array('obj' => $r));
+ }
+
+ return;
+ }
+
+ $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 ");
+ $p = q("select profile_guid, is_default from profile where uid = %d $sql limit 1",
+ intval(local_channel())
+ );
+
+ if($p)
+ $profile = $p[0];
+ else
+ return;
+
+ $local_photo = null;
+
+ if($photo) {
+ $arr = import_xchan_photo($photo,get_observer_hash(),true);
+ $local_photo = $arr[0];
+ $local_photo_type = $arr[3];
+ }
+
+ $created = datetime_convert();
+ $url = (($url) ? $url : z_root() . '/thing/' . $hash);
+
+ $r = q("insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj, obj_term, obj_url, obj_imgurl, obj_created, obj_edited, allow_cid, allow_gid, deny_cid, deny_gid ) values ('%s','%s', %d, %d, '%s','%s','%s','%s','%s','%s','%s','%s','%s','%s') ",
+ dbesc($profile['profile_guid']),
+ dbesc($verb),
+ intval(TERM_OBJ_THING),
+ intval(local_channel()),
+ dbesc($hash),
+ dbesc($name),
+ dbesc($url),
+ dbesc(($photo) ? $local_photo : ''),
+ dbesc($created),
+ dbesc($created),
+ dbesc($x['allow_cid']),
+ dbesc($x['allow_gid']),
+ dbesc($x['deny_cid']),
+ dbesc($x['deny_gid'])
+ );
+
+ if(! $r) {
+ notice( t('Object store: failed'));
+ return;
+ }
+
+ info( t('Thing added'));
+
+ $r = q("select * from obj where obj_channel = %d and obj_obj = '%s' limit 1",
+ intval(local_channel()),
+ dbesc($hash)
+ );
+ if($r) {
+ build_sync_packet(0, array('obj' => $r));
+ }
+
+ if($activity) {
+ $arr = array();
+ $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $url));
+ if($local_photo)
+ $links[] = array('rel' => 'photo', 'type' => $local_photo_type, 'href' => $local_photo);
+
+ $objtype = ACTIVITY_OBJ_THING;
+
+ $obj = json_encode(array(
+ 'type' => $objtype,
+ 'id' => $url,
+ 'link' => $links,
+ 'title' => $name,
+ 'content' => $name
+ ));
+
+ $bodyverb = str_replace('OBJ: ', '',t('OBJ: %1$s %2$s %3$s'));
+
+ $arr['owner_xchan'] = $channel['channel_hash'];
+ $arr['author_xchan'] = $channel['channel_hash'];
+
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = 1;
+ $arr['item_thread_top'] = 1;
+
+ $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
+ $plink = '[zrl=' . $url . ']' . $name . '[/zrl]';
+
+ $arr['body'] = sprintf( $bodyverb, $ulink, $translated_verb, $plink );
+
+ if($local_photo)
+ $arr['body'] .= "\n\n[zmg]" . $local_photo . "[/zmg]";
+
+ $arr['verb'] = $verb;
+ $arr['obj_type'] = $objtype;
+ $arr['obj'] = $obj;
+
+ if(! $profile['is_default']) {
+ $arr['item_private'] = true;
+ $str = '';
+ $r = q("select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'",
+ intval(local_channel()),
+ dbesc($profile_guid)
+ );
+ if($r) {
+ $arr['allow_cid'] = '';
+ foreach($r as $rr)
+ $arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>';
+ }
+ else
+ $arr['allow_cid'] = '<' . get_observer_hash() . '>';
+ }
+
+ $ret = post_activity_item($arr);
+ }
+ }
+
+
+ function get() {
+
+ // @FIXME one problem with things is we can't share them unless we provide the channel in the url
+ // so we can definitively lookup the owner.
+
+ if(argc() == 2) {
+
+ $r = q("select obj_channel from obj where obj_type = %d and obj_obj = '%s' limit 1",
+ intval(TERM_OBJ_THING),
+ dbesc(argv(1))
+ );
+ if($r)
+ $sql_extra = permissions_sql($r[0]['obj_channel']);
+
+ $r = q("select * from obj where obj_type = %d and obj_obj = '%s' $sql_extra limit 1",
+ intval(TERM_OBJ_THING),
+ dbesc(argv(1))
+ );
+
+ if($r) {
+ return replace_macros(get_markup_template('show_thing.tpl'), array(
+ '$header' => t('Show Thing'),
+ '$edit' => t('Edit'),
+ '$delete' => t('Delete'),
+ '$canedit' => ((local_channel() && local_channel() == $r[0]['obj_channel']) ? true : false),
+ '$thing' => $r[0] ));
+ }
+ else {
+ notice( t('item not found.') . EOL);
+ return;
+ }
+ }
+
+ $channel = \App::get_channel();
+
+ if(! (local_channel() && $channel)) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $acl = new \Zotlabs\Access\AccessList($channel);
+ $channel_acl = $acl->get();
+
+ $lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+
+ $thing_hash = '';
+
+ if(argc() == 3 && argv(1) === 'edit') {
+ $thing_hash = argv(2);
+
+ $r = q("select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
+ intval(TERM_OBJ_THING),
+ dbesc($thing_hash)
+ );
+
+ if((! $r) || ($r[0]['obj_channel'] != local_channel())) {
+ notice( t('Permission denied.') . EOL);
+ return '';
+ }
+
+ $o .= replace_macros(get_markup_template('thing_edit.tpl'),array(
+ '$thing_hdr' => t('Edit Thing'),
+ '$multiprof' => feature_enabled(local_channel(),'multi_profiles'),
+ '$profile_lbl' => t('Select a profile'),
+ '$profile_select' => contact_profile_assign($r[0]['obj_page']),
+ '$verb_lbl' => $channel['channel_name'],
+ '$verb_select' => obj_verb_selector($r[0]['obj_verb']),
+ '$activity' => array('activity',t('Post an activity'),true,t('Only sends to viewers of the applicable profile')),
+ '$thing_hash' => $thing_hash,
+ '$thing_lbl' => t('Name of thing e.g. something'),
+ '$thething' => $r[0]['obj_term'],
+ '$url_lbl' => t('URL of thing (optional)'),
+ '$theurl' => $r[0]['obj_url'],
+ '$img_lbl' => t('URL for photo of thing (optional)'),
+ '$imgurl' => $r[0]['obj_imgurl'],
+ '$permissions' => t('Permissions'),
+ '$aclselect' => populate_acl($channel_acl,false),
+ '$lockstate' => $lockstate,
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+ }
+
+ if(argc() == 3 && argv(1) === 'drop') {
+ $thing_hash = argv(2);
+
+ $r = q("select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
+ intval(TERM_OBJ_THING),
+ dbesc($thing_hash)
+ );
+
+ if((! $r) || ($r[0]['obj_channel'] != local_channel())) {
+ notice( t('Permission denied.') . EOL);
+ return '';
+ }
+
+ $x = q("delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d",
+ dbesc($thing_hash),
+ intval(TERM_OBJ_THING),
+ intval(local_channel())
+ );
+
+ $r[0]['obj_deleted'] = 1;
+
+ build_sync_packet(0,array('obj' => $r));
+
+ return $o;
+ }
+
+ $o .= replace_macros(get_markup_template('thing_input.tpl'),array(
+ '$thing_hdr' => t('Add Thing to your Profile'),
+ '$multiprof' => feature_enabled(local_channel(),'multi_profiles'),
+ '$profile_lbl' => t('Select a profile'),
+ '$profile_select' => contact_profile_assign(''),
+ '$verb_lbl' => $channel['channel_name'],
+ '$activity' => array('activity',t('Post an activity'),((array_key_exists('activity',$_REQUEST)) ? $_REQUEST['activity'] : true),t('Only sends to viewers of the applicable profile')),
+ '$verb_select' => obj_verb_selector(),
+ '$thing_lbl' => t('Name of thing e.g. something'),
+ '$url_lbl' => t('URL of thing (optional)'),
+ '$img_lbl' => t('URL for photo of thing (optional)'),
+ '$permissions' => t('Permissions'),
+ '$aclselect' => populate_acl($channel_acl,false),
+ '$lockstate' => $lockstate,
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+ }
+
+}
diff --git a/Zotlabs/Module/Toggle_mobile.php b/Zotlabs/Module/Toggle_mobile.php
new file mode 100644
index 000000000..9d90c0821
--- /dev/null
+++ b/Zotlabs/Module/Toggle_mobile.php
@@ -0,0 +1,23 @@
+ 1) {
+ $channel = \App::get_channel();
+
+ require_once('include/channel.php');
+
+ if(argc() > 1 && intval(argv(1)) > 1900) {
+ $year = intval(argv(1));
+ }
+
+ if(argc() > 2 && intval(argv(2)) > 0 && intval(argv(2)) <= 12) {
+ $month = intval(argv(2));
+ }
+
+ header('content-type: application/octet_stream');
+ header('content-disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . (($month) ? '-' . $month : '') . '.json"' );
+
+ if($year) {
+ echo json_encode(identity_export_year(local_channel(),$year,$month));
+ killme();
+ }
+
+ if(argc() > 1 && argv(1) === 'basic') {
+ echo json_encode(identity_basic_export(local_channel()));
+ killme();
+ }
+
+ // FIXME - this basically doesn't work in the wild with a channel more than a few months old due to memory and execution time limits.
+ // It probably needs to be built at the CLI and offered to download as a tarball. Maybe stored in the members dav.
+
+ if(argc() > 1 && argv(1) === 'complete') {
+ echo json_encode(identity_basic_export(local_channel(),true));
+ killme();
+ }
+ }
+ }
+
+ function get() {
+
+ $y = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
+
+ $yearurl = z_root() . '/uexport/' . $y;
+ $janurl = z_root() . '/uexport/' . $y . '/1';
+ $impurl = '/import_items';
+ $o = replace_macros(get_markup_template('uexport.tpl'), array(
+ '$title' => t('Export Channel'),
+ '$basictitle' => t('Export Channel'),
+ '$basic' => t('Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'),
+ '$fulltitle' => t('Export Content'),
+ '$full' => t('Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin.'),
+ '$by_year' => t('Export your posts from a given year.'),
+
+ '$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'),
+ '$extra2' => sprintf( t('To select all posts for a given year, such as this year, visit %2$s'),$yearurl,$yearurl),
+ '$extra3' => sprintf( t('To select all posts for a given month, such as January of this year, visit %2$s'),$janurl,$janurl),
+ '$extra4' => sprintf( t('These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results please import or restore these in date order (oldest first).'),$impurl,$impurl)
+
+ ));
+ return $o;
+ }
+
+}
diff --git a/Zotlabs/Module/Update_channel.php b/Zotlabs/Module/Update_channel.php
new file mode 100644
index 000000000..b1b2d5103
--- /dev/null
+++ b/Zotlabs/Module/Update_channel.php
@@ -0,0 +1,70 @@
+ 1) && (argv(1) == 'load')) ? 1 : 0);
+
+ header("Content-type: text/html");
+ echo "\r\n";
+
+ /**
+ * We can remove this hack once Internet Explorer recognises HTML5 natively
+ */
+
+ echo (($_GET['msie'] == 1) ? '' : '');
+
+ /**
+ *
+ * Grab the page inner contents by calling the content function from the profile module directly,
+ * but move any image src attributes to another attribute name. This is because
+ * some browsers will prefetch all the images for the page even if we don't need them.
+ * The only ones we need to fetch are those for new page additions, which we'll discover
+ * on the client side and then swap the image back.
+ *
+ */
+
+ $mod = new Channel();
+
+ $text = $mod->get($profile_uid,$load);
+
+ $pattern = "/]*) src=\"([^\"]*)\"/";
+ $replace = "
' : '');
+ echo "\r\n";
+ killme();
+
+}
+}
\ No newline at end of file
diff --git a/Zotlabs/Module/Update_display.php b/Zotlabs/Module/Update_display.php
new file mode 100644
index 000000000..13b04204d
--- /dev/null
+++ b/Zotlabs/Module/Update_display.php
@@ -0,0 +1,48 @@
+ 1) && (argv(1) == 'load')) ? 1 : 0);
+ header("Content-type: text/html");
+ echo "\r\n";
+ echo (($_GET['msie'] == 1) ? '' : '');
+
+ $mod = new Display();
+ $text = $mod->get($profile_uid, $load);
+
+ $pattern = "/]*) src=\"([^\"]*)\"/";
+ $replace = "
' : '');
+ echo "\r\n";
+ // logger('update_display: ' . $text);
+ killme();
+
+ }
+
+}
diff --git a/Zotlabs/Module/Update_home.php b/Zotlabs/Module/Update_home.php
new file mode 100644
index 000000000..0f699482e
--- /dev/null
+++ b/Zotlabs/Module/Update_home.php
@@ -0,0 +1,42 @@
+ 1) && (argv(1) == 'load')) ? 1 : 0);
+ header("Content-type: text/html");
+ echo "\r\n";
+ echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '' : '');
+
+ $mod = new Home();
+ $text = $mod->get($profile_uid, $load);
+
+ $pattern = "/]*) src=\"([^\"]*)\"/";
+ $replace = "
' : '');
+ echo "\r\n";
+ // logger('update_home: ' . $text);
+ killme();
+
+ }
+}
diff --git a/Zotlabs/Module/Update_network.php b/Zotlabs/Module/Update_network.php
new file mode 100644
index 000000000..c27b7614a
--- /dev/null
+++ b/Zotlabs/Module/Update_network.php
@@ -0,0 +1,44 @@
+ 1) && (argv(1) == 'load')) ? 1 : 0);
+ header("Content-type: text/html");
+ echo "\r\n";
+ echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '' : '');
+
+ $mod = new Network();
+ $text = $mod->get($profile_uid, $load);
+
+ $pattern = "/]*) src=\"([^\"]*)\"/";
+ $replace = "
' : '');
+ echo "\r\n";
+ // logger('update_network: ' . $text);
+ killme();
+
+ }
+}
diff --git a/Zotlabs/Module/Update_pubstream.php b/Zotlabs/Module/Update_pubstream.php
new file mode 100644
index 000000000..952b48df3
--- /dev/null
+++ b/Zotlabs/Module/Update_pubstream.php
@@ -0,0 +1,42 @@
+ 1) && (argv(1) == 'load')) ? 1 : 0);
+ header("Content-type: text/html");
+ echo "\r\n";
+ echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '' : '');
+
+ $mod = new Pubstream();
+ $text = $mod->get($profile_uid, $load);
+
+ $pattern = "/]*) src=\"([^\"]*)\"/";
+ $replace = "
' : '');
+ echo "\r\n";
+ killme();
+
+ }
+}
diff --git a/Zotlabs/Module/Update_search.php b/Zotlabs/Module/Update_search.php
new file mode 100644
index 000000000..4491f40f4
--- /dev/null
+++ b/Zotlabs/Module/Update_search.php
@@ -0,0 +1,69 @@
+ 1) && (argv(1) == 'load')) ? 1 : 0);
+
+ header("Content-type: text/html");
+ echo "\r\n";
+
+ /**
+ * We can remove this hack once Internet Explorer recognises HTML5 natively
+ */
+
+ echo (($_GET['msie'] == 1) ? '' : '');
+
+ /**
+ *
+ * Grab the page inner contents by calling the content function from the profile module directly,
+ * but move any image src attributes to another attribute name. This is because
+ * some browsers will prefetch all the images for the page even if we don't need them.
+ * The only ones we need to fetch are those for new page additions, which we'll discover
+ * on the client side and then swap the image back.
+ *
+ */
+
+ $mod = new Search();
+ $text = $mod->get($profile_uid,$load);
+
+ $pattern = "/]*) src=\"([^\"]*)\"/";
+ $replace = "
' : '');
+ echo "\r\n";
+ killme();
+
+ }
+}
diff --git a/Zotlabs/Module/View.php b/Zotlabs/Module/View.php
new file mode 100644
index 000000000..85497a2a4
--- /dev/null
+++ b/Zotlabs/Module/View.php
@@ -0,0 +1,20 @@
+ 1) {
+ profile_load(argv(1));
+ }
+
+ }
+
+ function get() {
+
+ if(observer_prohibited()) {
+ notice( t('Public access denied.') . EOL);
+ return;
+ }
+
+ if(((! count(\App::$profile)) || (\App::$profile['hide_friends']))) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ if(! perm_is_allowed(\App::$profile['uid'], get_observer_hash(),'view_contacts')) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ if(! $_REQUEST['aj'])
+ $_SESSION['return_url'] = \App::$query_string;
+
+
+ $is_owner = ((local_channel() && local_channel() == \App::$profile['uid']) ? true : false);
+
+ $abook_flags = " and abook_pending = 0 and abook_self = 0 ";
+ $sql_extra = '';
+
+ if(! $is_owner) {
+ $abook_flags = " and abook_hidden = 0 ";
+ $sql_extra = " and xchan_hidden = 0 ";
+ }
+
+ $r = q("SELECT count(*) as total FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra ",
+ intval(\App::$profile['uid'])
+ );
+ if($r) {
+ \App::set_pager_total($r[0]['total']);
+ }
+
+ $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra order by xchan_name LIMIT %d OFFSET %d ",
+ intval(\App::$profile['uid']),
+ intval(\App::$pager['itemspage']),
+ intval(\App::$pager['start'])
+ );
+
+ if((! $r) && (! $_REQUEST['aj'])) {
+ info( t('No connections.') . EOL );
+ return $o;
+ }
+
+ $contacts = array();
+
+ foreach($r as $rr) {
+
+ $url = chanlink_url($rr['xchan_url']);
+ if($url) {
+ $contacts[] = array(
+ 'id' => $rr['abook_id'],
+ 'archived' => (intval($rr['abook_archived']) ? true : false),
+ 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['xchan_name'], $rr['xchan_url']),
+ 'thumb' => $rr['xchan_photo_m'],
+ 'name' => substr($rr['xchan_name'],0,20),
+ 'username' => $rr['xchan_addr'],
+ 'link' => $url,
+ 'sparkle' => '',
+ 'itemurl' => $rr['url'],
+ 'network' => '',
+ );
+ }
+ }
+
+
+ if($_REQUEST['aj']) {
+ if($contacts) {
+ $o = replace_macros(get_markup_template('viewcontactsajax.tpl'),array(
+ '$contacts' => $contacts
+ ));
+ }
+ else {
+ $o = '';
+ }
+ echo $o;
+ killme();
+ }
+ else {
+ $o .= "";
+ $tpl = get_markup_template("viewcontact_template.tpl");
+ $o .= replace_macros($tpl, array(
+ '$title' => t('View Connections'),
+ '$contacts' => $contacts,
+ // '$paginate' => paginate($a),
+ ));
+ }
+
+ if(! $contacts)
+ $o .= '';
+
+ return $o;
+ }
+
+}
diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php
new file mode 100644
index 000000000..fa755a3ec
--- /dev/null
+++ b/Zotlabs/Module/Viewsrc.php
@@ -0,0 +1,53 @@
+ 1) ? intval(argv(1)) : 0);
+ $json = ((argc() > 2 && argv(2) === 'json') ? true : false);
+
+ if(! local_channel()) {
+ notice( t('Permission denied.') . EOL);
+ }
+
+
+ if(! $item_id) {
+ \App::$error = 404;
+ notice( t('Item not found.') . EOL);
+ }
+
+ $item_normal = item_normal();
+
+ if(local_channel() && $item_id) {
+ $r = q("select id, item_flags, item_obscured, body from item where uid in (%d , %d) and id = %d $item_normal limit 1",
+ intval(local_channel()),
+ intval($sys['channel_id']),
+ intval($item_id)
+ );
+
+ if($r) {
+ if(intval($r[0]['item_obscured']))
+ $r[0]['body'] = crypto_unencapsulate(json_decode($r[0]['body'],true),get_config('system','prvkey'));
+ $o = (($json) ? json_encode($r[0]['body']) : str_replace("\n",'',$r[0]['body'])); + } + } + + if(is_ajax()) { + print '
' . t('Source of Item') . ' ' . $r[0]['id'] . '
';
+ echo $o;
+ killme();
+ }
+
+ return $o;
+ }
+
+
+}
diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php
new file mode 100644
index 000000000..9a1019ddb
--- /dev/null
+++ b/Zotlabs/Module/Wall_attach.php
@@ -0,0 +1,55 @@
+ 1)
+ $channel = get_channel_by_nick(argv(1));
+
+ if(! $channel)
+ killme();
+
+ $observer = \App::get_observer();
+
+
+ $def_album = get_pconfig($channel['channel_id'],'system','photo_path');
+ $def_attach = get_pconfig($channel['channel_id'],'system','attach_path');
+
+ $r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),'', array('source' => 'editor', 'visible' => 0, 'album' => $def_album, 'directory' => $def_attach, 'allow_cid' => '<' . $channel['channel_hash'] . '>'));
+
+ if(! $r['success']) {
+ notice( $r['message'] . EOL);
+ killme();
+ }
+
+ if(intval($r['data']['is_photo'])) {
+ $s = "\n\n" . $r['body'] . "\n\n";
+ }
+ else {
+ $s = "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
+ }
+
+ if($using_api)
+ return $s;
+
+ echo $s;
+ killme();
+
+ }
+
+}
diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php
new file mode 100644
index 000000000..3868cb14e
--- /dev/null
+++ b/Zotlabs/Module/Wall_upload.php
@@ -0,0 +1,57 @@
+ 1)
+ $nick = argv(1);
+ }
+
+ $channel = (($nick) ? get_channel_by_nick($nick) : false);
+
+ if(! $channel) {
+ if($using_api)
+ return;
+ notice( t('Channel not found.') . EOL);
+ killme();
+ }
+
+ $observer = \App::get_observer();
+
+ $args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
+
+ $ret = photo_upload($channel,$observer,$args);
+
+ if(! $ret['success']) {
+ if($using_api)
+ return;
+ notice($ret['message']);
+ killme();
+ }
+
+ if($using_api)
+ return("\n\n" . $ret['body'] . "\n\n");
+ else
+ echo "\n\n" . $ret['body'] . "\n\n";
+ killme();
+ }
+
+}
diff --git a/Zotlabs/Module/Webfinger.php b/Zotlabs/Module/Webfinger.php
new file mode 100644
index 000000000..c50680de7
--- /dev/null
+++ b/Zotlabs/Module/Webfinger.php
@@ -0,0 +1,54 @@
+Webfinger Diagnostic';
+
+ $o .= '';
+
+ $o .= ''; + + $old = false; + if(x($_GET,'addr')) { + $addr = trim($_GET['addr']); + // if(strpos($addr,'@') !== false) { + $res = webfinger_rfc7033($addr,true); + if(! $res) { + $res = old_webfinger($addr); + $old = true; + } + // } + // else { + // if(function_exists('lrdd')) + // $res = lrdd($addr); + // } + + if($res && $old) { + foreach($res as $r) { + if($r['@attributes']['rel'] === 'http://microformats.org/profile/hcard') { + $hcard = unamp($r['@attributes']['href']); + require_once('library/HTML5/Parser.php'); + $res['vcard'] = scrape_vcard($hcard); + break; + } + } + } + + + $o .= '
';
+ $o .= str_replace("\n",'
',print_r($res,true));
+ $o .= '';
+ }
+ return $o;
+ }
+
+}
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
new file mode 100644
index 000000000..cc0a01cce
--- /dev/null
+++ b/Zotlabs/Module/Webpages.php
@@ -0,0 +1,212 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+ $sys = get_sys_channel();
+ if($sys && intval($sys['channel_id'])) {
+ \App::$is_sys = true;
+ }
+ }
+
+ if(argc() > 1)
+ $which = argv(1);
+ else
+ return;
+
+ profile_load($which);
+
+ }
+
+
+ function get() {
+
+ if(! \App::$profile) {
+ notice( t('Requested profile is not available.') . EOL );
+ \App::$error = 404;
+ return;
+ }
+
+ $which = argv(1);
+
+ $_SESSION['return_url'] = \App::$query_string;
+
+ $uid = local_channel();
+ $owner = 0;
+ $channel = null;
+ $observer = \App::get_observer();
+
+ $channel = \App::get_channel();
+
+ if(\App::$is_sys && is_site_admin()) {
+ $sys = get_sys_channel();
+ if($sys && intval($sys['channel_id'])) {
+ $uid = $owner = intval($sys['channel_id']);
+ $channel = $sys;
+ $observer = $sys;
+ }
+ }
+
+ if(! $owner) {
+ // Figure out who the page owner is.
+ $r = q("select channel_id from channel where channel_address = '%s'",
+ dbesc($which)
+ );
+ if($r) {
+ $owner = intval($r[0]['channel_id']);
+ }
+ }
+
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+ $perms = get_all_perms($owner,$ob_hash);
+
+ if(! $perms['write_pages']) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
+
+ $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout'));
+
+ // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
+ // Nickname is set to the observers xchan, and profile_uid to the owner's.
+ // This lets you post pages at other people's channels.
+
+ if((! $channel) && ($uid) && ($uid == \App::$profile_uid)) {
+ $channel = \App::get_channel();
+ }
+ if($channel) {
+ $channel_acl = array(
+ 'allow_cid' => $channel['channel_allow_cid'],
+ 'allow_gid' => $channel['channel_allow_gid'],
+ 'deny_cid' => $channel['channel_deny_cid'],
+ 'deny_gid' => $channel['channel_deny_gid']
+ );
+ }
+ else
+ $channel_acl = array();
+
+ $is_owner = ($uid && $uid == $owner);
+ $o = profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+
+ $x = array(
+ 'webpage' => ITEM_TYPE_WEBPAGE,
+ 'is_owner' => true,
+ 'nickname' => \App::$profile['channel_address'],
+ 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+ 'acl' => (($is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')) : ''),
+ 'showacl' => (($is_owner) ? true : false),
+ 'visitor' => true,
+ 'hide_location' => true,
+ 'hide_voting' => true,
+ 'profile_uid' => intval($owner),
+ 'mimetype' => $mimetype,
+ 'mimeselect' => true,
+ 'layout' => $layout,
+ 'layoutselect' => true,
+ 'expanded' => true,
+ 'novoting'=> true,
+ 'bbco_autocomplete' => 'bbcode',
+ 'bbcode' => true
+ );
+
+ if($_REQUEST['title'])
+ $x['title'] = $_REQUEST['title'];
+ if($_REQUEST['body'])
+ $x['body'] = $_REQUEST['body'];
+ if($_REQUEST['pagetitle'])
+ $x['pagetitle'] = $_REQUEST['pagetitle'];
+
+ $editor = status_editor($a,$x);
+
+ // Get a list of webpages. We can't display all them because endless scroll makes that unusable,
+ // so just list titles and an edit link.
+
+
+ /** @TODO - this should be replaced with pagelist_widget */
+
+ $sql_extra = item_permissions_sql($owner);
+
+
+ $r = q("select * from iconfig left join item on iconfig.iid = item.id
+ where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d
+ $sql_extra order by item.created desc",
+ intval($owner),
+ intval(ITEM_TYPE_WEBPAGE)
+ );
+
+// $r = q("select * from item_id left join item on item_id.iid = item.id
+// where item_id.uid = %d and service = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc",
+// intval($owner),
+// intval(ITEM_TYPE_WEBPAGE)
+// );
+
+ $pages = null;
+
+ if($r) {
+ $pages = array();
+ foreach($r as $rr) {
+ unobscure($rr);
+
+ $lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock');
+
+ $element_arr = array(
+ 'type' => 'webpage',
+ 'title' => $rr['title'],
+ 'body' => $rr['body'],
+ 'created' => $rr['created'],
+ 'edited' => $rr['edited'],
+ 'mimetype' => $rr['mimetype'],
+ 'pagetitle' => $rr['v'],
+ 'mid' => $rr['mid'],
+ 'layout_mid' => $rr['layout_mid']
+ );
+ $pages[$rr['iid']][] = array(
+ 'url' => $rr['iid'],
+ 'pagetitle' => $rr['v'],
+ 'title' => $rr['title'],
+ 'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),
+ 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']),
+ 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]',
+ 'lockstate' => $lockstate
+ );
+ }
+ }
+
+
+ //Build the base URL for edit links
+ $url = z_root() . '/editwebpage/' . $which;
+
+ $o .= replace_macros(get_markup_template('webpagelist.tpl'), array(
+ '$listtitle' => t('Webpages'),
+ '$baseurl' => $url,
+ '$create' => t('Create'),
+ '$edit' => t('Edit'),
+ '$share' => t('Share'),
+ '$delete' => t('Delete'),
+ '$pages' => $pages,
+ '$channel' => $which,
+ '$editor' => $editor,
+ '$view' => t('View'),
+ '$preview' => t('Preview'),
+ '$actions_txt' => t('Actions'),
+ '$pagelink_txt' => t('Page Link'),
+ '$title_txt' => t('Page Title'),
+ '$created_txt' => t('Created'),
+ '$edited_txt' => t('Edited')
+ ));
+
+ return $o;
+ }
+
+}
diff --git a/Zotlabs/Module/Well_known.php b/Zotlabs/Module/Well_known.php
new file mode 100644
index 000000000..b57666bff
--- /dev/null
+++ b/Zotlabs/Module/Well_known.php
@@ -0,0 +1,69 @@
+ 1) {
+
+ $arr = array('server' => $_SERVER, 'request' => $_REQUEST);
+ call_hooks('well_known', $arr);
+
+
+ if(! check_siteallowed($_SERVER['REMOTE_ADDR'])) {
+ logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']);
+ killme();
+ }
+
+ // from php.net re: REMOTE_HOST:
+ // Note: Your web server must be configured to create this variable. For example in Apache
+ // you'll need HostnameLookups On inside httpd.conf for it to exist. See also gethostbyaddr().
+
+ if(get_config('system','siteallowed_remote_host') && (! check_siteallowed($_SERVER['REMOTE_HOST']))) {
+ logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']);
+ killme();
+ }
+
+
+ switch(argv(1)) {
+ case 'zot-info':
+ \App::$argc -= 1;
+ array_shift(\App::$argv);
+ \App::$argv[0] = 'zfinger';
+ $module = new \Zotlabs\Module\Zfinger();
+ $module->init();
+ break;
+
+ case 'webfinger':
+ \App::$argc -= 1;
+ array_shift(\App::$argv);
+ \App::$argv[0] = 'wfinger';
+ $module = new \Zotlabs\Module\Wfinger();
+ $module->init();
+ break;
+
+ case 'host-meta':
+ \App::$argc -= 1;
+ array_shift(\App::$argv);
+ \App::$argv[0] = 'hostxrd';
+ $module = new \Zotlabs\Module\Hostxrd();
+ $module->init();
+ break;
+
+ default:
+ if(file_exists(\App::$cmd)) {
+ echo file_get_contents(\App::$cmd);
+ killme();
+ }
+ elseif(file_exists(\App::$cmd . '.php'))
+ require_once(\App::$cmd . '.php');
+ break;
+
+ }
+ }
+
+ http_status_exit(404);
+ }
+}
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
new file mode 100644
index 000000000..fa1e11518
--- /dev/null
+++ b/Zotlabs/Module/Wfinger.php
@@ -0,0 +1,140 @@
+ $r[0]['channel_name'],
+ 'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name']
+ );
+
+ foreach($aliases as $alias)
+ if($alias != $resource)
+ $result['aliases'][] = $alias;
+
+ $result['links'] = array(
+
+ array(
+ 'rel' => 'http://webfinger.net/rel/avatar',
+ 'type' => $r[0]['xchan_photo_mimetype'],
+ 'href' => $r[0]['xchan_photo_l']
+ ),
+
+ array(
+ 'rel' => 'http://webfinger.net/rel/profile-page',
+ 'href' => z_root() . '/profile/' . $r[0]['channel_address'],
+ ),
+
+ array(
+ 'rel' => 'http://webfinger.net/rel/blog',
+ 'href' => z_root() . '/channel/' . $r[0]['channel_address'],
+ ),
+
+ array(
+ 'rel' => 'http://ostatus.org/schema/1.0/subscribe',
+ 'template' => z_root() . '/follow/url={uri}',
+ ),
+
+ array(
+ 'rel' => 'http://purl.org/zot/protocol',
+ 'href' => z_root() . '/.well-known/zot-info' . '?address=' . $r[0]['xchan_addr'],
+ ),
+
+ array(
+ 'rel' => 'magic-public-key',
+ 'href' => 'data:application/magic-public-key,' . salmon_key($r[0]['channel_pubkey']),
+ )
+ );
+
+ if($zot) {
+ // get a zotinfo packet and return it with webfinger
+ $result['zot'] = zotinfo(array('address' => $r[0]['xchan_addr']));
+ }
+ }
+ else {
+ header($_SERVER["SERVER_PROTOCOL"] . ' ' . 400 . ' ' . 'Bad Request');
+ killme();
+ }
+
+ $arr = array('channel' => $r[0], 'request' => $_REQUEST, 'result' => $result);
+ call_hooks('webfinger',$arr);
+
+ json_return_and_die($arr['result'],'application/jrd+json');
+
+ }
+
+}
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
new file mode 100644
index 000000000..55a52ea6d
--- /dev/null
+++ b/Zotlabs/Module/Wiki.php
@@ -0,0 +1,536 @@
+ 1)
+ $nick = argv(1); // if the channel name is in the URL, use that
+ if (!$nick && local_channel()) { // if no channel name was provided, assume the current logged in channel
+ $channel = \App::get_channel();
+ if ($channel && $channel['channel_address']) {
+ $nick = $channel['channel_address'];
+ goaway(z_root() . '/wiki/' . $nick);
+ }
+ }
+ if (!$nick) {
+ notice(t('You must be logged in to see this page.') . EOL);
+ goaway('/login');
+ }
+ profile_load($nick);
+
+ }
+
+ function get() {
+
+ if(observer_prohibited(true)) {
+ return login();
+ }
+
+ if(! feature_enabled(\App::$profile_uid,'wiki')) {
+ notice( t('Not found') . EOL);
+ return;
+ }
+
+ $tab = 'wiki';
+
+
+ require_once('include/wiki.php');
+ require_once('include/acl_selectors.php');
+ require_once('include/conversation.php');
+
+ // TODO: Combine the interface configuration into a unified object
+ // Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...)
+ $wiki_owner = false;
+ $showNewWikiButton = false;
+ $showCommitMsg = false;
+ $hidePageHistory = false;
+ $pageHistory = array();
+ $local_observer = null;
+ $resource_id = '';
+
+ // init() should have forced the URL to redirect to /wiki/channel so assume argc() > 1
+ $nick = argv(1);
+ $channel = get_channel_by_nick($nick); // The channel who owns the wikis being viewed
+ if(! $channel) {
+ notice('Invalid channel' . EOL);
+ goaway('/' . argv(0));
+ }
+ // Determine if the observer is the channel owner so the ACL dialog can be populated
+ if (local_channel() === intval($channel['channel_id'])) {
+ $local_observer = \App::get_channel();
+ $wiki_owner = true;
+
+ // Obtain the default permission settings of the channel
+ $channel_acl = array(
+ 'allow_cid' => $local_observer['channel_allow_cid'],
+ 'allow_gid' => $local_observer['channel_allow_gid'],
+ 'deny_cid' => $local_observer['channel_deny_cid'],
+ 'deny_gid' => $local_observer['channel_deny_gid']
+ );
+ // Initialize the ACL to the channel default permissions
+ $x = array(
+ 'lockstate' => (( $local_observer['channel_allow_cid'] ||
+ $local_observer['channel_allow_gid'] ||
+ $local_observer['channel_deny_cid'] ||
+ $local_observer['channel_deny_gid'])
+ ? 'lock' : 'unlock'),
+ 'acl' => populate_acl($channel_acl),
+ 'bang' => ''
+ );
+ } else {
+ // Not the channel owner
+ $channel_acl = $x = array();
+ }
+
+ switch (argc()) {
+ case 2:
+ // Configure page template
+ $wikiheaderName = t('Wiki');
+ $wikiheaderPage = t('Sandbox');
+ require_once('library/markdown.php');
+ $content = t('"# Wiki Sandbox\n\nContent you **edit** and **preview** here *will not be saved*."');
+ $renderedContent = Markdown(json_decode($content));
+ $hide_editor = false;
+ $showPageControls = false;
+ $showNewWikiButton = $wiki_owner;
+ $showNewPageButton = false;
+ $hidePageHistory = true;
+ $showCommitMsg = false;
+ break;
+ case 3:
+ // /wiki/channel/wiki -> No page was specified, so redirect to Home.md
+ $wikiUrlName = urlencode(argv(2));
+ goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName.'/Home');
+ case 4:
+ // GET /wiki/channel/wiki/page
+ // Fetch the wiki info and determine observer permissions
+ $wikiUrlName = urlencode(argv(2));
+ $pageUrlName = urlencode(argv(3));
+ $w = wiki_exists_by_name($channel['channel_id'], $wikiUrlName);
+ if(!$w['resource_id']) {
+ notice('Wiki not found' . EOL);
+ goaway('/'.argv(0).'/'.argv(1));
+ }
+ $resource_id = $w['resource_id'];
+
+ if (!$wiki_owner) {
+ // Check for observer permissions
+ $observer_hash = get_observer_hash();
+ $perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+ if(!$perms['read']) {
+ notice('Permission denied.' . EOL);
+ goaway('/'.argv(0).'/'.argv(1));
+ }
+ if($perms['write']) {
+ $wiki_editor = true;
+ } else {
+ $wiki_editor = false;
+ }
+ } else {
+ $wiki_editor = true;
+ }
+ $wikiheaderName = urldecode($wikiUrlName);
+ $wikiheaderPage = urldecode($pageUrlName);
+ $p = wiki_get_page_content(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
+ if(!$p['success']) {
+ notice('Error retrieving page content' . EOL);
+ goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName);
+ }
+ $content = ($p['content'] !== '' ? htmlspecialchars_decode($p['content'],ENT_COMPAT) : '"# New page\n"');
+ // Render the Markdown-formatted page content in HTML
+ require_once('library/markdown.php');
+ $html = wiki_generate_toc(purify_html(Markdown(json_decode($content))));
+ $renderedContent = wiki_convert_links($html,argv(0).'/'.argv(1).'/'.$wikiUrlName);
+ $hide_editor = false;
+ $showPageControls = $wiki_editor;
+ $showNewWikiButton = $wiki_owner;
+ $showNewPageButton = $wiki_editor;
+ $hidePageHistory = false;
+ $showCommitMsg = true;
+ $pageHistory = wiki_page_history(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
+ break;
+ default: // Strip the extraneous URL components
+ goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName.'/'.$pageUrlName);
+ }
+
+ $wikiModalID = random_string(3);
+ $wikiModal = replace_macros(
+ get_markup_template('generic_modal.tpl'), array(
+ '$id' => $wikiModalID,
+ '$title' => t('Revision Comparison'),
+ '$ok' => t('Revert'),
+ '$cancel' => t('Cancel')
+ )
+ );
+
+ $is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false);
+
+ $o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+
+
+ $o .= replace_macros(get_markup_template('wiki.tpl'),array(
+ '$wikiheaderName' => $wikiheaderName,
+ '$wikiheaderPage' => $wikiheaderPage,
+ '$hideEditor' => $hide_editor,
+ '$showPageControls' => $showPageControls,
+ '$showNewWikiButton'=> $showNewWikiButton,
+ '$showNewPageButton'=> $showNewPageButton,
+ '$hidePageHistory' => $hidePageHistory,
+ '$showCommitMsg' => $showCommitMsg,
+ '$channel' => $channel['channel_address'],
+ '$resource_id' => $resource_id,
+ '$page' => $pageUrlName,
+ '$lockstate' => $x['lockstate'],
+ '$acl' => $x['acl'],
+ '$bang' => $x['bang'],
+ '$content' => $content,
+ '$renderedContent' => $renderedContent,
+ '$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''),
+ '$pageName' => array('pageName', t('Enter the name of the new page:'), '', ''),
+ '$pageRename' => array('pageRename', t('Enter the new name:'), '', ''),
+ '$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="(optional) Enter a custom message when saving the page..."'),
+ '$pageHistory' => $pageHistory['history'],
+ '$wikiModal' => $wikiModal,
+ '$wikiModalID' => $wikiModalID,
+ '$commit' => 'HEAD',
+ '$embedPhotos' => t('Embed image from photo albums'),
+ '$embedPhotosModalTitle' => t('Embed an image from your albums'),
+ '$embedPhotosModalCancel' => t('Cancel'),
+ '$embedPhotosModalOK' => t('OK'),
+ '$modalchooseimages' => t('Choose images to embed'),
+ '$modalchoosealbum' => t('Choose an album'),
+ '$modaldiffalbum' => t('Choose a different album...'),
+ '$modalerrorlist' => t('Error getting album list'),
+ '$modalerrorlink' => t('Error getting photo link'),
+ '$modalerroralbum' => t('Error getting album'),
+ ));
+ head_add_js('library/ace/ace.js'); // Ace Code Editor
+ return $o;
+ }
+
+ function post() {
+ require_once('include/wiki.php');
+
+ // /wiki/channel/preview
+ // Render mardown-formatted text in HTML for preview
+ if((argc() > 2) && (argv(2) === 'preview')) {
+ $content = $_POST['content'];
+ $resource_id = $_POST['resource_id'];
+ require_once('library/markdown.php');
+ $html = wiki_generate_toc(purify_html(Markdown($content)));
+ $w = wiki_get_wiki($resource_id);
+ $wikiURL = argv(0).'/'.argv(1).'/'.$w['urlName'];
+ $html = wiki_convert_links($html,$wikiURL);
+ json_return_and_die(array('html' => $html, 'success' => true));
+ }
+
+ // Create a new wiki
+ // /wiki/channel/create/wiki
+ if ((argc() > 3) && (argv(2) === 'create') && (argv(3) === 'wiki')) {
+ $nick = argv(1);
+ $channel = get_channel_by_nick($nick);
+ // Determine if observer has permission to create wiki
+ $observer_hash = get_observer_hash();
+ // Only the channel owner can create a wiki, at least until we create a
+ // more detail permissions framework
+ if (local_channel() !== intval($channel['channel_id'])) {
+ goaway('/'.argv(0).'/'.$nick.'/');
+ }
+ $wiki = array();
+ // Generate new wiki info from input name
+ $wiki['postVisible'] = ((intval($_POST['postVisible']) === 0) ? 0 : 1);
+ $wiki['rawName'] = $_POST['wikiName'];
+ $wiki['htmlName'] = escape_tags($_POST['wikiName']);
+ $wiki['urlName'] = urlencode($_POST['wikiName']);
+ if($wiki['urlName'] === '') {
+ notice('Error creating wiki. Invalid name.');
+ goaway('/wiki');
+ }
+ // Get ACL for permissions
+ $acl = new \Zotlabs\Access\AccessList($channel);
+ $acl->set_from_array($_POST);
+ $r = wiki_create_wiki($channel, $observer_hash, $wiki, $acl);
+ if ($r['success']) {
+ $homePage = wiki_create_page('Home', $r['item']['resource_id']);
+ if(!$homePage['success']) {
+ notice('Wiki created, but error creating Home page.');
+ goaway('/wiki/'.$nick.'/'.$wiki['urlName']);
+ }
+ goaway('/wiki/'.$nick.'/'.$wiki['urlName'].'/'.$homePage['page']['urlName']);
+ } else {
+ notice('Error creating wiki');
+ goaway('/wiki');
+ }
+ }
+
+ // Delete a wiki
+ if ((argc() > 3) && (argv(2) === 'delete') && (argv(3) === 'wiki')) {
+ $nick = argv(1);
+ $channel = get_channel_by_nick($nick);
+ // Only the channel owner can delete a wiki, at least until we create a
+ // more detail permissions framework
+ if (local_channel() !== intval($channel['channel_id'])) {
+ logger('Wiki delete permission denied.' . EOL);
+ json_return_and_die(array('message' => 'Wiki delete permission denied.', 'success' => false));
+ }
+ $resource_id = $_POST['resource_id'];
+ $deleted = wiki_delete_wiki($resource_id);
+ if ($deleted['success']) {
+ json_return_and_die(array('message' => '', 'success' => true));
+ } else {
+ logger('Error deleting wiki: ' . $resource_id);
+ json_return_and_die(array('message' => 'Error deleting wiki', 'success' => false));
+ }
+ }
+
+ // Create a page
+ if ((argc() === 4) && (argv(2) === 'create') && (argv(3) === 'page')) {
+ $nick = argv(1);
+ $resource_id = $_POST['resource_id'];
+ // Determine if observer has permission to create a page
+ $channel = get_channel_by_nick($nick);
+ if (local_channel() !== intval($channel['channel_id'])) {
+ $observer_hash = get_observer_hash();
+ $perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+ if(!$perms['write']) {
+ logger('Wiki write permission denied. ' . EOL);
+ json_return_and_die(array('success' => false));
+ }
+ }
+ $name = $_POST['name']; //Get new page name
+ if(urlencode(escape_tags($_POST['name'])) === '') {
+ json_return_and_die(array('message' => 'Error creating page. Invalid name.', 'success' => false));
+ }
+ $page = wiki_create_page($name, $resource_id);
+ if ($page['success']) {
+ json_return_and_die(array('url' => '/'.argv(0).'/'.argv(1).'/'.$page['wiki']['urlName'].'/'.urlencode($page['page']['urlName']), 'success' => true));
+ } else {
+ logger('Error creating page');
+ json_return_and_die(array('message' => 'Error creating page.', 'success' => false));
+ }
+ }
+
+ // Fetch page list for a wiki
+ if ((argc() === 5) && (argv(2) === 'get') && (argv(3) === 'page') && (argv(4) === 'list')) {
+ $resource_id = $_POST['resource_id']; // resource_id for wiki in db
+ $channel = get_channel_by_nick(argv(1));
+ $observer_hash = get_observer_hash();
+ if (local_channel() !== intval($channel['channel_id'])) {
+ $perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+ if(!$perms['read']) {
+ logger('Wiki read permission denied.' . EOL);
+ json_return_and_die(array('pages' => null, 'message' => 'Permission denied.', 'success' => false));
+ }
+ }
+ $page_list_html = widget_wiki_pages(array(
+ 'resource_id' => $resource_id,
+ 'refresh' => true,
+ 'channel' => argv(1)));
+ json_return_and_die(array('pages' => $page_list_html, 'message' => '', 'success' => true));
+ }
+
+ // Save a page
+ if ((argc() === 4) && (argv(2) === 'save') && (argv(3) === 'page')) {
+
+ $resource_id = $_POST['resource_id'];
+ $pageUrlName = $_POST['name'];
+ $pageHtmlName = escape_tags($_POST['name']);
+ $content = $_POST['content']; //Get new content
+ $commitMsg = $_POST['commitMsg'];
+ if ($commitMsg === '') {
+ $commitMsg = 'Updated ' . $pageHtmlName;
+ }
+ $nick = argv(1);
+ $channel = get_channel_by_nick($nick);
+ // Determine if observer has permission to save content
+ if (local_channel() !== intval($channel['channel_id'])) {
+ $observer_hash = get_observer_hash();
+ $perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+ if(!$perms['write']) {
+ logger('Wiki write permission denied. ' . EOL);
+ json_return_and_die(array('success' => false));
+ }
+ }
+
+ $saved = wiki_save_page(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'content' => $content));
+ if($saved['success']) {
+ $ob = \App::get_observer();
+ $commit = wiki_git_commit(array(
+ 'commit_msg' => $commitMsg,
+ 'resource_id' => $resource_id,
+ 'observer' => $ob,
+ 'files' => array($pageUrlName.'.md')
+ ));
+ if($commit['success']) {
+ json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true));
+ } else {
+ json_return_and_die(array('message' => 'Error making git commit','success' => false));
+ }
+ } else {
+ json_return_and_die(array('message' => 'Error saving page', 'success' => false));
+ }
+ }
+
+ // Update page history
+ // /wiki/channel/history/page
+ if ((argc() === 4) && (argv(2) === 'history') && (argv(3) === 'page')) {
+
+ $resource_id = $_POST['resource_id'];
+ $pageUrlName = $_POST['name'];
+
+ $nick = argv(1);
+ $channel = get_channel_by_nick($nick);
+ // Determine if observer has permission to read content
+ if (local_channel() !== intval($channel['channel_id'])) {
+ $observer_hash = get_observer_hash();
+ $perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+ if(!$perms['read']) {
+ logger('Wiki read permission denied.' . EOL);
+ json_return_and_die(array('historyHTML' => '', 'message' => 'Permission denied.', 'success' => false));
+ }
+ }
+ $historyHTML = widget_wiki_page_history(array(
+ 'resource_id' => $resource_id,
+ 'pageUrlName' => $pageUrlName
+ ));
+ json_return_and_die(array('historyHTML' => $historyHTML, 'message' => '', 'success' => true));
+ }
+
+ // Delete a page
+ if ((argc() === 4) && (argv(2) === 'delete') && (argv(3) === 'page')) {
+ $resource_id = $_POST['resource_id'];
+ $pageUrlName = $_POST['name'];
+ if ($pageUrlName === 'Home') {
+ json_return_and_die(array('message' => 'Cannot delete Home','success' => false));
+ }
+ // Determine if observer has permission to delete pages
+ $nick = argv(1);
+ $channel = get_channel_by_nick($nick);
+ if (local_channel() !== intval($channel['channel_id'])) {
+ $observer_hash = get_observer_hash();
+ $perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+ if(!$perms['write']) {
+ logger('Wiki write permission denied. ' . EOL);
+ json_return_and_die(array('success' => false));
+ }
+ }
+ $deleted = wiki_delete_page(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
+ if($deleted['success']) {
+ $ob = \App::get_observer();
+ $commit = wiki_git_commit(array(
+ 'commit_msg' => 'Deleted ' . $pageUrlName,
+ 'resource_id' => $resource_id,
+ 'observer' => $ob,
+ 'files' => null
+ ));
+ if($commit['success']) {
+ json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true));
+ } else {
+ json_return_and_die(array('message' => 'Error making git commit','success' => false));
+ }
+ } else {
+ json_return_and_die(array('message' => 'Error deleting page', 'success' => false));
+ }
+ }
+
+ // Revert a page
+ if ((argc() === 4) && (argv(2) === 'revert') && (argv(3) === 'page')) {
+ $resource_id = $_POST['resource_id'];
+ $pageUrlName = $_POST['name'];
+ $commitHash = $_POST['commitHash'];
+ // Determine if observer has permission to revert pages
+ $nick = argv(1);
+ $channel = get_channel_by_nick($nick);
+ if (local_channel() !== intval($channel['channel_id'])) {
+ $observer_hash = get_observer_hash();
+ $perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+ if(!$perms['write']) {
+ logger('Wiki write permission denied.' . EOL);
+ json_return_and_die(array('success' => false));
+ }
+ }
+ $reverted = wiki_revert_page(array('commitHash' => $commitHash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
+ if($reverted['success']) {
+ json_return_and_die(array('content' => $reverted['content'], 'message' => '', 'success' => true));
+ } else {
+ json_return_and_die(array('content' => '', 'message' => 'Error reverting page', 'success' => false));
+ }
+ }
+
+ // Compare page revisions
+ if ((argc() === 4) && (argv(2) === 'compare') && (argv(3) === 'page')) {
+ $resource_id = $_POST['resource_id'];
+ $pageUrlName = $_POST['name'];
+ $compareCommit = $_POST['compareCommit'];
+ $currentCommit = $_POST['currentCommit'];
+ // Determine if observer has permission to revert pages
+ $nick = argv(1);
+ $channel = get_channel_by_nick($nick);
+ if (local_channel() !== intval($channel['channel_id'])) {
+ $observer_hash = get_observer_hash();
+ $perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+ if(!$perms['read']) {
+ logger('Wiki read permission denied.' . EOL);
+ json_return_and_die(array('success' => false));
+ }
+ }
+ $compare = wiki_compare_page(array('currentCommit' => $currentCommit, 'compareCommit' => $compareCommit, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
+ if($compare['success']) {
+ $diffHTML = '| Current Revision | Selected Revision |
'; + + if(x($_GET, 'addr')) { + $addr = trim($_GET['addr']); + + $r = q("select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash", + dbesc($addr), + dbesc($addr) + ); + + if($r) { + foreach($r as $rr) { + $o .= str_replace(array("\n", " "), array("
", " "), print_r($rr, true)) . EOL; + + $s = q("select * from hubloc where hubloc_hash like '%s'", + dbesc($r[0]['xchan_hash']) + ); + + if($s) { + foreach($s as $rrr) + $o .= str_replace(array("\n", " "), array("
", " "), print_r($rrr, true)) . EOL; + } + } + } + else + notice( t('Not found.') . EOL); + + } + return $o; + } + +} diff --git a/Zotlabs/Module/Xpoco.php b/Zotlabs/Module/Xpoco.php new file mode 100644 index 000000000..3ff05c4e1 --- /dev/null +++ b/Zotlabs/Module/Xpoco.php @@ -0,0 +1,13 @@ + z_root(), + '$dspr_guid' => $r[0]['channel_guid'] . str_replace('.','',\App::get_hostname()), + '$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey'])) + )); + + $salmon_key = salmon_key($r[0]['channel_pubkey']); + + header('Access-Control-Allow-Origin: *'); + header("Content-type: application/xrd+xml"); + + + $aliases = array('acct:' . $r[0]['channel_address'] . '@' . \App::get_hostname(), z_root() . '/channel/' . $r[0]['channel_address'], z_root() . '/~' . $r[0]['channel_address']); + + for($x = 0; $x < count($aliases); $x ++) { + if($aliases[$x] === $resource) + unset($aliases[$x]); + } + + + $o = replace_macros(get_markup_template('xrd_person.tpl'), array( + '$nick' => $r[0]['channel_address'], + '$accturi' => $resource, + '$aliases' => $aliases, + '$profile_url' => z_root() . '/channel/' . $r[0]['channel_address'], + '$hcard_url' => z_root() . '/hcard/' . $r[0]['channel_address'], + '$atom' => z_root() . '/feed/' . $r[0]['channel_address'], + '$zot_post' => z_root() . '/post/' . $r[0]['channel_address'], + '$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'], + '$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'], + '$dspr' => $dspr, + // '$salmon' => z_root() . '/salmon/' . $r[0]['channel_address'], + // '$salmen' => z_root() . '/salmon/' . $r[0]['channel_address'] . '/mention', + '$modexp' => 'data:application/magic-public-key,' . $salmon_key, + '$subscribe' => z_root() . '/follow?url={uri}', + '$bigkey' => salmon_key($r[0]['channel_pubkey']) + )); + + + $arr = array('user' => $r[0], 'xml' => $o); + call_hooks('personal_xrd', $arr); + + echo $arr['xml']; + killme(); + + } + +} diff --git a/Zotlabs/Module/Xref.php b/Zotlabs/Module/Xref.php new file mode 100644 index 000000000..e9d494da4 --- /dev/null +++ b/Zotlabs/Module/Xref.php @@ -0,0 +1,26 @@ + 2) + $url = argv(2); + + goaway (z_root() . '/' . $url); + + } + +} diff --git a/Zotlabs/Module/Zfinger.php b/Zotlabs/Module/Zfinger.php new file mode 100644 index 000000000..2ff605fc9 --- /dev/null +++ b/Zotlabs/Module/Zfinger.php @@ -0,0 +1,18 @@ + false); + + $mindate = (($_REQUEST['mindate']) ? datetime_convert('UTC','UTC',$_REQUEST['mindate']) : ''); + if(! $mindate) + $mindate = datetime_convert('UTC','UTC', 'now - 14 days'); + + if(observer_prohibited()) { + $result['message'] = 'Public access denied'; + json_return_and_die($result); + } + + $observer = \App::get_observer(); + + + $channel_address = ((argc() > 1) ? argv(1) : ''); + if($channel_address) { + $r = q("select channel_id, channel_name from channel where channel_address = '%s' and channel_removed = 0 limit 1", + dbesc(argv(1)) + ); + } + else { + $x = get_sys_channel(); + if($x) + $r = array($x); + $mindate = datetime_convert('UTC','UTC', 'now - 14 days'); + } + if(! $r) { + $result['message'] = 'Channel not found.'; + json_return_and_die($result); + } + + logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG); + + $result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],array('mindate' => $mindate)); + $result['success'] = true; + json_return_and_die($result); + } + +} diff --git a/Zotlabs/Module/Zping.php b/Zotlabs/Module/Zping.php new file mode 100644 index 000000000..d6128fa66 --- /dev/null +++ b/Zotlabs/Module/Zping.php @@ -0,0 +1,33 @@ +test_condition($mtch[1])) { + $s = str_replace($mtch[0], $mtch[2], $s); + } + else { + $s = str_replace($mtch[0], $mtch[3], $s); + } + } + } + else { + $cnt = preg_match_all("/\[if (.*?)\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + if($this->test_condition($mtch[1])) { + $s = str_replace($mtch[0], $mtch[2], $s); + } + else { + $s = str_replace($mtch[0], '', $s); + } + } + } + } + if($pass == 0) + $this->parse_pass0($s); + else + $this->parse_pass1($s); + + } + + function parse_pass0($s) { + + $matches = null; + + $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $s, $matches); + if($cnt) + \App::$page['template'] = trim($matches[1]); + + $cnt = preg_match("/\[template=(.*?)\](.*?)\[\/template\]/ism", $s, $matches); + if($cnt) { + \App::$page['template'] = trim($matches[2]); + \App::$page['template_style'] = trim($matches[2]) . '_' . $matches[1]; + } + + $cnt = preg_match("/\[template\](.*?)\[\/template\]/ism", $s, $matches); + if($cnt) { + \App::$page['template'] = trim($matches[1]); + } + + $cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches); + if($cnt) { + \App::$layout['schema'] = trim($matches[1]); + \App::$layout['theme'] = trim($matches[2]); + } + + $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches); + if($cnt) + \App::$layout['theme'] = trim($matches[1]); + + $cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + // only the last webpage definition is used if there is more than one + foreach($matches as $mtch) { + \App::$layout['webpage'] = $this->webpage($a,$mtch[1]); + } + } + } + + function parse_pass1($s) { + $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + \App::$layout['region_' . $mtch[1]] = $this->region($mtch[2],$mtch[1]); + } + } + } + + + + function test_condition($s) { + + // This is extensible. The first version of variable testing supports tests of the form + // [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo'); + // The values 0, '', an empty array, and an unset value will all evaluate to false. + + if(preg_match("/[\$]config[\.](.*?)/",$s,$matches)) { + $x = explode('.',$s); + if(get_config($x[1],$x[2])) + return true; + } + return false; + + } + + + function menu($s, $class = '') { + + $channel_id = $this->get_channel_id(); + $name = $s; + + $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $var[$mtch[1]] = $mtch[2]; + $name = str_replace($mtch[0], '', $name); + } + } + + if($channel_id) { + $m = menu_fetch($name,$channel_id, get_observer_hash()); + return menu_render($m, $class, $edit = false, $var); + } + } + + + function replace_region($match) { + if (array_key_exists($match[1], \App::$page)) { + return \App::$page[$match[1]]; + } + } + + /** + * @brief Returns the channel_id of the profile owner of the page. + * + * Returns the channel_id of the profile owner of the page, or the local_channel + * if there is no profile owner. Otherwise returns 0. + * + * @return channel_id + */ + + function get_channel_id() { + $channel_id = ((is_array(\App::$profile)) ? \App::$profile['profile_uid'] : 0); + + if ((! $channel_id) && (local_channel())) + $channel_id = local_channel(); + + return $channel_id; + } + + function block($s, $class = '') { + $var = array(); + $matches = array(); + $name = $s; + $class = (($class) ? $class : 'bblock widget'); + + $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $var[$mtch[1]] = $mtch[2]; + $name = str_replace($mtch[0], '', $name); + } + } + + $o = ''; + $channel_id = $this->get_channel_id(); + + if($channel_id) { + $r = q("select * from item inner join iconfig on iconfig.iid = item.id and item.uid = %d + and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and iconfig.v = '%s' limit 1", + intval($channel_id), + dbesc($name) + ); + + if($r) { + //check for eventual menus in the block and parse them + $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $r[0]['body'] = str_replace($mtch[0], $this->menu(trim($mtch[1])), $r[0]['body']); + } + } + $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $r[0]['body'] = str_replace($mtch[0],$this->menu(trim($mtch[2]),$mtch[1]),$r[0]['body']); + } + } + + //emit the block + $o .= (($var['wrap'] == 'none') ? '' : '
');
+
+ if($r[0]['title'] && trim($r[0]['body']) != '$content') {
+ $o .= '
');
+ }
+ }
+
+ return $o;
+ }
+
+ function js($s) {
+
+ switch($s) {
+ case 'jquery':
+ $path = 'view/js/jquery.js';
+ break;
+ case 'bootstrap':
+ $path = 'library/bootstrap/js/bootstrap.min.js';
+ break;
+ case 'foundation':
+ $path = 'library/foundation/js/foundation.min.js';
+ $init = "\r\n" . '';
+ break;
+ }
+
+ $ret = '';
+ if($init)
+ $ret .= $init;
+
+ return $ret;
+
+ }
+
+ function css($s) {
+
+ switch($s) {
+ case 'bootstrap':
+ $path = 'library/bootstrap/css/bootstrap.min.css';
+ break;
+ case 'foundation':
+ $path = 'library/foundation/css/foundation.min.css';
+ break;
+ }
+
+ $ret = '';
+
+ return $ret;
+
+ }
+
+ // This doesn't really belong in Comanche, but it could also be argued that it is the perfect place.
+ // We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content.
+ // For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps
+ // 'full' to provide a social network style profile photo.
+ // But leave it open to have richer templating options and perhaps ultimately discard this one, once we have a better idea
+ // of what template and webpage options we might desire.
+
+ function webpage(&$a,$s) {
+ $ret = array();
+ $matches = array();
+
+ $cnt = preg_match_all("/\[authored\](.*?)\[\/authored\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $ret['authored'] = $mtch[1];
+ }
+ }
+ return $ret;
+ }
+
+
+ /**
+ * Render a widget
+ *
+ * @param string $name
+ * @param string $text
+ */
+
+ function widget($name, $text) {
+ $vars = array();
+ $matches = array();
+
+
+ $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $text, $matches, PREG_SET_ORDER);
+ if ($cnt) {
+ foreach ($matches as $mtch) {
+ $vars[$mtch[1]] = $mtch[2];
+ }
+ }
+
+ $func = 'widget_' . trim($name);
+
+ if(! function_exists($func)) {
+ if(file_exists('widget/' . trim($name) . '.php'))
+ require_once('widget/' . trim($name) . '.php');
+ elseif(file_exists('widget/' . trim($name) . '/' . trim($name) . '.php'))
+ require_once('widget/' . trim($name) . '/' . trim($name) . '.php');
+ }
+ else {
+ $theme_widget = $func . '.php';
+ if((! function_exists($func)) && theme_include($theme_widget))
+ require_once(theme_include($theme_widget));
+ }
+
+ if(function_exists($func))
+ return $func($vars);
+ }
+
+
+ function region($s,$region_name) {
+
+ $s = str_replace('$region',$region_name,$s);
+
+ $matches = array();
+
+ $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0], $this->menu(trim($mtch[1])), $s);
+ }
+ }
+
+ // menu class e.g. [menu=horizontal]my_menu[/menu] or [menu=tabbed]my_menu[/menu]
+ // allows different menu renderings to be applied
+
+ $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],$this->menu(trim($mtch[2]),$mtch[1]),$s);
+ }
+ }
+ $cnt = preg_match_all("/\[block\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],$this->block(trim($mtch[1])),$s);
+ }
+ }
+
+ $cnt = preg_match_all("/\[block=(.*?)\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],$this->block(trim($mtch[2]),trim($mtch[1])),$s);
+ }
+ }
+
+ $cnt = preg_match_all("/\[js\](.*?)\[\/js\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],$this->js(trim($mtch[1])),$s);
+ }
+ }
+
+ $cnt = preg_match_all("/\[css\](.*?)\[\/css\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],$this->css(trim($mtch[1])),$s);
+ }
+ }
+ // need to modify this to accept parameters
+
+ $cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],$this->widget(trim($mtch[1]),$mtch[2]),$s);
+ }
+ }
+
+ return $s;
+ }
+
+
+ /*
+ * @function register_page_template($arr)
+ * Registers a page template/variant for use by Comanche selectors
+ * @param array $arr
+ * 'template' => template name
+ * 'variant' => array(
+ * 'name' => variant name
+ * 'desc' => text description
+ * 'regions' => array(
+ * 'name' => name
+ * 'desc' => text description
+ * )
+ * )
+ */
+
+
+ function register_page_template($arr) {
+ \App::$page_layouts[$arr['template']] = array($arr['variant']);
+ return;
+ }
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Render/SimpleTemplate.php b/Zotlabs/Render/SimpleTemplate.php
new file mode 100755
index 000000000..ff1bb5c3c
--- /dev/null
+++ b/Zotlabs/Render/SimpleTemplate.php
@@ -0,0 +1,310 @@
+ 5.3, not certain how to code around it for unit tests
+// case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+ default:
+ //die("Unknown preg error.");
+ return;
+ }
+ echo "' . $r[0]['title'] . '
'; + } + + if(trim($r[0]['body']) === '$content') { + $o .= \App::$page['content']; + } + else { + $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); + } + + $o .= (($var['wrap'] == 'none') ? '' : '";
+ debug_print_backtrace();
+ die();
+ }
+
+ private function _push_stack() {
+ $this->stack[] = array($this->r, $this->nodes);
+ }
+
+ private function _pop_stack(){
+ list($this->r, $this->nodes) = array_pop($this->stack);
+ }
+
+ private function _get_var($name, $retNoKey=false) {
+ $keys = array_map('trim',explode(".",$name));
+ if ($retNoKey && !array_key_exists($keys[0], $this->r))
+ return KEY_NOT_EXISTS;
+
+ $val = $this->r;
+ foreach($keys as $k) {
+ $val = (isset($val[$k]) ? $val[$k] : null);
+ }
+
+ return template_escape($val);
+ }
+
+ /**
+ * IF node
+ * \code
+ * {{ if <$var> }}...[{{ else }} ...] {{ endif }}
+ * {{ if <$var>== }}...[{{ else }} ...]{{ endif }}
+ * {{ if <$var>!= }}...[{{ else }} ...]{{ endif }}
+ * \endcode
+ */
+ private function _replcb_if($args) {
+ if (strpos($args[2],"==")>0){
+ list($a,$b) = array_map("trim",explode("==",$args[2]));
+ $a = $this->_get_var($a);
+ if ($b[0]=="$") $b = $this->_get_var($b);
+ $val = ($a == $b);
+ } else if (strpos($args[2],"!=")>0){
+ list($a,$b) = array_map("trim", explode("!=",$args[2]));
+ $a = $this->_get_var($a);
+ if ($b[0]=="$") $b = $this->_get_var($b);
+ $val = ($a != $b);
+ } else {
+ $val = $this->_get_var($args[2]);
+ }
+ $x = preg_split("|{{ *else *}}|", $args[3]);
+
+ return ( ($val) ? $x[0] : (isset($x[1]) ? $x[1] : ""));
+ }
+
+ /**
+ * FOR node
+ * \code
+ * {{ for <$var> as $name }}...{{ endfor }}
+ * {{ for <$var> as $key=>$name }}...{{ endfor }}
+ * \endcode
+ */
+ private function _replcb_for($args) {
+ $m = array_map('trim', explode(" as ", $args[2]));
+ $x = explode("=>",$m[1]);
+ if (count($x) == 1) {
+ $varname = $x[0];
+ $keyname = "";
+ } else {
+ list($keyname, $varname) = $x;
+ }
+ if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
+ //$vals = $this->r[$m[0]];
+ $vals = $this->_get_var($m[0]);
+ $ret="";
+ if (!is_array($vals)) return $ret;
+
+ foreach ($vals as $k=>$v){
+ $this->_push_stack();
+ $r = $this->r;
+ $r[$varname] = $v;
+ if ($keyname!='') $r[$keyname] = (($k === 0) ? '0' : $k);
+ $ret .= $this->replace($args[3], $r);
+ $this->_pop_stack();
+ }
+
+ return $ret;
+ }
+
+ /**
+ * INC node
+ * \code
+ * {{ inc [with $var1=$var2] }}{{ endinc }}
+ * \endcode
+ */
+ private function _replcb_inc($args) {
+ if (strpos($args[2],"with")) {
+ list($tplfile, $newctx) = array_map('trim', explode("with",$args[2]));
+ } else {
+ $tplfile = trim($args[2]);
+ $newctx = null;
+ }
+
+ if ($tplfile[0]=="$") $tplfile = $this->_get_var($tplfile);
+
+ $this->_push_stack();
+ $r = $this->r;
+ if (!is_null($newctx)) {
+ list($a,$b) = array_map('trim', explode("=",$newctx));
+ $r[$a] = $this->_get_var($b);
+ }
+ $this->nodes = Array();
+ $tpl = get_markup_template($tplfile);
+ $ret = $this->replace($tpl, $r);
+ $this->_pop_stack();
+
+ return $ret;
+ }
+
+ /**
+ * DEBUG node
+ * \code
+ * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
+ * \endcode
+ * replace node with var_dump($var, $var, ...);
+ */
+ private function _replcb_debug($args) {
+ $vars = array_map('trim', explode(" ",$args[2]));
+ $vars[] = $args[1];
+
+ $ret = "";
+ foreach ($vars as $var){
+ $ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
+ $ret .= "\n";
+ }
+ $ret .= "";
+
+ return $ret;
+ }
+
+ private function _replcb_node($m) {
+ $node = $this->nodes[$m[1]];
+ if (method_exists($this, "_replcb_".$node[1])){
+ $s = call_user_func(array($this, "_replcb_".$node[1]), $node);
+ } else {
+ $s = "";
+ }
+ $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+
+ return $s;
+ }
+
+ private function _replcb($m) {
+ //var_dump(array_map('htmlspecialchars', $m));
+ $this->done = false;
+ $this->nodes[] = (array) $m;
+
+ return "||". (count($this->nodes)-1) ."||";
+ }
+
+ private function _build_nodes($s) {
+ $this->done = false;
+ while (!$this->done) {
+ $this->done=true;
+ $s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s);
+ if ($s==Null) $this->_preg_error();
+ }
+ //({{ *else *}}[^{]*)?
+ krsort($this->nodes);
+
+ return $s;
+ }
+
+ private function var_replace($s) {
+ $m = array();
+ /** regexp:
+ * \$ literal $
+ * (\[)? optional open square bracket
+ * ([a-zA-Z0-9-_]+\.?)+ var name, followed by optional
+ * dot, repeated at least 1 time
+ * (?(1)\]) if there was opened square bracket
+ * (subgrup 1), match close bracket
+ */
+ if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s,$m)) {
+ foreach ($m[0] as $var) {
+ $exp = str_replace(array("[", "]"), array("", ""), $var);
+ $exptks = explode("|", $exp);
+
+ $varn = $exptks[0];
+ unset($exptks[0]);
+ $val = $this->_get_var($varn, true);
+ if ($val != KEY_NOT_EXISTS) {
+ /* run filters */
+ /*
+ * Filter are in form of:
+ * filtername:arg:arg:arg
+ *
+ * "filtername" is function name
+ * "arg"s are optional, var value is appended to the end
+ * if one "arg"==='x' , is replaced with var value
+ *
+ * examples:
+ * $item.body|htmlspecialchars // escape html chars
+ * $item.body|htmlspecialchars|strtoupper // escape html and uppercase result
+ * $item.created|date:%Y %M %j // format date (created is a timestamp)
+ * $item.body|str_replace:cat:dog // replace all "cat" with "dog"
+ * $item.body|str_replace:cat:dog:x:1 // replace one "cat" with "dog"
+ */
+ foreach ($exptks as $filterstr) {
+ $filter = explode(":", $filterstr);
+ $filtername = $filter[0];
+ unset($filter[0]);
+ $valkey = array_search("x", $filter);
+ if ($valkey === false) {
+ $filter[] = $val;
+ } else {
+ $filter[$valkey] = $val;
+ }
+ if (function_exists($filtername)) {
+ $val = call_user_func_array($filtername, $filter);
+ }
+ }
+ $s = str_replace($var, $val, $s);
+ }
+ }
+ }
+
+ return $s;
+ }
+
+ private function replace($s, $r) {
+ $this->replace_macros($s, $r);
+ }
+
+ // TemplateEngine interface
+
+ public function replace_macros($s, $r) {
+ $this->r = $r;
+
+ $s = $this->_build_nodes($s);
+
+ $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+ if ($s == Null)
+ $this->_preg_error();
+
+ // remove comments block
+ $s = preg_replace('/{#[^#]*#}/', "" , $s);
+
+ //$t2 = dba_timer();
+
+ // replace strings recursively (limit to 10 loops)
+ $os = "";
+ $count=0;
+ while (($os !== $s) && $count<10) {
+ $os=$s;
+ $count++;
+ $s = $this->var_replace($s);
+ }
+
+ return $s;
+ }
+
+ public function get_markup_template($file, $root='') {
+ $template_file = theme_include($file, $root);
+ if ($template_file) {
+ $content = file_get_contents($template_file);
+ }
+
+ return $content;
+ }
+}
+
+
+function template_escape($s) {
+ return str_replace(array('$','{{'),array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),$s);
+}
+
+function template_unescape($s) {
+ return str_replace(array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),array('$','{{'),$s);
+}
diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php
new file mode 100755
index 000000000..0e3a47c2f
--- /dev/null
+++ b/Zotlabs/Render/SmartyInterface.php
@@ -0,0 +1,48 @@
+ "view/theme/$thname/tpl/");
+ if( x(\App::$theme_info,"extends") )
+ $template_dirs = $template_dirs + array('extends' => "view/theme/" . \App::$theme_info["extends"] . "/tpl/");
+ $template_dirs = $template_dirs + array('base' => 'view/tpl/');
+ $this->setTemplateDir($template_dirs);
+
+ $basecompiledir = \App::$config['system']['smarty3_folder'];
+
+ $this->setCompileDir($basecompiledir.'/compiled/');
+ $this->setConfigDir($basecompiledir.'/config/');
+ $this->setCacheDir($basecompiledir.'/cache/');
+
+ $this->left_delimiter = \App::get_template_ldelim('smarty3');
+ $this->right_delimiter = \App::get_template_rdelim('smarty3');
+
+ // Don't report errors so verbosely
+ $this->error_reporting = E_ALL & (~E_NOTICE);
+ }
+
+ function parsed($template = '') {
+ if($template) {
+ return $this->fetch('string:' . $template);
+ }
+ return $this->fetch('file:' . $this->filename);
+ }
+}
+
+
+
diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php
new file mode 100755
index 000000000..532d6e42f
--- /dev/null
+++ b/Zotlabs/Render/SmartyTemplate.php
@@ -0,0 +1,75 @@
+ERROR: folder $basecompiledir does not exist."; killme();
+ }
+ if(!is_writable($basecompiledir)){
+ echo "ERROR: folder $basecompiledir must be writable by webserver."; killme();
+ }
+ \App::$config['system']['smarty3_folder'] = $basecompiledir;
+ }
+
+ // TemplateEngine interface
+
+ public function replace_macros($s, $r) {
+ $template = '';
+ if(gettype($s) === 'string') {
+ $template = $s;
+ $s = new SmartyInterface();
+ }
+ foreach($r as $key=>$value) {
+ if($key[0] === '$') {
+ $key = substr($key, 1);
+ }
+ $s->assign($key, $value);
+ }
+ return $s->parsed($template);
+ }
+
+ public function get_markup_template($file, $root=''){
+ $template_file = theme_include($file, $root);
+ if($template_file) {
+ $template = new SmartyInterface();
+ $template->filename = $template_file;
+
+ return $template;
+ }
+ return "";
+ }
+
+ public function get_intltext_template($file, $root='') {
+
+ $lang = \App::$language;
+
+ if(file_exists("view/$lang/$file"))
+ $template_file = "view/$lang/$file";
+ elseif(file_exists("view/en/$file"))
+ $template_file = "view/en/$file";
+ else
+ $template_file = theme_include($file,$root);
+ if($template_file) {
+ $template = new SmartyInterface();
+ $template->filename = $template_file;
+
+ return $template;
+ }
+ return "";
+ }
+
+
+
+}
diff --git a/Zotlabs/Render/TemplateEngine.php b/Zotlabs/Render/TemplateEngine.php
new file mode 100755
index 000000000..600ff913e
--- /dev/null
+++ b/Zotlabs/Render/TemplateEngine.php
@@ -0,0 +1,12 @@
+ 1) ? $t[1] : '');
+
+ $opts = '';
+ $opts = ((\App::$profile_uid) ? '?f=&puid=' . \App::$profile_uid : '');
+
+ $schema_str = ((x(\App::$layout,'schema')) ? '&schema=' . App::$layout['schema'] : '');
+ if(($s) && (! $schema_str))
+ $schema_str = '&schema=' . $s;
+ $opts .= $schema_str;
+
+ if(file_exists('view/theme/' . $t . '/php/style.php'))
+ return('view/theme/' . $t . '/php/style.pcss' . $opts);
+
+ return('view/theme/' . $t . '/css/style.css');
+ }
+}
+
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
index 637cd222f..995976dcd 100644
--- a/Zotlabs/Storage/BasicAuth.php
+++ b/Zotlabs/Storage/BasicAuth.php
@@ -3,6 +3,8 @@
namespace Zotlabs\Storage;
use Sabre\DAV;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
/**
* @brief Authentication backend class for DAV.
@@ -73,10 +75,12 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
protected $timezone = '';
+ public $module_disabled = false;
+
+
/**
* @brief Validates a username and password.
*
- * Guest access is granted with the password "+++".
*
* @see \Sabre\DAV\Auth\Backend\AbstractBasic::validateUserPass
* @param string $username
@@ -84,42 +88,29 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
* @return bool
*/
protected function validateUserPass($username, $password) {
- if (trim($password) === '+++') {
- logger('guest: ' . $username);
- return true;
- }
require_once('include/auth.php');
$record = account_verify_password($username, $password);
- if ($record && $record['account_default_channel']) {
- $r = q("SELECT * FROM channel WHERE channel_account_id = %d AND channel_id = %d LIMIT 1",
- intval($record['account_id']),
- intval($record['account_default_channel'])
- );
- if ($r) {
- return $this->setAuthenticated($r[0]);
+ if($record && $record['account']) {
+ if($record['channel'])
+ $channel = $record['channel'];
+ else {
+ $r = q("SELECT * FROM channel WHERE channel_account_id = %d AND channel_id = %d LIMIT 1",
+ intval($record['account']['account_id']),
+ intval($record['account']['account_default_channel'])
+ );
+ if($r)
+ $channel = $r[0];
}
}
- $r = q("SELECT * FROM channel WHERE channel_address = '%s' LIMIT 1",
- dbesc($username)
- );
- if ($r) {
- $x = q("SELECT account_flags, account_salt, account_password FROM account WHERE account_id = %d LIMIT 1",
- intval($r[0]['channel_account_id'])
- );
- if ($x) {
- // @fixme this foreach should not be needed?
- foreach ($x as $record) {
- if ((($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED))
- && (hash('whirlpool', $record['account_salt'] . $password) === $record['account_password'])) {
- logger('password verified for ' . $username);
- return $this->setAuthenticated($r[0]);
- }
- }
- }
+ if($channel && $this->check_module_access($channel['channel_id'])) {
+ return $this->setAuthenticated($channel);
}
- $error = 'password failed for ' . $username;
+ if($this->module_disabled)
+ $error = 'module not enabled for ' . $username;
+ else
+ $error = 'password failed for ' . $username;
logger($error);
log_failed_login($error);
@@ -143,6 +134,69 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
return true;
}
+ /**
+ * When this method is called, the backend must check if authentication was
+ * successful.
+ *
+ * The returned value must be one of the following
+ *
+ * [true, "principals/username"]
+ * [false, "reason for failure"]
+ *
+ * If authentication was successful, it's expected that the authentication
+ * backend returns a so-called principal url.
+ *
+ * Examples of a principal url:
+ *
+ * principals/admin
+ * principals/user1
+ * principals/users/joe
+ * principals/uid/123457
+ *
+ * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+ * return a string such as:
+ *
+ * principals/users/[username]
+ *
+ * @param RequestInterface $request
+ * @param ResponseInterface $response
+ * @return array
+ */
+ function check(RequestInterface $request, ResponseInterface $response) {
+
+ if(local_channel()) {
+ $this->setAuthenticated(\App::get_channel());
+ return [ true, $this->principalPrefix . $this->channel_name ];
+ }
+
+ $auth = new \Sabre\HTTP\Auth\Basic(
+ $this->realm,
+ $request,
+ $response
+ );
+
+ $userpass = $auth->getCredentials();
+ if (!$userpass) {
+ return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
+ }
+ if (!$this->validateUserPass($userpass[0], $userpass[1])) {
+ return [false, "Username or password was incorrect"];
+ }
+ return [true, $this->principalPrefix . $userpass[0]];
+
+ }
+
+ protected function check_module_access($channel_id) {
+ if($channel_id && \App::$module === 'cdav') {
+ $x = get_pconfig($channel_id,'cdav','enabled');
+ if(! $x) {
+ $this->module_disabled = true;
+ return false;
+ }
+ }
+ return true;
+ }
+
/**
* Sets the channel_name from the currently logged-in channel.
*
@@ -165,7 +219,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
}
/**
- * @brief Sets the timezone from the channel in RedBasicAuth.
+ * @brief Sets the timezone from the channel in BasicAuth.
*
* Set in mod/cloud.php if the channel has a timezone set.
*
@@ -209,4 +263,4 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
logger('owner_id ' . $this->owner_id, LOGGER_DATA);
logger('owner_nick ' . $this->owner_nick, LOGGER_DATA);
}
-}
\ No newline at end of file
+}
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index 720940953..713d75108 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -101,8 +101,8 @@ class Browser extends DAV\Browser\Plugin {
$parentpath = array();
// only show parent if not leaving /cloud/; TODO how to improve this?
if ($path && $path != "cloud") {
- list($parentUri) = DAV\URLUtil::splitPath($path);
- $fullPath = DAV\URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
+ list($parentUri) = \Sabre\HTTP\URLUtil::splitPath($path);
+ $fullPath = \Sabre\HTTP\URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
$parentpath['icon'] = $this->enableAssets ? ' . ')
' : '';
$parentpath['path'] = $fullPath;
@@ -116,7 +116,7 @@ class Browser extends DAV\Browser\Plugin {
// This is the current directory, we can skip it
if (rtrim($file['href'],'/') == $path) continue;
- list(, $name) = DAV\URLUtil::splitPath($file['href']);
+ list(, $name) = \Sabre\HTTP\URLUtil::splitPath($file['href']);
if (isset($file[200]['{DAV:}resourcetype'])) {
$type = $file[200]['{DAV:}resourcetype']->getValue();
@@ -166,7 +166,7 @@ class Browser extends DAV\Browser\Plugin {
$size = isset($file[200]['{DAV:}getcontentlength']) ? (int)$file[200]['{DAV:}getcontentlength'] : '';
$lastmodified = ((isset($file[200]['{DAV:}getlastmodified'])) ? $file[200]['{DAV:}getlastmodified']->getTime()->format('Y-m-d H:i:s') : '');
- $fullPath = DAV\URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path ? $path . '/' : '') . $name, '/'));
+ $fullPath = \Sabre\HTTP\URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path ? $path . '/' : '') . $name, '/'));
$displayName = isset($file[200]['{DAV:}displayname']) ? $file[200]['{DAV:}displayname'] : $name;
@@ -197,7 +197,7 @@ class Browser extends DAV\Browser\Plugin {
}
}
- $attachIcon = ""; // "";
+ $attachIcon = ""; // "";
// put the array for this file together
$ft['attachId'] = $this->findAttachIdByHash($attachHash);
@@ -219,7 +219,7 @@ class Browser extends DAV\Browser\Plugin {
$output = '';
if ($this->enablePost) {
- $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output));
+ $this->server->emit('onHTMLActionsPanel', array($parent, &$output, $path));
}
$html .= replace_macros(get_markup_template('cloud.tpl'), array(
@@ -246,14 +246,17 @@ class Browser extends DAV\Browser\Plugin {
\App::$page['content'] = $html;
load_pdl($a);
- $theme_info_file = "view/theme/" . current_theme() . "/php/theme.php";
+ $current_theme = \Zotlabs\Render\Theme::current();
+
+ $theme_info_file = "view/theme/" . $current_theme[0] . "/php/theme.php";
if (file_exists($theme_info_file)){
require_once($theme_info_file);
- if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
- $func = str_replace('-', '_', current_theme()) . '_init';
+ if (function_exists(str_replace('-', '_', $current_theme[0]) . '_init')) {
+ $func = str_replace('-', '_', $current_theme[0]) . '_init';
$func($a);
}
}
+ $this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
construct_page($a);
}
@@ -263,7 +266,7 @@ class Browser extends DAV\Browser\Plugin {
* @param \Sabre\DAV\INode $node
* @param string &$output
*/
- public function htmlActionsPanel(DAV\INode $node, &$output) {
+ public function htmlActionsPanel(DAV\INode $node, &$output, $path) {
if (! $node instanceof DAV\ICollection)
return;
@@ -273,7 +276,7 @@ class Browser extends DAV\Browser\Plugin {
return;
// Storage and quota for the account (all channels of the owner of this directory)!
- $limit = service_class_fetch($owner, 'attach_upload_limit');
+ $limit = engr_units_to_bytes(service_class_fetch($owner, 'attach_upload_limit'));
$r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d",
intval($this->auth->channel_account_id)
);
diff --git a/Zotlabs/Storage/CalDAVClient.php b/Zotlabs/Storage/CalDAVClient.php
new file mode 100644
index 000000000..c1a8db932
--- /dev/null
+++ b/Zotlabs/Storage/CalDAVClient.php
@@ -0,0 +1,738 @@
+username = $user;
+ $this->password = $pass;
+ $this->url = $url;
+
+ }
+
+ private function set_data($s) {
+ $this->request_data = $s;
+ $this->filepos = 0;
+ }
+
+ public function curl_read($ch,$fh,$size) {
+
+ if($this->filepos < 0) {
+ unset($fh);
+ return '';
+ }
+
+ $s = substr($this->request_data,$this->filepos,$size);
+
+ if(strlen($s) < $size)
+ $this->filepos = (-1);
+ else
+ $this->filepos = $this->filepos + $size;
+
+ return $s;
+ }
+
+ function ctag_fetch() {
+ $headers = [ 'Depth: 0', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8'];
+
+ // recommended ctag fetch by sabre
+
+ $this->set_data('
+
+
+
+ ');
+
+ // thunderbird uses this - it's a bit more verbose on what capabilities
+ // are provided by the server
+
+ $this->set_data('
+
+
+
+ ');
+
+
+
+ $auth = $this->username . ':' . $this->password;
+
+ $recurse = 0;
+
+ $x = z_fetch_url($this->url,true,$recurse,
+ [ 'headers' => $headers,
+ 'http_auth' => $auth,
+ 'custom' => 'PROPFIND',
+ 'upload' => true,
+ 'infile' => 3,
+ 'infilesize' => strlen($this->request_data),
+ 'readfunc' => [ $this, 'curl_read' ]
+ ]);
+
+ return $x;
+
+ }
+
+
+ function detail_fetch() {
+ $headers = [ 'Depth: 1', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8'];
+
+ // this query should return all objects in the given calendar, you can filter it appropriately
+ // using filter options
+
+ $this->set_data('
+
+
+
+
+
+ ');
+
+ $auth = $this->username . ':' . $this->password;
+
+ $recurse = 0;
+ $x = z_fetch_url($this->url,true,$recurse,
+ [ 'headers' => $headers,
+ 'http_auth' => $auth,
+ 'custom' => 'REPORT',
+ 'upload' => true,
+ 'infile' => 3,
+ 'infilesize' => strlen($this->request_data),
+ 'readfunc' => [ $this, 'curl_read' ]
+ ]);
+
+
+ return $x;
+
+ }
+
+
+}
+
+
+
+/*
+
+PROPFIND /calendars/johndoe/home/ HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+
+
+// Responses: success
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+
+ /calendars/johndoe/home/
+
+
+ Home calendar
+ 3145
+
+ HTTP/1.1 200 OK
+
+
+
+
+// Responses: fail
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+
+ /calendars/johndoe/home/
+
+
+
+ HTTP/1.1 403 Forbidden
+
+
+
+
+
+// sample request body in DOM
+// prepare request body
+$doc = new DOMDocument('1.0', 'utf-8');
+$doc->formatOutput = true;
+
+$query = $doc->createElement('c:calendar-query');
+$query->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:c', 'urn:ietf:params:xml:ns:caldav');
+$query->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:d', 'DAV:');
+
+$prop = $doc->createElement('d:prop');
+$prop->appendChild($doc->createElement('d:getetag'));
+$prop->appendChild($doc->createElement('c:calendar-data'));
+$query->appendChild($prop);
+$doc->appendChild($query);
+$body = $doc->saveXML();
+
+echo "Body: " . $body . "
";
+
+
+Now we download every single object in this calendar. To do this, we use a REPORT method.
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+
+
+
+
+This request will give us every object that's a VCALENDAR object, and its etag.
+
+If you're only interested in VTODO (because you're writing a todo app) you can also filter for just those:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+
+
+
+
+
+
+Similarly it's also possible to filter to just events, or only get events within a specific time-range.
+
+This report will return a multi-status object again:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+
+ /calendars/johndoe/home/132456762153245.ics
+
+
+ "2134-314"
+ BEGIN:VCALENDAR
+ VERSION:2.0
+ CALSCALE:GREGORIAN
+ BEGIN:VTODO
+ UID:132456762153245
+ SUMMARY:Do the dishes
+ DUE:20121028T115600Z
+ END:VTODO
+ END:VCALENDAR
+
+
+ HTTP/1.1 200 OK
+
+
+
+ /calendars/johndoe/home/132456-34365.ics
+
+
+ "5467-323"
+ BEGIN:VCALENDAR
+ VERSION:2.0
+ CALSCALE:GREGORIAN
+ BEGIN:VEVENT
+ UID:132456-34365
+ SUMMARY:Weekly meeting
+ DTSTART:20120101T120000
+ DURATION:PT1H
+ RRULE:FREQ=WEEKLY
+ END:VEVENT
+ END:VCALENDAR
+
+
+ HTTP/1.1 200 OK
+
+
+
+
+This calendar only contained 2 objects. A todo and a weekly event.
+
+So after you retrieved and processed these, for each object you must retain:
+
+ The calendar data itself
+ The url
+ The etag
+
+In this case all urls ended with .ics. This is often the case, but you must not rely on this. In this case the UID in the calendar object was also identical to a part of the url. This too is often the case, but again not something you can rely on, so don't make any assumptions.
+
+The url and the UID have no meaningful relationship, so treat both those items as separate unique identifiers.
+Finding out if anything changed
+
+To see if anything in a calendar changed, we simply request the ctag again on the calendar. If the ctag did not change, you still have the latest copy.
+
+If it did change, you must request all the etags in the entire calendar again:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+
+
+
+
+
+
+Note that this last request is extremely similar to a previous one, but we are only asking fo the etag, not the calendar-data.
+
+The reason for this, is that calendars can be rather huge. It will save a TON of bandwidth to only check the etag first.
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+
+ /calendars/johndoe/home/132456762153245.ics
+
+
+ "xxxx-xxx"
+
+ HTTP/1.1 200 OK
+
+
+
+ /calendars/johndoe/home/fancy-caldav-client-1234253678.ics
+
+
+ "5-12"
+
+ HTTP/1.1 200 OK
+
+
+
+
+Judging from this last request, 3 things have changed:
+
+ The etag for the task has changed, so the contents must be different
+ There's a new url, some other client must have added an object
+ One object is missing, something must have deleted it.
+
+So based on those 3 items we know that we need to delete an object from our local list, and fetch the contents for the new item, and the updated one.
+
+To fetch the data for these, you can simply issue GET requests:
+
+GET /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+
+But, because in a worst-case scenario this could result in a LOT of GET requests we can do a 'multiget'.
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+ /calendars/johndoe/home/132456762153245.ics
+ /calendars/johndoe/home/fancy-caldav-client-1234253678.ics
+
+
+This request will simply return a multi-status again with the calendar-data and etag.
+A small note about application design
+
+If you read this far and understood what's been said, you may have realized that it's a bit cumbersome to have a separate step for the initial sync, and subsequent updates.
+
+It would totally be possible to skip the 'initial sync', and just use calendar-query and calendar-multiget REPORTS for the initial sync as well.
+Updating a calendar object
+
+Updating a calendar object is rather simple:
+
+PUT /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+Content-Type: text/calendar; charset=utf-8
+If-Match: "2134-314"
+
+BEGIN:VCALENDAR
+....
+END:VCALENDAR
+
+A response to this will be something like this:
+
+HTTP/1.1 204 No Content
+ETag: "2134-315"
+
+The update gave us back the new ETag. SabreDAV gives this ETag on updates back most of the time, but not always.
+
+There are cases where the caldav server must modify the iCalendar object right after storage. In those cases an ETag will not be returned, and you should issue a GET request immediately to get the correct object.
+
+A few notes:
+
+ You must not change the UID of the original object
+ Every object should hold only 1 event or task.
+ You cannot change an VEVENT into a VTODO.
+
+Creating a calendar object
+
+Creating a calendar object is almost identical, except that you don't have a url yet to a calendar object.
+
+Instead, it is up to you to determine the new url.
+
+PUT /calendars/johndoe/home/somerandomstring.ics HTTP/1.1
+Content-Type: text/calendar; charset=utf-8
+
+BEGIN:VCALENDAR
+....
+END:VCALENDAR
+
+A response to this will be something like this:
+
+HTTP/1.1 201 Created
+ETag: "21345-324"
+
+Similar to updating, an ETag is often returned, but there are cases where this is not true.
+Deleting a calendar object
+
+Deleting is simple enough:
+
+DELETE /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+If-Match: "2134-314"
+
+Speeding up Sync with WebDAV-Sync
+
+WebDAV-Sync is a protocol extension that is defined in rfc6578. Because this extension was defined later, some servers may not support this yet.
+
+SabreDAV supports this since 2.0.
+
+WebDAV-Sync allows a client to ask just for calendars that have changed. The process on a high-level is as follows:
+
+ Client requests sync-token from server.
+ Server reports token 15.
+ Some time passes.
+ Client does a Sync REPORT on an calendar, and supplied token 15.
+ Server returns vcard urls that have changed or have been deleted and returns token 17.
+
+As you can see, after the initial sync, only items that have been created, modified or deleted will ever be sent.
+
+This has a lot of advantages. The transmitted xml bodies can generally be a lot shorter, and is also easier on both client and server in terms of memory and CPU usage, because only a limited set of items will have to be compared.
+
+It's important to note, that a client should only do Sync operations, if the server reports that it has support for it. The quickest way to do so, is to request {DAV}sync-token on the calendar you wish to sync.
+
+Technically, a server may support 'sync' on one calendar, and it may not support it on another, although this is probably rare.
+Getting the first sync-token
+
+Initially, we just request a sync token when asking for calendar information:
+
+PROPFIND /calendars/johndoe/home/ HTTP/1.1
+Depth: 0
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+
+
+This would return something as follows:
+
+
+
+ /calendars/johndoe/home/
+
+
+ My calendar
+ 3145
+ http://sabredav.org/ns/sync-token/3145
+
+ HTTP/1.1 200 OK
+
+
+
+
+As you can see, the sync-token is a url. It always should be a url. Even though a number appears in the url, you are not allowed to attach any meaning to that url. Some servers may have use an increasing number, another server may use a completely random string.
+Receiving changes
+
+After a sync token has been obtained, and the client already has the initial copy of the calendar, the client is able to request all changes since the token was issued.
+
+This is done with a REPORT request that may look like this:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Host: dav.example.org
+Content-Type: application/xml; charset="utf-8"
+
+
+
+ http://sabredav.org/ns/sync/3145
+ 1
+
+
+
+
+This requests all the changes since sync-token identified by http://sabredav.org/ns/sync/3145, and for the calendar objects that have been added or modified, we're requesting the etag.
+
+The response to a query like this is another multistatus xml body. Example:
+
+HTTP/1.1 207 Multi-Status
+Content-Type: application/xml; charset="utf-8"
+
+
+
+
+ /calendars/johndoe/home/newevent.ics
+
+
+ "33441-34321"
+
+ HTTP/1.1 200 OK
+
+
+
+ /calendars/johndoe/home/updatedevent.ics
+
+
+ "33541-34696"
+
+ HTTP/1.1 200 OK
+
+
+
+ /calendars/johndoe/home/deletedevent.ics
+ HTTP/1.1 404 Not Found
+
+ http://sabredav.org/ns/sync/5001
+
+
+The last response reported two changes: newevent.ics and updatedevent.ics. There's no way to tell from the response wether those cards got created or updated, you, as a client can only infer this based on the vcards you are already aware of.
+
+The entry with name deletedevent.ics got deleted as indicated by the 404 status. Note that the status element is here a child of d:response when in all previous examples it has been a child of d:propstat.
+
+The other difference with the other multi-status examples, is that this one has a sync-token element with the latest sync-token.
+Caveats
+
+Note that a server is free to 'forget' any sync-tokens that have been previously issued. In this case it may be needed to do a full-sync again.
+
+In case the supplied sync-token is not recognized by the server, a HTTP error is emitted. SabreDAV emits a 403.
+Discovery
+
+Ideally you will want to make sure that all the calendars in an account are automatically discovered. The best user interface would be to just have to ask for three items:
+
+ Username
+ Password
+ Server
+
+And the server should be as short as possible. This is possible with most servers.
+
+If, for example a user specified 'dav.example.org' for the server, the first thing you should do is attempt to send a PROPFIND request to https://dav.example.org/. Note that you SHOULD try the https url before the http url.
+
+This PROPFIND request looks as follows:
+
+PROPFIND / HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+
+
+This will return a response such as the following:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+
+ /
+
+
+
+ /principals/users/johndoe/
+
+
+ HTTP/1.1 200 OK
+
+
+
+
+A 'principal' is a user. The url that's being returned, is a url that refers to the current user. On this url you can request additional information about the user.
+
+What we need from this url, is their 'calendar home'. The calendar home is a collection that contains all of the users' calendars.
+
+To request that, issue the following request:
+
+PROPFIND /principals/users/johndoe/ HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+
+
+This will return a response such as the following:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+
+ /principals/users/johndoe/
+
+
+
+ /calendars/johndoe/
+
+
+ HTTP/1.1 200 OK
+
+
+
+
+Lastly, to list all the calendars for the user, issue a PROPFIND request with Depth: 1.
+
+PROPFIND /calendars/johndoe/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+
+
+
+
+In that last request, we asked for 4 properties.
+
+The resourcetype tells us what type of object we're getting back. You must read out the resourcetype and ensure that it contains at least a calendar element in the CalDAV namespace. Other items may be returned, including non- calendar, which your application should ignore.
+
+The displayname is a human-readable string for the calendarname, the ctag was already covered in an earlier section.
+
+Lastly, supported-calendar-component-set. This gives us a list of components that the calendar accepts. This could be just VTODO, VEVENT, VJOURNAL or a combination of these three.
+
+If you are just creating a todo-list application, this means you should only list the calendars that support the VTODO component.
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+
+ /calendars/johndoe/
+
+
+
+
+
+ HTTP/1.1 200 OK
+
+
+
+ /calendars/johndoe/home/
+
+
+
+
+ Home calendar
+ 3145
+
+
+
+ HTTP/1.1 200 OK
+
+
+
+ /calendars/johndoe/tasks/
+
+
+
+
+ My TODO list
+ 3345
+
+
+
+ HTTP/1.1 200 OK
+
+
+
+*/
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index edbef5a95..6242d5274 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -91,7 +91,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
throw new DAV\Exception\Forbidden('Permission denied.');
}
- $contents = RedCollectionData($this->red_path, $this->auth);
+ $contents = $this->CollectionData($this->red_path, $this->auth);
return $contents;
}
@@ -119,7 +119,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
return new Directory('/' . $modulename, $this->auth);
}
- $x = RedFileData($this->ext_path . '/' . $name, $this->auth);
+ $x = $this->FileData($this->ext_path . '/' . $name, $this->auth);
if ($x) {
return $x;
}
@@ -194,7 +194,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
* @return null|string ETag
*/
public function createFile($name, $data = null) {
- logger($name, LOGGER_DEBUG);
+ logger('create file in directory ' . $name, LOGGER_DEBUG);
if (! $this->auth->owner_id) {
logger('permission denied ' . $name);
@@ -206,6 +206,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
throw new DAV\Exception\Forbidden('Permission denied.');
}
+
$mimetype = z_mime_content_type($name);
$c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1",
@@ -246,7 +247,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
$deny_gid = $c[0]['channel_deny_gid'];
}
- $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, data, created, edited, allow_cid, allow_gid, deny_cid, deny_gid )
+ $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, content, created, edited, allow_cid, allow_gid, deny_cid, deny_gid )
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($c[0]['channel_account_id']),
intval($c[0]['channel_id']),
@@ -315,13 +316,13 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
}
// check against service class quota
- $limit = service_class_fetch($c[0]['channel_id'], 'attach_upload_limit');
+ $limit = engr_units_to_bytes(service_class_fetch($c[0]['channel_id'], 'attach_upload_limit'));
if ($limit !== false) {
$x = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d ",
intval($c[0]['channel_account_id'])
);
if (($x) && ($x[0]['total'] + $size > $limit)) {
- logger('service class limit exceeded for ' . $c[0]['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . $limit);
+ logger('service class limit exceeded for ' . $c[0]['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . userReadableSize($limit));
attach_delete($c[0]['channel_id'], $hash);
return;
}
@@ -358,7 +359,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
* @return void
*/
public function createDirectory($name) {
- logger($name, LOGGER_DEBUG);
+ logger('create directory ' . $name, LOGGER_DEBUG);
if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
throw new DAV\Exception\Forbidden('Permission denied.');
@@ -372,7 +373,9 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
$result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash));
if($result['success']) {
- $sync = attach_export_data($r[0],$ret['data']['hash']);
+ $sync = attach_export_data($r[0],$result['data']['hash']);
+ logger('createDirectory: attach_export_data returns $sync:' . print_r($sync, true), LOGGER_DEBUG);
+
if($sync) {
build_sync_packet($r[0]['channel_id'],array('file' => array($sync)));
}
@@ -429,8 +432,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
return true;
}
- $x = RedFileData($this->ext_path . '/' . $name, $this->auth, true);
- //logger('RedFileData returns: ' . print_r($x, true), LOGGER_DATA);
+ $x = $this->FileData($this->ext_path . '/' . $name, $this->auth, true);
+ //logger('FileData returns: ' . print_r($x, true), LOGGER_DATA);
if ($x)
return true;
@@ -549,7 +552,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
intval($this->auth->owner_id)
);
- $ulimit = service_class_fetch($c[0]['channel_id'], 'attach_upload_limit');
+ $ulimit = engr_units_to_bytes(service_class_fetch($c[0]['channel_id'], 'attach_upload_limit'));
$limit = (($ulimit) ? $ulimit : $limit);
$x = q("select sum(filesize) as total from attach where aid = %d",
@@ -563,4 +566,280 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
$free
);
}
-}
\ No newline at end of file
+
+
+ /**
+ * @brief Array with all Directory and File DAV\Node items for the given path.
+ *
+ *
+ * @param string $file path to a directory
+ * @param \Zotlabs\Storage\BasicAuth &$auth
+ * @returns null|array \Sabre\DAV\INode[]
+ * @throw \Sabre\DAV\Exception\Forbidden
+ * @throw \Sabre\DAV\Exception\NotFound
+ */
+
+ function CollectionData($file, &$auth) {
+ $ret = array();
+
+ $x = strpos($file, '/cloud');
+ if ($x === 0) {
+ $file = substr($file, 6);
+ }
+
+ // return a list of channel if we are not inside a channel
+ if ((! $file) || ($file === '/')) {
+ return $this->ChannelList($auth);
+ }
+
+ $file = trim($file, '/');
+ $path_arr = explode('/', $file);
+
+ if (! $path_arr)
+ return null;
+
+ $channel_name = $path_arr[0];
+
+ $r = q("SELECT channel_id FROM channel WHERE channel_address = '%s' LIMIT 1",
+ dbesc($channel_name)
+ );
+
+ if (! $r)
+ return null;
+
+ $channel_id = $r[0]['channel_id'];
+ $perms = permissions_sql($channel_id);
+
+ $auth->owner_id = $channel_id;
+
+ $path = '/' . $channel_name;
+
+ $folder = '';
+ $errors = false;
+ $permission_error = false;
+
+ for ($x = 1; $x < count($path_arr); $x++) {
+ $r = q("SELECT id, hash, filename, flags, is_dir FROM attach WHERE folder = '%s' AND filename = '%s' AND uid = %d AND is_dir != 0 $perms LIMIT 1",
+ dbesc($folder),
+ dbesc($path_arr[$x]),
+ intval($channel_id)
+ );
+ if (! $r) {
+ // path wasn't found. Try without permissions to see if it was the result of permissions.
+ $errors = true;
+ $r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 limit 1",
+ dbesc($folder),
+ basename($path_arr[$x]),
+ intval($channel_id)
+ );
+ if ($r) {
+ $permission_error = true;
+ }
+ break;
+ }
+
+ if ($r && intval($r[0]['is_dir'])) {
+ $folder = $r[0]['hash'];
+ $path = $path . '/' . $r[0]['filename'];
+ }
+ }
+
+ if ($errors) {
+ if ($permission_error) {
+ throw new DAV\Exception\Forbidden('Permission denied.');
+ }
+ else {
+ throw new DAV\Exception\NotFound('A component of the request file path could not be found.');
+ }
+ }
+
+ // This should no longer be needed since we just returned errors for paths not found
+ if ($path !== '/' . $file) {
+ logger("Path mismatch: $path !== /$file");
+ return NULL;
+ }
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ $prefix = 'DISTINCT ON (filename)';
+ $suffix = 'ORDER BY filename';
+ }
+ else {
+ $prefix = '';
+ $suffix = 'GROUP BY filename';
+ }
+ $r = q("select $prefix id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, created, edited from attach where folder = '%s' and uid = %d $perms $suffix",
+ dbesc($folder),
+ intval($channel_id)
+ );
+
+ foreach ($r as $rr) {
+ //logger('filename: ' . $rr['filename'], LOGGER_DEBUG);
+ if (intval($rr['is_dir'])) {
+ $ret[] = new Directory($path . '/' . $rr['filename'], $auth);
+ }
+ else {
+ $ret[] = new File($path . '/' . $rr['filename'], $rr, $auth);
+ }
+ }
+
+ return $ret;
+ }
+
+
+ /**
+ * @brief Returns an array with viewable channels.
+ *
+ * Get a list of Directory objects with all the channels where the visitor
+ * has view_storage perms.
+ *
+ *
+ * @param BasicAuth &$auth
+ * @return array Directory[]
+ */
+
+ function ChannelList(&$auth) {
+ $ret = array();
+
+ $r = q("SELECT channel_id, channel_address FROM channel WHERE channel_removed = 0
+ AND channel_system = 0 AND NOT (channel_pageflags & %d)>0",
+ intval(PAGE_HIDDEN)
+ );
+
+ if ($r) {
+ foreach ($r as $rr) {
+ if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage')) {
+ logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA);
+ // @todo can't we drop '/cloud'? It gets stripped off anyway in RedDirectory
+ $ret[] = new Directory('/cloud/' . $rr['channel_address'], $auth);
+ }
+ }
+ }
+ return $ret;
+ }
+
+
+ /**
+ * @brief
+ *
+ *
+ * @param string $file
+ * path to file or directory
+ * @param BasicAuth &$auth
+ * @param boolean $test (optional) enable test mode
+ * @return File|Directory|boolean|null
+ * @throw \Sabre\DAV\Exception\Forbidden
+ */
+
+ function FileData($file, &$auth, $test = false) {
+ logger($file . (($test) ? ' (test mode) ' : ''), LOGGER_DATA);
+
+ $x = strpos($file, '/cloud');
+ if ($x === 0) {
+ $file = substr($file, 6);
+ }
+ else {
+ $x = strpos($file,'/dav');
+ if($x === 0)
+ $file = substr($file,4);
+ }
+
+
+ if ((! $file) || ($file === '/')) {
+ return new Directory('/', $auth);
+ }
+
+ $file = trim($file, '/');
+
+ $path_arr = explode('/', $file);
+
+ if (! $path_arr)
+ return null;
+
+ $channel_name = $path_arr[0];
+
+ $r = q("select channel_id from channel where channel_address = '%s' limit 1",
+ dbesc($channel_name)
+ );
+
+ if (! $r)
+ return null;
+
+ $channel_id = $r[0]['channel_id'];
+
+ $path = '/' . $channel_name;
+
+ $auth->owner_id = $channel_id;
+
+ $permission_error = false;
+
+ $folder = '';
+
+ require_once('include/security.php');
+ $perms = permissions_sql($channel_id);
+
+ $errors = false;
+
+ for ($x = 1; $x < count($path_arr); $x++) {
+ $r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 $perms",
+ dbesc($folder),
+ dbesc($path_arr[$x]),
+ intval($channel_id)
+ );
+
+ if ($r && intval($r[0]['is_dir'])) {
+ $folder = $r[0]['hash'];
+ $path = $path . '/' . $r[0]['filename'];
+ }
+ if (! $r) {
+ $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach
+ where folder = '%s' and filename = '%s' and uid = %d $perms order by filename limit 1",
+ dbesc($folder),
+ dbesc(basename($file)),
+ intval($channel_id)
+ );
+ }
+ if (! $r) {
+ $errors = true;
+ $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach
+ where folder = '%s' and filename = '%s' and uid = %d order by filename limit 1",
+ dbesc($folder),
+ dbesc(basename($file)),
+ intval($channel_id)
+ );
+ if ($r)
+ $permission_error = true;
+ }
+ }
+
+ if ($path === '/' . $file) {
+ if ($test)
+ return true;
+ // final component was a directory.
+ return new Directory($file, $auth);
+ }
+
+ if ($errors) {
+ logger('not found ' . $file);
+ if ($test)
+ return false;
+ if ($permission_error) {
+ logger('permission error ' . $file);
+ throw new DAV\Exception\Forbidden('Permission denied.');
+ }
+ return;
+ }
+
+ if ($r) {
+ if ($test)
+ return true;
+
+ if (intval($r[0]['is_dir'])) {
+ return new Directory($path . '/' . $r[0]['filename'], $auth);
+ }
+ else {
+ return new File($path . '/' . $r[0]['filename'], $r[0], $auth);
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index 897f24edd..5a70a99f1 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -124,7 +124,7 @@ class File extends DAV\Node implements DAV\IFile {
);
if ($r) {
if (intval($r[0]['os_storage'])) {
- $d = q("select folder, data from attach where hash = '%s' and uid = %d limit 1",
+ $d = q("select folder, content from attach where hash = '%s' and uid = %d limit 1",
dbesc($this->data['hash']),
intval($c[0]['channel_id'])
);
@@ -139,7 +139,7 @@ class File extends DAV\Node implements DAV\IFile {
$direct = $f1[0];
}
}
- $fname = dbunescbin($d[0]['data']);
+ $fname = dbunescbin($d[0]['content']);
if(strpos($fname,'store') === false)
$f = 'store/' . $this->auth->owner_nick . '/' . $fname ;
else
@@ -158,12 +158,12 @@ class File extends DAV\Node implements DAV\IFile {
}
else {
// this shouldn't happen any more
- $r = q("UPDATE attach SET data = '%s' WHERE hash = '%s' AND uid = %d",
+ $r = q("UPDATE attach SET content = '%s' WHERE hash = '%s' AND uid = %d",
dbescbin(stream_get_contents($data)),
dbesc($this->data['hash']),
intval($this->data['uid'])
);
- $r = q("SELECT length(data) AS fsize FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+ $r = q("SELECT length(content) AS fsize FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
dbesc($this->data['hash']),
intval($this->data['uid'])
);
@@ -208,13 +208,13 @@ class File extends DAV\Node implements DAV\IFile {
return;
}
- $limit = service_class_fetch($c[0]['channel_id'], 'attach_upload_limit');
+ $limit = engr_units_to_bytes(service_class_fetch($c[0]['channel_id'], 'attach_upload_limit'));
if ($limit !== false) {
$x = q("select sum(filesize) as total from attach where aid = %d ",
intval($c[0]['channel_account_id'])
);
if (($x) && ($x[0]['total'] + $size > $limit)) {
- logger('service class limit exceeded for ' . $c[0]['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . $limit);
+ logger('service class limit exceeded for ' . $c[0]['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . userReadableSize($limit));
attach_delete($c[0]['channel_id'], $this->data['hash']);
return;
}
@@ -236,7 +236,7 @@ class File extends DAV\Node implements DAV\IFile {
logger('get file ' . basename($this->name), LOGGER_DEBUG);
logger('os_path: ' . $this->os_path, LOGGER_DATA);
- $r = q("SELECT data, flags, os_storage, filename, filetype FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+ $r = q("SELECT content, flags, os_storage, filename, filetype FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
dbesc($this->data['hash']),
intval($this->data['uid'])
);
@@ -250,14 +250,14 @@ class File extends DAV\Node implements DAV\IFile {
}
if (intval($r[0]['os_storage'])) {
- $x = dbunescbin($r[0]['data']);
+ $x = dbunescbin($r[0]['content']);
if(strpos($x,'store') === false)
$f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $x;
else
$f = $x;
return fopen($f, 'rb');
}
- return dbunescbin($r[0]['data']);
+ return dbunescbin($r[0]['content']);
}
}
@@ -337,6 +337,10 @@ class File extends DAV\Node implements DAV\IFile {
}
}
+ if(get_pconfig($this->auth->owner_id,'system','os_delete_prohibit') && \App::$module == 'dav') {
+ throw new DAV\Exception\Forbidden('Permission denied.');
+ }
+
attach_delete($this->auth->owner_id, $this->data['hash']);
$ch = channelx_by_n($this->auth->owner_id);
diff --git a/Zotlabs/Storage/GitRepo.php b/Zotlabs/Storage/GitRepo.php
new file mode 100644
index 000000000..306abc0ba
--- /dev/null
+++ b/Zotlabs/Storage/GitRepo.php
@@ -0,0 +1,159 @@
+
+ */
+class GitRepo {
+
+ public $url = null;
+ public $name = null;
+ private $path = null;
+ private $channel = null;
+ public $git = null;
+ private $repoBasePath = null;
+
+ function __construct($channel = 'sys', $url = null, $clone = false, $name = null, $path = null) {
+
+ if ($channel === 'sys' && !is_site_admin()) {
+ logger('Only admin can use channel sys');
+ return null;
+ }
+
+ $this->repoBasePath = __DIR__ . '/../../store/git';
+ $this->channel = $channel;
+ $this->git = new PHPGit();
+
+ // Allow custom path for repo in the case of , for example
+ if ($path) {
+ $this->path = $path;
+ } else {
+ $this->path = $this->repoBasePath . "/" . $this->channel . "/" . $this->name;
+ }
+
+ if ($this->isValidGitRepoURL($url)) {
+ $this->url = $url;
+ }
+
+ if ($name) {
+ $this->name = $name;
+ } else {
+ $this->name = $this->getRepoNameFromURL($url);
+ }
+ if (!$this->name) {
+ logger('Error creating GitRepo. No repo name found.');
+ return null;
+ }
+
+ if (is_dir($this->path)) {
+ // ignore the $url input if it exists
+ // TODO: Check if the path is either empty or is a valid git repo and error if not
+ $this->git->setRepository($this->path);
+ // TODO: get repo metadata
+ return;
+ }
+
+ if ($this->url) {
+ // create the folder and clone the repo at url to that folder if $clone is true
+ if ($clone) {
+ if (mkdir($this->path, 0770, true)) {
+ $this->git->setRepository($this->path);
+ if (!$this->cloneRepo()) {
+ // TODO: throw error
+ logger('git clone failed: ' . json_encode($this->git));
+ }
+ } else {
+ logger('git repo path could not be created: ' . json_encode($this->git));
+ }
+ }
+ }
+ }
+
+ public function initRepo() {
+ if(!$this->path) return false;
+ try {
+ return $this->git->init($this->path);
+ } catch (\PHPGit\Exception\GitException $ex) {
+ return false;
+ }
+ }
+
+ public function pull() {
+ try {
+ $success = $this->git->pull();
+ } catch (\PHPGit\Exception\GitException $ex) {
+ return false;
+ }
+ return $success;
+ }
+
+ public function getRepoPath() {
+ return $this->path;
+ }
+
+ public function setRepoPath($directory) {
+ if (is_dir($directory)) {
+ $this->path->$directory;
+ $this->git->setRepository($directory);
+ return true;
+ }
+ return false;
+ }
+
+ public function setIdentity($user_name, $user_email) {
+ // setup user for commit messages
+ $this->git->config->set("user.name", $user_name, ['global' => false, 'system' => false]);
+ $this->git->config->set("user.email", $user_email, ['global' => false, 'system' => false]);
+ }
+
+ public function cloneRepo() {
+ if (validate_url($this->url) && $this->isValidGitRepoURL($this->url) && is_dir($this->path)) {
+ return $this->git->clone($this->url, $this->path);
+ }
+ }
+
+ public function probeRepo() {
+ $git = $this->git;
+ $repo = array();
+ $repo['remote'] = $git->remote();
+ $repo['branches'] = $git->branch(['all' => true]);
+ $repo['logs'] = $git->log(array('limit' => 50));
+ return $repo;
+ }
+
+ // Commit changes to the repo. Default is to stage all changes and commit everything.
+ public function commit($msg, $options = array()) {
+ try {
+ return $this->git->commit($msg, $options);
+ } catch (\PHPGit\Exception\GitException $ex) {
+ return false;
+ }
+ }
+
+ public static function isValidGitRepoURL($url) {
+ if (validate_url($url) && strrpos(parse_url($url, PHP_URL_PATH), '.')) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public static function getRepoNameFromURL($url) {
+ $urlpath = parse_url($url, PHP_URL_PATH);
+ $lastslash = strrpos($urlpath, '/') + 1;
+ $gitext = strrpos($urlpath, '.');
+ if ($gitext) {
+ return substr($urlpath, $lastslash, $gitext - $lastslash);
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/Zotlabs/Text/Tagadelic.php b/Zotlabs/Text/Tagadelic.php
new file mode 100644
index 000000000..55ecf2d75
--- /dev/null
+++ b/Zotlabs/Text/Tagadelic.php
@@ -0,0 +1,44 @@
+jsdisabled = 1;
+ else
+ $this->jsdisabled = 0;
if(intval($_COOKIE['jsdisabled']))
$this->jsdisabled = 1;
+ else
+ $this->jsdisabled = 0;
if(! $this->jsdisabled) {
$page = urlencode(\App::$query_string);
if($test) {
- \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n";
+ self::$jsdisabled = 1;
+ if(array_key_exists('jsdisabled',$_COOKIE))
+ self::$jsdisabled = $_COOKIE['jsdisabled'];
+
+ if(! array_key_exists('jsdisabled',$_COOKIE)) {
+ \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n";
+ /* emulate JS cookie if cookies are not accepted */
+ if (array_key_exists('jsdisabled',$_GET)) {
+ $_COOKIE['jsdisabled'] = $_GET['jsdisabled'];
+ }
+ }
}
else {
\App::$page['htmlhead'] .= "\r\n" . '' . "\r\n";
diff --git a/Zotlabs/Web/Controller.php b/Zotlabs/Web/Controller.php
new file mode 100644
index 000000000..2d0f58891
--- /dev/null
+++ b/Zotlabs/Web/Controller.php
@@ -0,0 +1,13 @@
+controller = new $modname;
\App::$module_loaded = true;
+ }
+ elseif(function_exists($module . '_module')) {
+ \App::$module_loaded = true;
+ }
}
if((strpos($module,'admin') === 0) && (! is_site_admin())) {
@@ -50,33 +68,54 @@ class Router {
/**
* If the site has a custom module to over-ride the standard module, use it.
- * Otherwise, look for the standard program module in the 'mod' directory
+ * Otherwise, look for the standard program module
*/
if(! (\App::$module_loaded)) {
- if(file_exists("mod/site/{$module}.php")) {
- include_once("mod/site/{$module}.php");
- \App::$module_loaded = true;
+ try {
+ $filename = 'Zotlabs/SiteModule/'. ucfirst($module). '.php';
+ if(file_exists($filename)) {
+ // This won't be picked up by the autoloader, so load it explicitly
+ require_once($filename);
+ $this->controller = new $modname;
+ \App::$module_loaded = true;
+ }
+ else {
+ $filename = 'Zotlabs/Module/'. ucfirst($module). '.php';
+ if(file_exists($filename)) {
+ $this->controller = new $modname;
+ \App::$module_loaded = true;
+ }
+ }
+ if(! \App::$module_loaded)
+ throw new \Exception('Module not found');
}
- elseif(file_exists("mod/{$module}.php")) {
- include_once("mod/{$module}.php");
- \App::$module_loaded = true;
+ catch(\Exception $e) {
+ if(file_exists("mod/site/{$module}.php")) {
+ include_once("mod/site/{$module}.php");
+ \App::$module_loaded = true;
+ }
+ elseif(file_exists("mod/{$module}.php")) {
+ include_once("mod/{$module}.php");
+ \App::$module_loaded = true;
+ }
}
- else logger("mod/{$module}.php not found.");
}
-
-
+
/**
- * This provides a place for plugins to register module handlers which don't otherwise exist on the system.
+ * This provides a place for plugins to register module handlers which don't otherwise exist
+ * on the system, or to completely over-ride an existing module.
* If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if
* there is no specific module file or matching plugin name.
* The plugin should catch at least one of the module hooks for this URL.
*/
- $x = array('module' => $module, 'installed' => false);
+ $x = array('module' => $module, 'installed' => \App::$module_loaded, 'controller' => $this->controller);
call_hooks('module_loaded', $x);
- if($x['installed'])
+ if($x['installed']) {
\App::$module_loaded = true;
+ $this->controller = $x['controller'];
+ }
/**
* The URL provided does not resolve to a valid module.
@@ -96,6 +135,8 @@ class Router {
killme();
}
+ logger("Module {$module} not found.", LOGGER_DEBUG, LOG_WARNING);
+
if((x($_SERVER, 'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && \App::$config['system']['dreamhost_error_hack']) {
logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
goaway(z_root() . $_SERVER['REQUEST_URI']);
@@ -133,17 +174,20 @@ class Router {
* to over-ride them.
*/
- if(function_exists(\App::$module . '_init')) {
- $arr = array('init' => true, 'replace' => false);
- call_hooks(\App::$module . '_mod_init', $arr);
- if(! $arr['replace']) {
+ $arr = array('init' => true, 'replace' => false);
+ call_hooks(\App::$module . '_mod_init', $arr);
+ if(! $arr['replace']) {
+ if($this->controller && method_exists($this->controller,'init')) {
+ $this->controller->init();
+ }
+ elseif(function_exists(\App::$module . '_init')) {
$func = \App::$module . '_init';
$func($a);
}
}
/**
- * Do all theme initialiasion here before calling any additional module functions.
+ * Do all theme initialisation here before calling any additional module functions.
* The module_init function may have changed the theme.
* Additionally any page with a Comanche template may alter the theme.
* So we'll check for those now.
@@ -162,13 +206,15 @@ class Router {
* load current theme info
*/
- $theme_info_file = 'view/theme/' . current_theme() . '/php/theme.php';
+ $current_theme = \Zotlabs\Render\Theme::current();
+
+ $theme_info_file = 'view/theme/' . $current_theme[0] . '/php/theme.php';
if (file_exists($theme_info_file)){
require_once($theme_info_file);
}
- if(function_exists(str_replace('-', '_', current_theme()) . '_init')) {
- $func = str_replace('-', '_', current_theme()) . '_init';
+ if(function_exists(str_replace('-', '_', $current_theme[0]) . '_init')) {
+ $func = str_replace('-', '_', $current_theme[0]) . '_init';
$func($a);
}
elseif (x(\App::$theme_info, 'extends') && file_exists('view/theme/' . \App::$theme_info['extends'] . '/php/theme.php')) {
@@ -179,21 +225,30 @@ class Router {
}
}
- if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! \App::$error)
- && (function_exists(\App::$module . '_post'))
- && (! x($_POST, 'auth-params'))) {
+ if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! \App::$error) && (! x($_POST, 'auth-params'))) {
call_hooks(\App::$module . '_mod_post', $_POST);
- $func = \App::$module . '_post';
- $func($a);
+
+ if($this->controller && method_exists($this->controller,'post')) {
+ $this->controller->post();
+ }
+ elseif(function_exists(\App::$module . '_post')) {
+ $func = \App::$module . '_post';
+ $func($a);
+ }
}
- if((! \App::$error) && (function_exists(\App::$module . '_content'))) {
+ if(! \App::$error) {
$arr = array('content' => \App::$page['content'], 'replace' => false);
call_hooks(\App::$module . '_mod_content', $arr);
\App::$page['content'] = $arr['content'];
if(! $arr['replace']) {
- $func = \App::$module . '_content';
- $arr = array('content' => $func($a));
+ if($this->controller && method_exists($this->controller,'get')) {
+ $arr = array('content' => $this->controller->get());
+ }
+ elseif(function_exists(\App::$module . '_content')) {
+ $func = \App::$module . '_content';
+ $arr = array('content' => $func($a));
+ }
}
call_hooks(\App::$module . '_mod_aftercontent', $arr);
\App::$page['content'] .= $arr['content'];
diff --git a/Zotlabs/Web/Session.php b/Zotlabs/Web/Session.php
index f998df396..4f2a3f1f7 100644
--- a/Zotlabs/Web/Session.php
+++ b/Zotlabs/Web/Session.php
@@ -13,10 +13,10 @@ namespace Zotlabs\Web;
class Session {
- private static $handler = null;
- private static $session_started = false;
+ private $handler = null;
+ private $session_started = false;
- function init() {
+ public function init() {
$gc_probability = 50;
@@ -29,28 +29,38 @@ class Session {
*/
$handler = new \Zotlabs\Web\SessionHandler();
- self::$handler = $handler;
- $x = session_set_save_handler($handler,true);
+ $this->handler = $handler;
+
+ $x = session_set_save_handler($handler,false);
if(! $x)
logger('Session save handler initialisation failed.',LOGGER_NORMAL,LOG_ERR);
// Force cookies to be secure (https only) if this site is SSL enabled.
// Must be done before session_start().
+
$arr = session_get_cookie_params();
+
+ // Note when setting cookies: set the domain to false which creates a single domain
+ // cookie. If you use a hostname it will create a .domain.com wildcard which will
+ // have some nasty side effects if you have any other subdomains running hubzilla.
+
session_set_cookie_params(
((isset($arr['lifetime'])) ? $arr['lifetime'] : 0),
((isset($arr['path'])) ? $arr['path'] : '/'),
- ((isset($arr['domain'])) ? $arr['domain'] : App::get_hostname()),
+ (($arr['domain']) ? $arr['domain'] : false),
((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
((isset($arr['httponly'])) ? $arr['httponly'] : true)
);
+
+ register_shutdown_function('session_write_close');
+
}
- function start() {
+ public function start() {
session_start();
- self::$session_started = true;
+ $this->session_started = true;
}
/**
@@ -59,8 +69,8 @@ class Session {
* @return void
*/
- function nuke() {
- self::new_cookie(0); // 0 means delete on browser exit
+ public function nuke() {
+ $this->new_cookie(0); // 0 means delete on browser exit
if($_SESSION && count($_SESSION)) {
foreach($_SESSION as $k => $v) {
unset($_SESSION[$k]);
@@ -68,48 +78,53 @@ class Session {
}
}
- function new_cookie($xtime) {
+ public function new_cookie($xtime) {
$newxtime = (($xtime> 0) ? (time() + $xtime) : 0);
$old_sid = session_id();
- if(self::$handler && self::$session_started) {
+ $arr = session_get_cookie_params();
+
+ if($this->handler && $this->session_started) {
+
session_regenerate_id(true);
// force SessionHandler record creation with the new session_id
// which occurs as a side effect of read()
- self::$handler->read(session_id());
+ $this->handler->read(session_id());
}
else
logger('no session handler');
if (x($_COOKIE, 'jsdisabled')) {
- setcookie('jsdisabled', $_COOKIE['jsdisabled'], $newxtime);
+ setcookie('jsdisabled', $_COOKIE['jsdisabled'], $newxtime, '/', false,((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),((isset($arr['httponly'])) ? $arr['httponly'] : true));
}
- setcookie(session_name(),session_id(),$newxtime);
+ setcookie(session_name(),session_id(),$newxtime, '/', false,((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),((isset($arr['httponly'])) ? $arr['httponly'] : true));
$arr = array('expire' => $xtime);
call_hooks('new_cookie', $arr);
}
- function extend_cookie() {
+ public function extend_cookie() {
+
+ $arr = session_get_cookie_params();
// if there's a long-term cookie, extend it
$xtime = (($_SESSION['remember_me']) ? (60 * 60 * 24 * 365) : 0 );
if($xtime)
- setcookie(session_name(),session_id(),(time() + $xtime));
+ setcookie(session_name(),session_id(),(time() + $xtime), '/', false,((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),((isset($arr['httponly'])) ? $arr['httponly'] : true));
$arr = array('expire' => $xtime);
call_hooks('extend_cookie', $arr);
}
- function return_check() {
+ public function return_check() {
// check a returning visitor against IP changes.
// If the change results in being blocked from re-entry with the current cookie
@@ -149,7 +164,7 @@ class Session {
// check any difference at all
logger('Session address changed. Paranoid setting in effect, blocking session. '
. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
- self::nuke();
+ $this->nuke();
goaway(z_root());
break;
}
diff --git a/Zotlabs/Web/SessionHandler.php b/Zotlabs/Web/SessionHandler.php
index 6980a6408..93b27a7e8 100644
--- a/Zotlabs/Web/SessionHandler.php
+++ b/Zotlabs/Web/SessionHandler.php
@@ -18,13 +18,14 @@ class SessionHandler implements \SessionHandlerInterface {
function read ($id) {
if($id) {
- $r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id));
+ $r = q("SELECT `sess_data` FROM `session` WHERE `sid`= '%s'", dbesc($id));
if($r) {
- return $r[0]['data'];
+ return $r[0]['sess_data'];
}
else {
- q("INSERT INTO `session` (sid, expire) values ('%s', '%s')",
+ q("INSERT INTO `session` (sess_data, sid, expire) values ('%s', '%s', '%s')",
+ dbesc(''),
dbesc($id),
dbesc(time() + 300)
);
@@ -59,7 +60,7 @@ class SessionHandler implements \SessionHandlerInterface {
}
q("UPDATE `session`
- SET `data` = '%s', `expire` = '%s' WHERE `sid` = '%s'",
+ SET `sess_data` = '%s', `expire` = '%s' WHERE `sid` = '%s'",
dbesc($data),
dbesc($expire),
dbesc($id)
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
new file mode 100644
index 000000000..d4f3cb9ea
--- /dev/null
+++ b/Zotlabs/Web/WebServer.php
@@ -0,0 +1,137 @@
+start();
+ }
+ else {
+ session_start();
+ register_shutdown_function('session_write_close');
+ }
+
+ /**
+ * Language was set earlier, but we can over-ride it in the session.
+ * We have to do it here because the session was just now opened.
+ */
+
+ if(array_key_exists('system_language',$_POST)) {
+ if(strlen($_POST['system_language']))
+ $_SESSION['language'] = $_POST['system_language'];
+ else
+ unset($_SESSION['language']);
+ }
+ if((x($_SESSION, 'language')) && ($_SESSION['language'] !== $lang)) {
+ \App::$language = $_SESSION['language'];
+ load_translation_table(\App::$language);
+ }
+
+ if((x($_GET,'zid')) && (! \App::$install)) {
+ \App::$query_string = strip_zids(\App::$query_string);
+ if(! local_channel()) {
+ $_SESSION['my_address'] = $_GET['zid'];
+ zid_init();
+ }
+ }
+
+ if((x($_GET,'zat')) && (! \App::$install)) {
+ \App::$query_string = strip_zats(\App::$query_string);
+ if(! local_channel()) {
+ zat_init();
+ }
+ }
+
+ if((x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || (\App::$module === 'login'))
+ require('include/auth.php');
+
+ if(! x($_SESSION, 'sysmsg'))
+ $_SESSION['sysmsg'] = array();
+
+ if(! x($_SESSION, 'sysmsg_info'))
+ $_SESSION['sysmsg_info'] = array();
+
+ /*
+ * check_config() is responsible for running update scripts. These automatically
+ * update the DB schema whenever we push a new one out. It also checks to see if
+ * any plugins have been added or removed and reacts accordingly.
+ */
+
+
+ if(\App::$install) {
+ /* Allow an exception for the view module so that pcss will be interpreted during installation */
+ if(\App::$module != 'view')
+ \App::$module = 'setup';
+ }
+ else
+ check_config($a);
+
+ nav_set_selected('nothing');
+
+ $Router = new Router($a);
+
+ /* initialise content region */
+
+ if(! x(\App::$page, 'content'))
+ \App::$page['content'] = '';
+
+ call_hooks('page_content_top', \App::$page['content']);
+
+
+ $Router->Dispatch($a);
+
+
+ // If you're just visiting, let javascript take you home
+
+ if(x($_SESSION, 'visitor_home')) {
+ $homebase = $_SESSION['visitor_home'];
+ } elseif(local_channel()) {
+ $homebase = z_root() . '/channel/' . \App::$channel['channel_address'];
+ }
+
+ if(isset($homebase)) {
+ \App::$page['content'] .= '';
+ }
+
+ // now that we've been through the module content, see if the page reported
+ // a permission problem and if so, a 403 response would seem to be in order.
+
+ if(stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) {
+ header($_SERVER['SERVER_PROTOCOL'] . ' 403 ' . t('Permission denied.'));
+ }
+
+ call_hooks('page_end', \App::$page['content']);
+
+ construct_page($a);
+
+ killme();
+ }
+}
\ No newline at end of file
diff --git a/Zotlabs/Zot/Auth.php b/Zotlabs/Zot/Auth.php
index f764172fa..0837be21a 100644
--- a/Zotlabs/Zot/Auth.php
+++ b/Zotlabs/Zot/Auth.php
@@ -80,11 +80,9 @@ class Auth {
if(! $x) {
// finger them if they can't be found.
- $ret = zot_finger($address, null);
- if ($ret['success']) {
- $j = json_decode($ret['body'], true);
- if($j)
- import_xchan($j);
+ $j = Finger::run($address, null);
+ if ($j['success']) {
+ import_xchan($j);
$x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash
where hubloc_addr = '%s' order by hubloc_id desc",
dbesc($address)
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php
new file mode 100644
index 000000000..e7603442f
--- /dev/null
+++ b/Zotlabs/Zot/Finger.php
@@ -0,0 +1,130 @@
+ true) or array('success' => false);
+ */
+
+ static public function run($webbie, $channel = null, $autofallback = true) {
+
+ $ret = array('success' => false);
+
+ self::$token = random_string();
+
+ if (strpos($webbie,'@') === false) {
+ $address = $webbie;
+ $host = \App::get_hostname();
+ } else {
+ $address = substr($webbie,0,strpos($webbie,'@'));
+ $host = substr($webbie,strpos($webbie,'@')+1);
+ }
+
+ $xchan_addr = $address . '@' . $host;
+
+ if ((! $address) || (! $xchan_addr)) {
+ logger('zot_finger: no address :' . $webbie);
+ return $ret;
+ }
+
+ logger('using xchan_addr: ' . $xchan_addr, LOGGER_DATA, LOG_DEBUG);
+
+ // potential issue here; the xchan_addr points to the primary hub.
+ // The webbie we were called with may not, so it might not be found
+ // unless we query for hubloc_addr instead of xchan_addr
+
+ $r = q("select xchan.*, hubloc.* from xchan
+ left join hubloc on xchan_hash = hubloc_hash
+ where xchan_addr = '%s' and hubloc_primary = 1 limit 1",
+ dbesc($xchan_addr)
+ );
+
+ if ($r) {
+ $url = $r[0]['hubloc_url'];
+
+ if ($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') {
+ logger('zot_finger: alternate network: ' . $webbie);
+ logger('url: '.$url.', net: '.var_export($r[0]['hubloc_network'],true), LOGGER_DATA, LOG_DEBUG);
+ return $ret;
+ }
+ }
+ else {
+ $url = 'https://' . $host;
+ }
+
+ $rhs = '/.well-known/zot-info';
+ $https = ((strpos($url,'https://') === 0) ? true : false);
+
+ logger('zot_finger: ' . $address . ' at ' . $url, LOGGER_DEBUG);
+
+ if ($channel) {
+ $postvars = array(
+ 'address' => $address,
+ 'target' => $channel['channel_guid'],
+ 'target_sig' => $channel['channel_guid_sig'],
+ 'key' => $channel['channel_pubkey'],
+ 'token' => self::$token
+ );
+
+ $result = z_post_url($url . $rhs,$postvars);
+
+ if ((! $result['success']) && ($autofallback)) {
+ if ($https) {
+ logger('zot_finger: https failed. falling back to http');
+ $result = z_post_url('http://' . $host . $rhs,$postvars);
+ }
+ }
+ }
+ else {
+ $rhs .= '?f=&address=' . urlencode($address) . '&token=' . self::$token;
+
+ $result = z_fetch_url($url . $rhs);
+ if ((! $result['success']) && ($autofallback)) {
+ if ($https) {
+ logger('zot_finger: https failed. falling back to http');
+ $result = z_fetch_url('http://' . $host . $rhs);
+ }
+ }
+ }
+
+ if(! $result['success']) {
+ logger('zot_finger: no results');
+ return $ret;
+ }
+
+ $x = json_decode($result['body'],true);
+ if($x) {
+ $signed_token = ((is_array($x) && array_key_exists('signed_token',$x)) ? $x['signed_token'] : null);
+ if($signed_token) {
+ $valid = rsa_verify('token.' . self::$token,base64url_decode($signed_token),$x['key']);
+ if(! $valid) {
+ logger('invalid signed token: ' . $url . $rhs, LOGGER_NORMAL, LOG_ERR);
+ return $ret;
+ }
+ }
+ else {
+ logger('No signed token from ' . $url . $rhs, LOGGER_NORMAL, LOG_WARNING);
+ // after 2017-01-01 this will be a hard error unless you over-ride it.
+ if((time() > 1483228800) && (! get_config('system','allow_unsigned_zotfinger')))
+ return $ret;
+ }
+ }
+
+ return $x;
+ }
+
+}
diff --git a/Zotlabs/Zot/Verify.php b/Zotlabs/Zot/Verify.php
index 1192202db..06bd3188c 100644
--- a/Zotlabs/Zot/Verify.php
+++ b/Zotlabs/Zot/Verify.php
@@ -6,7 +6,7 @@ namespace Zotlabs\Zot;
class Verify {
function create($type,$channel_id,$token,$meta) {
- return q("insert into verify ( type, channel, token, meta, created ) values ( '%s', %d, '%s', '%s', '%s' )",
+ return q("insert into verify ( vtype, channel, token, meta, created ) values ( '%s', %d, '%s', '%s', '%s' )",
dbesc($type),
intval($channel_id),
dbesc($token),
@@ -16,7 +16,7 @@ class Verify {
}
function match($type,$channel_id,$token,$meta) {
- $r = q("select id from verify where type = '%s' and channel = %d and token = '%s' and meta = '%s' limit 1",
+ $r = q("select id from verify where vtype = '%s' and channel = %d and token = '%s' and meta = '%s' limit 1",
dbesc($type),
intval($channel_id),
dbesc($token),
@@ -32,7 +32,7 @@ class Verify {
}
function purge($type,$interval) {
- q("delete from verify where type = '%s' and created < %s - INTERVAL %s",
+ q("delete from verify where vtype = '%s' and created < %s - INTERVAL %s",
dbesc($type),
db_utcnow(),
db_quoteinterval($interval)
diff --git a/app/bookmarks.apd b/app/bookmarks.apd
index 9581a220c..2a04d9bf3 100644
--- a/app/bookmarks.apd
+++ b/app/bookmarks.apd
@@ -1,4 +1,4 @@
url: $baseurl/bookmarks
requires: local_channel
-name: View bookmarks
+name: View Bookmarks
photo: $baseurl/app/bookmarks.png
diff --git a/app/chat.apd b/app/chat.apd
index d4879c0b7..7ba1cd2c8 100644
--- a/app/chat.apd
+++ b/app/chat.apd
@@ -1,4 +1,4 @@
url: $baseurl/chat/$nick
requires: local_channel
-name: My chatrooms
+name: My Chatrooms
photo: $baseurl/app/chat.png
diff --git a/app/probe.apd b/app/probe.apd
index e1ab5fc43..910e628ba 100644
--- a/app/probe.apd
+++ b/app/probe.apd
@@ -1,4 +1,4 @@
url: $baseurl/probe
requires: local_channel
-name: Remote diagnostics
+name: Remote Diagnostics
photo: $baseurl/app/probe.png
diff --git a/app/profile.apd b/app/profile.apd
index d353d5742..48e5d5814 100644
--- a/app/profile.apd
+++ b/app/profile.apd
@@ -1,4 +1,4 @@
url: $baseurl/profile/$nick
requires: local_channel
-name: View profile
+name: View Profile
photo: $baseurl/app/profile.png
diff --git a/app/suggest.apd b/app/suggest.apd
index f3d17e0ea..cd94a6d1f 100644
--- a/app/suggest.apd
+++ b/app/suggest.apd
@@ -1,4 +1,4 @@
url: $baseurl/suggest
requires: local_channel
-name: Suggest channels
+name: Suggest Channels
photo: $baseurl/app/suggest.png
diff --git a/app/wiki.apd b/app/wiki.apd
new file mode 100644
index 000000000..95245055c
--- /dev/null
+++ b/app/wiki.apd
@@ -0,0 +1,4 @@
+url: $baseurl/wiki/$nick
+requires: local_channel
+name: Wiki
+photo: $baseurl/app/wiki.png
diff --git a/app/wiki.png b/app/wiki.png
new file mode 100644
index 000000000..31d981679
Binary files /dev/null and b/app/wiki.png differ
diff --git a/boot.php b/boot.php
index ef620e3ec..de483035e 100755
--- a/boot.php
+++ b/boot.php
@@ -34,23 +34,20 @@ require_once('include/text.php');
require_once('include/datetime.php');
require_once('include/language.php');
require_once('include/nav.php');
-require_once('include/cache.php');
require_once('include/permissions.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
-require_once('include/BaseObject.php');
require_once('include/features.php');
require_once('include/taxonomy.php');
-require_once('include/identity.php');
-require_once('include/Contact.php');
+require_once('include/channel.php');
+require_once('include/connections.php');
require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
-define ( 'RED_VERSION', trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION', '1.4' );
-define ( 'ZOT_REVISION', 1 );
+define ( 'STD_VERSION', '1.11' );
+define ( 'ZOT_REVISION', '1.1' );
-define ( 'DB_UPDATE_VERSION', 1165 );
+define ( 'DB_UPDATE_VERSION', 1181 );
/**
@@ -314,15 +311,14 @@ define ( 'PERMS_A_REPUBLISH', 0x10000);
define ( 'PERMS_W_LIKE', 0x20000);
// General channel permissions
-
-define ( 'PERMS_PUBLIC' , 0x0001 );
-define ( 'PERMS_NETWORK' , 0x0002 );
-define ( 'PERMS_SITE' , 0x0004 );
-define ( 'PERMS_CONTACTS' , 0x0008 );
-define ( 'PERMS_SPECIFIC' , 0x0080 );
-define ( 'PERMS_AUTHED' , 0x0100 );
-define ( 'PERMS_PENDING' , 0x0200 );
-
+ // 0 = Only you
+define ( 'PERMS_PUBLIC' , 0x0001 ); // anybody
+define ( 'PERMS_NETWORK' , 0x0002 ); // anybody in this network
+define ( 'PERMS_SITE' , 0x0004 ); // anybody on this site
+define ( 'PERMS_CONTACTS' , 0x0008 ); // any of my connections
+define ( 'PERMS_SPECIFIC' , 0x0080 ); // only specific connections
+define ( 'PERMS_AUTHED' , 0x0100 ); // anybody authenticated (could include visitors from other networks)
+define ( 'PERMS_PENDING' , 0x0200 ); // any connections including those who haven't yet been approved
// Address book flags
@@ -476,6 +472,7 @@ define ( 'NAMESPACE_YMEDIA', 'http://search.yahoo.com/mrss/' );
* activity stream defines
*/
+define ( 'ACTIVITY_REACT', NAMESPACE_ZOT . '/activity/react' );
define ( 'ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like' );
define ( 'ACTIVITY_DISLIKE', NAMESPACE_ZOT . '/activity/dislike' );
define ( 'ACTIVITY_AGREE', NAMESPACE_ZOT . '/activity/agree' );
@@ -516,6 +513,7 @@ define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' );
define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' );
define ( 'ACTIVITY_OBJ_GAME', NAMESPACE_ACTIVITY_SCHEMA . 'game' );
+define ( 'ACTIVITY_OBJ_WIKI', NAMESPACE_ACTIVITY_SCHEMA . 'wiki' );
define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' );
define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' );
define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' );
@@ -582,6 +580,72 @@ define ( 'ITEM_IS_STICKY', 1000 );
define ( 'DBTYPE_MYSQL', 0 );
define ( 'DBTYPE_POSTGRES', 1 );
+
+function sys_boot() {
+
+ // our central App object
+
+ App::init();
+
+ /*
+ * Load the configuration file which contains our DB credentials.
+ * Ignore errors. If the file doesn't exist or is empty, we are running in
+ * installation mode.
+ */
+
+ // miniApp is a conversion object from old style .htconfig.php files
+
+ $a = new miniApp;
+
+
+ App::$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
+
+ @include('.htconfig.php');
+
+ if(! defined('UNO'))
+ define('UNO', 0);
+
+ if(array_key_exists('default_timezone',get_defined_vars())) {
+ App::$config['system']['timezone'] = $default_timezone;
+ }
+
+ $a->convert();
+
+ App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC');
+ date_default_timezone_set(App::$timezone);
+
+
+ /*
+ * Try to open the database;
+ */
+
+ require_once('include/dba/dba_driver.php');
+
+ if(! App::$install) {
+ DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, App::$install);
+ if(! DBA::$dba->connected) {
+ system_unavailable();
+ }
+
+ unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
+
+ /**
+ * Load configs from db. Overwrite configs from .htconfig.php
+ */
+
+ load_config('config');
+ load_config('system');
+ load_config('feature');
+
+ App::$session = new Zotlabs\Web\Session();
+ App::$session->init();
+ load_hooks();
+ call_hooks('init_1');
+ }
+
+}
+
+
/**
*
* Reverse the effect of magic_quotes_gpc if it is enabled.
@@ -628,12 +692,25 @@ function startup() {
class ZotlabsAutoloader {
static public function loader($className) {
$filename = str_replace('\\', '/', $className) . ".php";
- if (file_exists($filename)) {
+ if(file_exists($filename)) {
include($filename);
if (class_exists($className)) {
return TRUE;
}
}
+ $arr = explode('\\',$className);
+ if($arr && count($arr) > 1) {
+ if(! $arr[0])
+ $arr = array_shift($arr);
+ $filename = 'addon/' . lcfirst($arr[0]) . '/' . $arr[1] . ((count($arr) === 2) ? '.php' : '/' . $arr[2] . ".php");
+ if(file_exists($filename)) {
+ include($filename);
+ if (class_exists($className)) {
+ return TRUE;
+ }
+ }
+ }
+
return FALSE;
}
}
@@ -689,9 +766,11 @@ class App {
private static $perms = null; // observer permissions
private static $widgets = array(); // widgets for this page
+ public static $session = null;
public static $groups;
public static $language;
public static $langsave;
+ public static $rtl = false;
public static $plugins_admin;
public static $module_loaded = false;
public static $query_string;
@@ -705,6 +784,7 @@ class App {
public static $content;
public static $data = array();
public static $error = false;
+ public static $emojitab = false;
public static $cmd;
public static $argv;
public static $argc;
@@ -725,6 +805,7 @@ class App {
public static $nav_sel;
public static $is_mobile = false;
public static $is_tablet = false;
+ public static $comanche;
public static $category;
@@ -787,7 +868,7 @@ class App {
/**
* App constructor.
*/
- function init() {
+ public static function init() {
// we'll reset this after we read our config file
date_default_timezone_set('UTC');
@@ -860,6 +941,8 @@ class App {
if ((array_key_exists('0', self::$argv)) && strlen(self::$argv[0])) {
self::$module = str_replace(".", "_", self::$argv[0]);
self::$module = str_replace("-", "_", self::$module);
+ if(strpos(self::$module,'_') === 0)
+ self::$module = substr(self::$module,1);
} else {
self::$argc = 1;
self::$argv = array('home');
@@ -888,21 +971,28 @@ class App {
self::head_set_icon('/images/hz-32.png');
- BaseObject::set_app($this);
-
/*
* register template engines
*/
- $dc = get_declared_classes();
- foreach ($dc as $k) {
- if (in_array("ITemplateEngine", class_implements($k))){
- self::register_template_engine($k);
- }
- }
spl_autoload_register('ZotlabsAutoloader::loader');
self::$meta= new Zotlabs\Web\HttpMeta();
+
+ // create an instance of the smarty template engine so we can register it.
+
+ $smarty = new Zotlabs\Render\SmartyTemplate();
+
+ $dc = get_declared_classes();
+
+ foreach ($dc as $k) {
+ if(in_array('Zotlabs\\Render\\TemplateEngine', class_implements($k))) {
+ self::register_template_engine($k);
+ }
+ }
+
+
+
}
public static function get_baseurl($ssl = false) {
@@ -1055,7 +1145,7 @@ class App {
if(! self::$meta->get_field('og:title'))
self::$meta->set('og:title',self::$page['title']);
- self::$meta->set('generator', Zotlabs\Project\System::get_platform_name());
+ self::$meta->set('generator', Zotlabs\Lib\System::get_platform_name());
/* put the head template at the beginning of page['htmlhead']
* since the code added by the modules frequently depends on it
@@ -1070,7 +1160,7 @@ class App {
'$local_channel' => local_channel(),
'$metas' => self::$meta->get(),
'$update_interval' => $interval,
- 'osearch' => sprintf( t('Search %1$s (%2$s)','opensearch'), Zotlabs\Project\System::get_site_name(), t('$Projectname','opensearch')),
+ 'osearch' => sprintf( t('Search %1$s (%2$s)','opensearch'), Zotlabs\Lib\System::get_site_name(), t('$Projectname','opensearch')),
'$icon' => head_get_icon(),
'$head_css' => head_get_css(),
'$head_js' => head_get_js(),
@@ -1176,7 +1266,6 @@ class App {
* @return App
*/
function get_app() {
- global $a;
return $a;
}
@@ -1226,7 +1315,6 @@ function system_unavailable() {
function clean_urls() {
- global $a;
// if(App::$config['system']['clean_urls'])
return true;
@@ -1234,8 +1322,6 @@ function clean_urls() {
}
function z_path() {
- global $a;
-
$base = z_root();
if(! clean_urls())
$base .= '/?q=';
@@ -1251,7 +1337,6 @@ function z_path() {
* @return string
*/
function z_root() {
- global $a;
return App::get_baseurl();
}
@@ -1381,6 +1466,12 @@ function check_config(&$a) {
@unlink($lockfile);
//send the administrator an e-mail
file_put_contents($lockfile, $x);
+
+ $r = q("select account_language from account where account_email = '%s' limit 1",
+ dbesc(App::$config['system']['admin_email'])
+ );
+ push_lang(($r) ? $r[0]['account_language'] : 'en');
+
$email_tpl = get_intltext_template("update_fail_eml.tpl");
$email_msg = replace_macros($email_tpl, array(
@@ -1398,6 +1489,7 @@ function check_config(&$a) {
. 'Content-transfer-encoding: 8bit' );
//try the logger
logger('CRITICAL: Update Failed: ' . $x);
+ pop_lang();
}
else
set_config('database','update_r' . $x, 'success');
@@ -1440,11 +1532,11 @@ function check_config(&$a) {
if(count($installed)) {
foreach($installed as $i) {
- if(! in_array($i['name'], $plugins_arr)) {
- unload_plugin($i['name']);
+ if(! in_array($i['aname'], $plugins_arr)) {
+ unload_plugin($i['aname']);
}
else {
- $installed_arr[] = $i['name'];
+ $installed_arr[] = $i['aname'];
}
}
}
@@ -1541,7 +1633,20 @@ function fix_system_urls($oldurl, $newurl) {
intval($c[0]['channel_id'])
);
- proc_run('php', 'include/notifier.php', 'refresh_all', $c[0]['channel_id']);
+ $m = q("select abook_id, abook_instance from abook where abook_instance like '%s' and abook_channel = %d",
+ dbesc('%' . $oldurl . '%'),
+ intval($c[0]['channel_id'])
+ );
+ if($m) {
+ foreach($m as $mm) {
+ q("update abook set abook_instance = '%s' where abook_id = %d",
+ dbesc(str_replace($oldurl,$newurl,$mm['abook_instance'])),
+ intval($mm['abook_id'])
+ );
+ }
+ }
+
+ Zotlabs\Daemon\Master::Summon(array('Notifier', 'refresh_all', $c[0]['channel_id']));
}
}
@@ -1570,7 +1675,6 @@ function fix_system_urls($oldurl, $newurl) {
// returns the complete html for inserting into the page
function login($register = false, $form_id = 'main-login', $hiddens=false) {
- $a = get_app();
$o = '';
$reg = false;
$reglink = get_config('system', 'register_link');
@@ -1599,7 +1703,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
'$logout' => t('Logout'),
'$login' => t('Login'),
'$form_id' => $form_id,
- '$lname' => array('username', t('Email') , '', ''),
+ '$lname' => array('username', t('Login/Email') , '', ''),
'$lpassword' => array('password', t('Password'), '', ''),
'$remember_me' => array('remember_me', t('Remember me'), '', '',array(t('No'),t('Yes'))),
'$hiddens' => $hiddens,
@@ -1618,6 +1722,16 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
* @brief Used to end the current process, after saving session state.
*/
function killme() {
+
+ // Ensure that closing the database is the last function on the shutdown stack.
+ // If it is closed prematurely sessions might not get saved correctly.
+ // Note the second arg to PHP's session_set_save_handler() seems to order that shutdown
+ // procedure last despite our best efforts, so we don't use that and implictly
+ // call register_shutdown_function('session_write_close'); within Zotlabs\Web\Session::init()
+ // and then register the database close function here where nothing else can register
+ // after it.
+
+ register_shutdown_function('shutdown');
exit;
}
@@ -1629,6 +1743,10 @@ function goaway($s) {
killme();
}
+function shutdown() {
+
+}
+
/**
* @brief Returns the entity id of locally logged in account or false.
*
@@ -1660,7 +1778,9 @@ function get_account_id() {
* @return int|bool channel_id or false
*/
function local_channel() {
- if((x($_SESSION, 'authenticated')) && (x($_SESSION, 'uid')))
+ if(session_id()
+ && array_key_exists('authenticated',$_SESSION) && $_SESSION['authenticated']
+ && array_key_exists('uid',$_SESSION) && intval($_SESSION['uid']))
return intval($_SESSION['uid']);
return false;
@@ -1691,7 +1811,9 @@ function local_user() {
* @return string|bool visitor_id or false
*/
function remote_channel() {
- if((x($_SESSION, 'authenticated')) && (x($_SESSION, 'visitor_id')))
+ if(session_id()
+ && array_key_exists('authenticated',$_SESSION) && $_SESSION['authenticated']
+ && array_key_exists('visitor_id',$_SESSION) && $_SESSION['visitor_id'])
return $_SESSION['visitor_id'];
return false;
@@ -1716,7 +1838,9 @@ function remote_user() {
* @param string $s Text to display
*/
function notice($s) {
- $a = get_app();
+ if(! session_id())
+ return;
+
if(! x($_SESSION, 'sysmsg')) $_SESSION['sysmsg'] = array();
// ignore duplicated error messages which haven't yet been displayed
@@ -1740,8 +1864,10 @@ function notice($s) {
* @param string $s Text to display
*/
function info($s) {
- $a = get_app();
- if(! x($_SESSION, 'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
+ if(! session_id())
+ return;
+ if(! x($_SESSION, 'sysmsg_info'))
+ $_SESSION['sysmsg_info'] = array();
if(App::$interactive)
$_SESSION['sysmsg_info'][] = $s;
}
@@ -1769,42 +1895,45 @@ function get_max_import_size() {
*
* $cmd and string args are surrounded with ""
*/
-function proc_run($cmd){
-
- $a = get_app();
+function proc_run(){
$args = func_get_args();
$newargs = array();
+
if(! count($args))
return;
- // expand any arrays
-
- foreach($args as $arg) {
- if(is_array($arg)) {
- foreach($arg as $n) {
- $newargs[] = $n;
- }
- }
- else
- $newargs[] = $arg;
- }
-
- $args = $newargs;
+ $args = flatten_array_recursive($args);
$arr = array('args' => $args, 'run_cmd' => true);
- call_hooks("proc_run", $arr);
+ call_hooks('proc_run', $arr);
+
if(! $arr['run_cmd'])
return;
if(count($args) && $args[0] === 'php')
$args[0] = ((x(App::$config,'system')) && (x(App::$config['system'],'php_path')) && (strlen(App::$config['system']['php_path'])) ? App::$config['system']['php_path'] : 'php');
- for($x = 0; $x < count($args); $x++)
- $args[$x] = escapeshellarg($args[$x]);
+ // redirect proc_run statements of legacy daemon processes to the newer Daemon Master object class
+ // We will keep this interface until everybody has transitioned. (2016-05-20)
+
+ if(strstr($args[1],'include/')) {
+ // convert 'include/foo.php' to 'Foo'
+ $orig = substr(ucfirst(substr($args[1],8)),0,-4);
+ logger('proc_run_redirect: ' . $orig);
+ if(file_exists('Zotlabs/Daemon/' . $orig . '.php')) {
+ array_shift($args); // daemons are all run by php, pop it off the top of the array
+ $args[0] = $orig; // replace with the new daemon name
+ logger('Redirecting old proc_run interface: ' . print_r($args,true), LOGGER_DEBUG, LOG_DEBUG);
+ \Zotlabs\Daemon\Master::Summon($args); // summon the daemon
+ return;
+ }
+ }
+
+ $args = array_map('escapeshellarg',$args);
$cmdline = implode($args," ");
if(is_windows()) {
@@ -1824,110 +1953,15 @@ function proc_run($cmd){
* @brief Checks if we are running on M$ Windows.
*
* @return bool true if we run on M$ Windows
+ *
+ * It's possible you might be able to run on WAMP or XAMPP, and this
+ * has been accomplished, but is not officially supported. Good luck.
+ *
*/
function is_windows() {
return ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false);
}
-
-function current_theme(){
- $app_base_themes = array('redbasic');
-
- $a = get_app();
- $page_theme = null;
-
- // Find the theme that belongs to the channel whose stuff we are looking at
-
- if(App::$profile_uid && App::$profile_uid != local_channel()) {
- $r = q("select channel_theme from channel where channel_id = %d limit 1",
- intval(App::$profile_uid)
- );
- if($r)
- $page_theme = $r[0]['channel_theme'];
- }
-
- if(array_key_exists('theme', App::$layout) && App::$layout['theme'])
- $page_theme = App::$layout['theme'];
-
- // Allow folks to over-rule channel themes and always use their own on their own site.
- // The default is for channel themes to take precedence over your own on pages belonging
- // to that channel.
-
- if($page_theme && local_channel() && App::$profile_uid && local_channel() != App::$profile_uid) {
- if(get_pconfig(local_channel(),'system','always_my_theme'))
- $page_theme = null;
- }
-
- $is_mobile = App::$is_mobile || App::$is_tablet;
-
- $standard_system_theme = ((isset(App::$config['system']['theme'])) ? App::$config['system']['theme'] : '');
- $standard_theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $standard_system_theme);
-
- if($is_mobile) {
- if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) {
- $system_theme = $standard_system_theme;
- $theme_name = $standard_theme_name;
- }
- else {
- $system_theme = ((isset(App::$config['system']['mobile_theme'])) ? App::$config['system']['mobile_theme'] : '');
- $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile_theme')) ? $_SESSION['mobile_theme'] : $system_theme);
-
- if($theme_name === '' || $theme_name === '---' ) {
- // user has selected to have the mobile theme be the same as the normal one
- $system_theme = $standard_system_theme;
- $theme_name = $standard_theme_name;
- }
- }
- }
- else {
- $system_theme = $standard_system_theme;
- $theme_name = $standard_theme_name;
-
- if($page_theme)
- $theme_name = $page_theme;
- }
-
- if($theme_name &&
- (file_exists('view/theme/' . $theme_name . '/css/style.css') ||
- file_exists('view/theme/' . $theme_name . '/php/style.php')))
- return($theme_name);
-
- foreach($app_base_themes as $t) {
- if(file_exists('view/theme/' . $t . '/css/style.css') ||
- file_exists('view/theme/' . $t . '/php/style.php'))
- return($t);
- }
-
- $fallback = array_merge(glob('view/theme/*/css/style.css'),glob('view/theme/*/php/style.php'));
- if(count($fallback))
- return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
-
-}
-
-
-/**
- * @brief Return full URL to theme which is currently in effect.
- *
- * Provide a sane default if nothing is chosen or the specified theme does not exist.
- *
- * @param bool $installing default false
- *
- * @return string
- */
-function current_theme_url($installing = false) {
- global $a;
-
- $t = current_theme();
-
- $opts = '';
- $opts = ((App::$profile_uid) ? '?f=&puid=' . App::$profile_uid : '');
- $opts .= ((x(App::$layout,'schema')) ? '&schema=' . App::$layout['schema'] : '');
- if(file_exists('view/theme/' . $t . '/php/style.php'))
- return('view/theme/' . $t . '/php/style.pcss' . $opts);
-
- return('view/theme/' . $t . '/css/style.css');
-}
-
/**
* @brief Check if current user has admin role.
*
@@ -1935,8 +1969,11 @@ function current_theme_url($installing = false) {
*
* @return bool true if user is an admin
*/
+
function is_site_admin() {
- $a = get_app();
+
+ if(! session_id())
+ return false;
if($_SESSION['delegate'])
return false;
@@ -1957,7 +1994,10 @@ function is_site_admin() {
* @return bool true if user is a developer
*/
function is_developer() {
- $a = get_app();
+
+ if(! session_id())
+ return false;
+
if((intval($_SESSION['authenticated']))
&& (is_array(App::$account))
&& (App::$account['account_roles'] & ACCOUNT_ROLE_DEVELOPER))
@@ -1968,7 +2008,6 @@ function is_developer() {
function load_contact_links($uid) {
- $a = get_app();
$ret = array();
@@ -1977,7 +2016,7 @@ function load_contact_links($uid) {
// logger('load_contact_links');
- $r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d ",
+ $r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d ",
intval($uid)
);
if($r) {
@@ -2000,6 +2039,7 @@ function load_contact_links($uid) {
*
* @return string
*/
+
function build_querystring($params, $name = null) {
$ret = '';
foreach($params as $key => $val) {
@@ -2042,8 +2082,9 @@ function dba_timer() {
/**
* @brief Returns xchan_hash from the observer.
*
- * @return string Empty if no observer, otherwise xchan_hash from observer
+ * @return empty string if no observer, otherwise xchan_hash from observer
*/
+
function get_observer_hash() {
$observer = App::get_observer();
if(is_array($observer))
@@ -2097,7 +2138,8 @@ function get_custom_nav(&$a, $navname) {
* @param App &$a global application object
*/
function load_pdl(&$a) {
- require_once('include/comanche.php');
+
+ App::$comanche = new Zotlabs\Render\Comanche();
if (! count(App::$layout)) {
@@ -2106,7 +2148,7 @@ function load_pdl(&$a) {
$layout = $arr['layout'];
$n = 'mod_' . App::$module . '.pdl' ;
- $u = comanche_get_channel_id();
+ $u = App::$comanche->get_channel_id();
if($u)
$s = get_pconfig($u, 'system', $n);
if(! $s)
@@ -2115,19 +2157,16 @@ function load_pdl(&$a) {
if((! $s) && (($p = theme_include($n)) != ''))
$s = @file_get_contents($p);
if($s) {
- comanche_parser($a, $s);
+ App::$comanche->parse($s);
App::$pdl = $s;
}
}
-
}
function exec_pdl(&$a) {
- require_once('include/comanche.php');
-
if(App::$pdl) {
- comanche_parser($a, App::$pdl,1);
+ App::$comanche->parse(App::$pdl,1);
}
}
@@ -2161,7 +2200,9 @@ function construct_page(&$a) {
}
}
- if (($p = theme_include(current_theme() . '.js')) != '')
+ $current_theme = Zotlabs\Render\Theme::current();
+
+ if (($p = theme_include($current_theme[0] . '.js')) != '')
head_add_js($p);
if (($p = theme_include('mod_' . App::$module . '.php')) != '')
@@ -2175,14 +2216,14 @@ function construct_page(&$a) {
head_add_css(((x(App::$page, 'template')) ? App::$page['template'] : 'default' ) . '.css');
head_add_css('mod_' . App::$module . '.css');
- head_add_css(current_theme_url($installing));
+ head_add_css(Zotlabs\Render\Theme::url($installing));
head_add_js('mod_' . App::$module . '.js');
App::build_pagehead();
if(App::$page['pdl_content']) {
- App::$page['content'] = comanche_region($a,App::$page['content']);
+ App::$page['content'] = App::$comanche->region(App::$page['content']);
}
// Let's say we have a comanche declaration '[region=nav][/region][region=content]$nav $content[/region]'.
@@ -2203,7 +2244,7 @@ function construct_page(&$a) {
foreach(App::$layout as $k => $v) {
if((strpos($k, 'region_') === 0) && strlen($v)) {
if(strpos($v, '$region_') !== false) {
- $v = preg_replace_callback('/\$region_([a-zA-Z0-9]+)/ism', 'comanche_replace_region', $v);
+ $v = preg_replace_callback('/\$region_([a-zA-Z0-9]+)/ism', array(App::$comanche,'replace_region'), $v);
}
// And a couple of convenience macros
@@ -2241,6 +2282,12 @@ function construct_page(&$a) {
$page = App::$page;
$profile = App::$profile;
+ // There's some experimental support for right-to-left text in the view/php/default.php page template.
+ // In v1.9 we started providing direction preference in the per language hstrings.php file
+ // This requires somebody with fluency in a RTL language to make happen
+
+ $page['direction'] = 0; // ((App::$rtl) ? 1 : 0);
+
header("Content-type: text/html; charset=utf-8");
// security headers - see https://securityheaders.io
@@ -2281,7 +2328,6 @@ function appdirpath() {
* @param string $icon
*/
function head_set_icon($icon) {
- global $a;
App::$data['pageicon'] = $icon;
// logger('head_set_icon: ' . $icon);
@@ -2293,7 +2339,6 @@ function head_set_icon($icon) {
* @return string absolut path to pageicon
*/
function head_get_icon() {
- global $a;
$icon = App::$data['pageicon'];
if(! strpos($icon, '://'))
@@ -2359,7 +2404,7 @@ function z_get_temp_dir() {
}
function z_check_cert() {
- $a = get_app();
+
if(strpos(z_root(),'https://') !== false) {
$x = z_fetch_url(z_root() . '/siteinfo/json');
if(! $x['success']) {
@@ -2380,8 +2425,6 @@ function z_check_cert() {
*/
function cert_bad_email() {
- $a = get_app();
-
$email_tpl = get_intltext_template("cert_bad_eml.tpl");
$email_msg = replace_macros($email_tpl, array(
'$sitename' => App::$config['system']['sitename'],
@@ -2402,26 +2445,32 @@ function cert_bad_email() {
*/
function check_cron_broken() {
- $t = get_config('system','lastpollcheck');
+ $d = get_config('system','lastcron');
+
+ if((! $d) || ($d < datetime_convert('UTC','UTC','now - 4 hours'))) {
+ Zotlabs\Daemon\Master::Summon(array('Cron'));
+ set_config('system','lastcron',datetime_convert());
+ }
+
+ $t = get_config('system','lastcroncheck');
if(! $t) {
// never checked before. Start the timer.
- set_config('system','lastpollcheck',datetime_convert());
+ set_config('system','lastcroncheck',datetime_convert());
return;
}
+
if($t > datetime_convert('UTC','UTC','now - 3 days')) {
// Wait for 3 days before we do anything so as not to swamp the admin with messages
return;
}
- $d = get_config('system','lastpoll');
+ set_config('system','lastcroncheck',datetime_convert());
+
if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) {
// Scheduled tasks have run successfully in the last 3 days.
- set_config('system','lastpollcheck',datetime_convert());
return;
}
- $a = get_app();
-
$email_tpl = get_intltext_template("cron_bad_eml.tpl");
$email_msg = replace_macros($email_tpl, array(
'$sitename' => App::$config['system']['sitename'],
@@ -2435,8 +2484,16 @@ function check_cron_broken() {
'From: Administrator' . '@' . App::get_hostname() . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
- set_config('system','lastpollcheck',datetime_convert());
return;
}
+
+function observer_prohibited($allow_account = false) {
+
+ if($allow_account)
+ return (((get_config('system','block_public')) && (! get_account_id()) && (! remote_channel())) ? true : false );
+ return (((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) ? true : false );
+
+}
+
diff --git a/doc/Privacy.md b/doc/Privacy.md
index 511293c52..089977d7e 100644
--- a/doc/Privacy.md
+++ b/doc/Privacy.md
@@ -42,11 +42,11 @@ You MAY additionally provide other profile information. Any information which yo
Content you provide (status posts, photos, files, etc.) belongs to you. The $Projectname default is to publish content openly and visible to anybody on the internet (PUBLIC). You MAY control this in your channel settings and restrict the default permissions or you MAY restrict the visibility of any single published item separately (PRIVATE). $Projectname developers will ensure that restricted content is ONLY visible to those in the restriction list - to the best of their ability.
-Content (especially status posts) that you share with other networks or that you have made visible to anybody on the internet (PUBLIC) cannot easily be taken back once it has been published. It MAY be shared with other networks and made available through RSS/Atom feeds. It may also be syndicated on other $Projectname sites. It MAY appear on spy networks and internet searches. If you do not wish this default behaviour please adjust your channel settings and restrict who can see your content.
+Content (especially status posts) that you share with other networks or that you have made visible to anybody on the internet (PUBLIC) cannot easily be taken back once it has been published. It MAY be shared with other networks and made available through RSS/Atom feeds. It may also be syndicated on other $Projectname sites. It MAY appear on other networks and websites and be visible in internet searches. If you do not wish this default behaviour please adjust your channel settings and restrict who can see your content.
**Comments and Forum posts**
-Comments to posts that were created by others and posts which are designated as forum posts belong to you as the creator/author, but the distribution of these posts is not under your direct control. These posts/comments MAY be re-distributed to others, and MAY be visible to anybody on the internet. In the case of comments, the creator of the "first message" in the thread to which you are replying controls the distribution of all comments and replies to that message.
+Comments to posts that were created by others and posts which are designated as forum posts belong to you as the creator/author, but the distribution of these posts is not under your direct control, and you relinquish SOME rights to these items. These posts/comments MAY be re-distributed to others, and MAY be visible to anybody on the internet. In the case of comments, the creator of the "first message" in the thread (conversation) to which you are replying controls the distribution of all comments and replies to that message. They "own" and therefore have certain rights with regard to the entire conversation (including all comments contained within it). You can still edit or delete the comment, but the conversation owner also has rights to edit, delete, re-distribute, and backup/restore any or all the content from the conversation.
**Private Information**
diff --git a/doc/Webpages.md b/doc/Webpages.md
index dafd3661d..801a9a3a0 100644
--- a/doc/Webpages.md
+++ b/doc/Webpages.md
@@ -1,7 +1,7 @@
Creating Webpages
=================
-Red enables users to create static webpages. To activate this feature, enable the web pages feature in your Additional Features section.
+Hubzilla enables users to create static webpages. To activate this feature, enable the web pages feature in your Additional Features section.
Once enabled, a new tab will appear on your channel page labelled "Webpages". Clicking this link will take you to the webpage editor. Here you can create a post using either BBCode or the rich text editor.
diff --git a/doc/acl_dialog_post.html b/doc/acl_dialog_post.html
new file mode 100644
index 000000000..80b2c68b6
--- /dev/null
+++ b/doc/acl_dialog_post.html
@@ -0,0 +1,16 @@
+
+
+Post Permissions
+
+The permissions dialog lets you select which channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your Friends group except the friend you are surprising. In this case you "Show" the Friends group but "Don't show" that one person.
+
+
+- Tip!
+
- The border color of each channel indicates whether that channel — or one of the groups it's a member of — will have access to the post. The border color will also indicate when a channel, or group it belongs to, has been explicitly set to "Don't show".
+
+
+Why can't I edit a post's permissions after I saved it?
+
+You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Hubzilla servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Hubzilla posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it.
+If a posting is public this is even harder, as the Hubzilla is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post.
\ No newline at end of file
diff --git a/doc/addons.bb b/doc/addons.bb
index 67282521f..b83b3276a 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -2,10 +2,12 @@
[list=1]
[*] abcjsplugin - Create musical scores in your posts
[*] adultphotoflag - prevents nsfw photos from being displayed in public albums
+[*] b2tbtn - provide button to go directly to top of page if you are scrolled a long way down
[*] bbmath - use complex math expressions in your posts
[*] bookmarker - replace #^ with bookmark link in posts
[*] buglink - provide a bug reporting icon in the lower-left corner of every page
[*] calc - a scientific calculator
+[*] cdav - CalDAV/CardDAV server
[*] chess - cross domain identity aware interactive chess games
[*] chords - generate fingering charts and alternatives for every known guitar chord
[*] custom_home - set a custom page as the hub start page
@@ -13,18 +15,24 @@
[*] diaspora - Diaspora protocol emulator
[*] diaspost - crosspost to a Diaspora account (different from the Diaspora protocol emulator)
[*] dirstats - show some interesting statistics generated by the driectory server
+[*] docs - alternate documentation pages
[*] donate - provides a project donation page
[*] dwpost - crosspost to Dreamwidth
+[*] embedphotos - tool to embed photos from your albums in a post
[*] extcron - use an external cron service to run your hub's scheduled tasks
[*] flattrwidget - provides a "Flattr Us" button
[*] flip - create upside down text
[*] fortunate - displays random quote (fortune cookie). Requires setting up a fortune server.
+[*] friendica - Friendica (DFRN) protocol. Under development.
[*] frphotos - import photo albums from Friendica
+[*] gnusoc - GNU-Social (OStatus) protocol. Under development.
[*] hexit - headecimal conversion tool
+[*] hubwall - send an admin email to all hub accounts
[*] ijpost - crosspost to Insanejournal
[*] irc - connect to IRC chatrooms
[*] jappixmini - XMPP chat
-[*] jsupload - (recommended) upload multiple photos to photo albums at once.
+[*] jsupload - upload multiple photos to photo albums at once.
+[*] keepout - prevents nearly all use of site when not logged in, more restrictive than 'block public' setting
[*] ldapauth - login via account on LDAP or Windows Active Directory domain
[*] libertree - crosspost to Libertree
[*] likebanner - create a "like us on red#matrix" banner image
@@ -32,6 +40,7 @@
[*] logrot - logfile rotation utility
[*] mahjongg - Chinese puzzle game
[*] mailhost - when using multiple channel clones, select one to receive email notifications
+[*] metatag - provide SEO friendly pages
[*] mayan_places - set location field to a random city in the Mayan world
[*] morechoice - additional gender/sexual-preference choices for profiles (not safe for work)
[*] moremoods - Additional mood options
@@ -60,6 +69,7 @@
[*] startpage - set a personal preferred page to redirect after logging in.
[*] statistics_json - Diaspora statistics generator
[*] statusnet - GNU-social and StatusNet crosspost [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl]
+[*] std_embeds - allow unfiltered embeds for popular providers like youtube, vimeo and soundcloud
[*] superblock - Highly recommended - completely block an offensive channel from your stream
[*] testdrive - Turns your hub into a test drive site with accounts that expire after a trail period.
[*] tictac - 3D tic-tac-toe
@@ -76,6 +86,13 @@
[h3]Addon Repositories[/h3]
+We [b]strongly recommend[/b] that authors of addons publish/submit them to the project addon repository. This has several advantages. Project developers can easily fix security flaws and make changes to comply with recent changes in core code. Addons provided in third-party repositories are considered untrusted. If the project core code changes in an incompatible way, there may be no alternative but to physically remove or rename the addon files in order to get your site working again. Often only the plugin/addon author can help you regain control of your website, and project developers are unable to assist you; because by definition your site configuration has been modified in ways that we cannot easily test or verify.
+
+For these reasons we [b]strongly recommend[/b] that you do NOT install addons from third-party repositories.
+
+We also recognise that some developers prefer working on their own and do not wish their code to be mingled with the project repository for a variety of reasons. These developers can ease troubleshooting and debugging by providing a README file in their respective code repository outlining the process for submitting patches and bug fixes. It is also recommended that these projects provide both a 'dev' (development) and 'master' (production) branch which tracks the current project branches of those names. This is because dev and master are often not compatible from the viewpoint of library interfaces. It is also highly recommended that your repository versions are tagged and moved forward within 24 hours of project releases. This is a major inconvenience for everybdy involved, and can present downtime for production sites while this process is being carried out; which is one more reason why we [b]strongly recommend[/b] that addons be submitted to the project addon repository and that you do NOT install such third-party addons.
+
+
[url=https://github.com/redmatrix/hubzilla-addons]https://github.com/redmatrix/hubzilla-addons[/url] Main project addon repository
[url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip)
diff --git a/doc/admins.bb b/doc/admins.bb
index 484212024..6c78ce999 100644
--- a/doc/admins.bb
+++ b/doc/admins.bb
@@ -1,15 +1,15 @@
[h2]Documentation for Hub Administrators[/h2]
-
-[h3]Administrators[/h3]
-
+[h3]Deploying your hub[/h3]
[zrl=[baseurl]/help/install]Install[/zrl]
[zrl=[baseurl]/help/red2pi]Installing $Projectname on the Raspberry Pi[/zrl]
[zrl=[baseurl]/help/Hubzilla_on_OpenShift]$Projectname on OpenShift[/zrl]
+[h3]Taking care of your hub[/h3]
[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]
+[zrl=[baseurl]/help/theme_management]Theme Management[/zrl]
[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl]
-[zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
[zrl=[baseurl]/help/service_classes]Service Classes[/zrl]
[zrl=[baseurl]/help/directories]Working with and configuring Directories[/zrl]
-[zrl=[baseurl]/help/theme_management]Theme Management[/zrl]
-
+[h3]Frequently asked questions[/h3]
+[zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/bbcode.html b/doc/bbcode.html
index 3e9bda1d9..7a2c969eb 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -14,6 +14,7 @@
[img float=right]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] 
[code]code[/code] code
+ [code=xxx]syntax highlighted code[/code] supported languages php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh
[quote]quote[/quote] quote
[quote=Author]Author? Me? No, no, no...[/quote]
Author wrote:Author? Me? No, no, no...
[nobb] may be used to escape bbcode.
@@ -27,12 +28,31 @@
[list=a]
[list=A]
[ul]
- [ol]
+ [ol]
+ [dl]
+ [dl terms="biumlh"] — where style of the terms can be any combination of:
+
+ - b
- bold
+ - i
- italic
+ - u
- underline
+ - m
- monospace
+ - l
- large
+ - h
- horizontal — like this defintion list
+
+
For example:
[ul]
[*] First list element
[*] Second list element
[/ul]
Will render something like:
- First list element
- - Second list element
+ Second list element
+
+or
[dl terms="b"]
[*= First element term] First element description
[*= Second element term] Second element description
[/dl]
Will render something like:
+
+- First element term
- First element description
+- Second element term
- Second element description
+
+
+
There's also:
- [hr]
@@ -64,7 +84,7 @@
- [spoiler] for hiding spoilers
- [rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional
-- [qr]text to post[/qr] - create a QR code.
+- [qr]text to post[/qr] - create a QR code (if the qrator plugin is installed).
- [toc] - create a table of content in a webpage. Please refer to the original jquery toc to get more explanations.
- Optional param: 'data-toc'. If ommited the default is 'body'
diff --git a/doc/bugs.bb b/doc/bugs.bb
index 1a27e66ba..f50337648 100644
--- a/doc/bugs.bb
+++ b/doc/bugs.bb
@@ -5,11 +5,6 @@
Hubzilla Community Server is open source software which is maintained by "the community" - essentially unpaid volunteers.
-[b]Hubzilla Enterprise Server[/b]
-
-Hubzilla Enterprise Server is commercial software with a variety of support plans depending on the specific license terms.
-
-
The first thing you need to do is talk to your hub administrator - the person who runs and manages your site. They are in the unique position of having access to the internal software and database and [b]logfiles[/b] and will need to be involved in fixing your problem. Other people "on the net" can't really help with this. The first thing the hub administrator needs to do is look at their logs and/or try to reproduce the problem. So try to be as helpful and courteous as possible in helping them look into the problem.
To find your hub administrator (if you don't know who they are) please look at [url=[baseurl]/siteinfo]this page[/url]. If they have not provided any contact info on that page or provided an "Impressum" there, see [url=[baseurl]/siteinfo/json]this site info summary[/url] under the heading "admin:".
@@ -24,13 +19,6 @@ If you get a blank white screen when doing something, this is almost always a co
[h3]I'm stumped. I can't figure out what is wrong.[/h3]
-[b]Hubzilla Enterprise Server[/b]
-
-Please make contact with the vendor - who will have provided you with support contact details. Preferably this contact will be made by the hub administrator so that he/she can assist us in collecting the necessary issue details. We will assign a ticket and notify you of progress.
-
-
-[b]Hubzilla Community Server[/b]
-
At this point it might be worthwhile discussing the issue on one of the online forums. There may be several of these and some may be more suited to your spoken language. As a last resort, try "Channel One", which is in English.
If the community developers can't help you right away, understand that they are volunteers and may have a lot of other work and demands on their time. At this point you need to file a bug report. You will need an account on github.com to do this. So register, and then visit https://github.com/redmatrix/hubzilla/issues
@@ -39,7 +27,5 @@ If the community developers can't help you right away, understand that they are
Then you wait. If it's a high profile issue, it may get fixed quickly. But nobody is in charge of fixing bugs. If it lingers without resolution, please spend some more time investigating the problem. Ask about anything you don't understand related to the behaviour. You will learn more about how the software works and quite possibly figure out why it isn't working now. Ultimately it is somebody in the community who is going to fix this and you are a member of the community; and this is how the open source process works.
-[b]In either case[/b]
-
-Other developers working to fix the problem may need to find out more, so do your homework and document what is happening and everything you've tried. Don't say "I did xyz and it didn't work." That doesn't tell us anything. Tell us precisely what steps you took and what you expected the result to be, and precisely what happened as a result. If there were any error messages, don't say "there was an error message". Tell us exactly what the message said.
+Other developers working to fix the problem may need to find out more, so do your homework and document what is happening and everything you've tried. Don't say "I did xyz and it didn't work." That doesn't tell us anything. Tell us precisely what steps you took and what you expected the result to be, and precisely what happened as a result. If there were any error messages, don't say "there was an error message". Tell us exactly what the message said. Tell us what version you're running and any other details that may be unique about your site configuration.
\ No newline at end of file
diff --git a/doc/ca/develop.bb b/doc/ca/develop.bb
index 7e82049c7..bc709963c 100644
--- a/doc/ca/develop.bb
+++ b/doc/ca/develop.bb
@@ -26,9 +26,6 @@
[zrl=[baseurl]/help/git_for_non_developers]Git per a No-Desenvolupadors[/zrl]
[zrl=[baseurl]/help/dev_beginner]Manual pas-a-pas per a desenvolupadors principiants[/zrl]
-[h3]Preguntes Més Freqüents (FAQ) Per Desenvolupadors[/h3]
-[zrl=[baseurl]/help/faq_developers]FAQ Per Desenvoupadors[/zrl]
-
[h3]Recursos Externs[/h3]
[url=https://zothub.com/channel/one]Development Channel[/url]
[url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url]
diff --git a/doc/channels.bb b/doc/channels.bb
index 4b47b61dc..14d588266 100644
--- a/doc/channels.bb
+++ b/doc/channels.bb
@@ -1,19 +1,23 @@
-[b]Channels[/b]
+[h2]Channels[/h2]
+
+[h3]What are channels?[/h3]
Channels are simply collections of content stored in one place. A channel can represent anything. It could represent you, a website, a forum, photo albums, anything. For most people, their first channel with be "Me".
The most important features for a channel that represents "me" are:
+[ul]
+[*]Secure and private "spam free" communications
-Secure and private "spam free" communications
+[*]Identity and "single-signon" across the entire network
-Identity and "single-signon" across the entire network
-
-Privacy controls and permissions which extend to the entire network
-
-Directory services (like a phone book)
+[*]Privacy controls and permissions which extend to the entire network
+[*]Directory services (like a phone book)
+[/ul]
In short, a channel that represents yourself is "me, on the internet".
+[h3]Creating channels[/h3]
+
You will be required to create your first channel as part of the sign up process. You can also create additonal channels from the "Select channel" link.
You will be asked to provide a channel name, and a short nick name. For a channel that represents yourself, it is a good idea to use your real name here to ensure your friends can find you, and connect to your channel. The short nickname will be used to generate a "webbie". This is a bit like a username, and will look like an email address, taking the form nickname@domain. You should put a little thought into what you want to use here. Imagine somebody asking for your webbie and having to tell them it is "llamas-are_kewl.123". "llamasarecool" would be a much better choice.
@@ -22,9 +26,14 @@ Once you have created your channel, you will be taken to the settings page, wher
Once you have done this, your channel is ready to use. At [observer=1][observer.url][/observer][observer=0]example.com/channel/username[/observer] you will find your channel "stream". This is where your recent activity will appear, in reverse chronological order. If you post in the box marked "share", the entry will appear at the top of your stream. You will also find links to all the other communication areas for this channel here. The "About" tab contains your "profile", the photos page contain photo albums, and the events page contains events share by both yourself and your contacts.
+[h3]The grid, permissions and delegation[/h3]
+
The "Grid" page contains all recent posts from across the $Projectname network, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts.
-As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the permissions section.
+As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the [zrl=[baseurl]/help/roles]permissions section[/zrl].
+
+You can also delegate control of your channels' posts and connections, but not its configurations, to another channel. That is done by editing a connection and assigning it the permission to administer your channel's resources.
#include doc/macros/main_footer.bb;
+
diff --git a/doc/classRedmatrix_1_1Import_1_1Import-members.html b/doc/classRedmatrix_1_1Import_1_1Import-members.html
deleted file mode 100644
index d5e2f9277..000000000
--- a/doc/classRedmatrix_1_1Import_1_1Import-members.html
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
-
-
-The Hubzilla: Member List
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
- The Hubzilla
-
-
-
-
-
-
-
-
-
-
-
- - Main Page
- - Related Pages
- - Namespaces
- - Classes
- - Files
- -
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Hubzilla\Import\Import Member List
-
-
-
-This is the complete list of members for Hubzilla\Import\Import, including all inherited members.
-
- $credentials Hubzilla\Import\Import private $itemlist Hubzilla\Import\Import protected $items Hubzilla\Import\Import protected $src_items Hubzilla\Import\Import protected convert_child($child) Hubzilla\Import\Import convert_item($item_ident) Hubzilla\Import\Import convert_taxonomy($item_ident) Hubzilla\Import\Import get_children($item_ident) Hubzilla\Import\Import get_credentials() Hubzilla\Import\Import get_item($item_ident) Hubzilla\Import\Import get_item_ident($item) Hubzilla\Import\Import get_itemlist() Hubzilla\Import\Import get_taxonomy($item_ident) Hubzilla\Import\Import run() Hubzilla\Import\Import store($item, $update=false) Hubzilla\Import\Import
-
\ No newline at end of file
diff --git a/doc/classRedmatrix_1_1Import_1_1Import.html b/doc/classRedmatrix_1_1Import_1_1Import.html
deleted file mode 100644
index 9a7128d65..000000000
--- a/doc/classRedmatrix_1_1Import_1_1Import.html
+++ /dev/null
@@ -1,446 +0,0 @@
-
-
-
-
-
-
-The Hubzilla: Hubzilla\Import\Import Class Reference
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- The Hubzilla
-
-
-
-
-
-
-
-
-
-
-
- - Main Page
- - Related Pages
- - Namespaces
- - Classes
- - Files
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Hubzilla\Import\Import Class Reference
-
-
-
-
-Public Member Functions
get_credentials () get_itemlist () get_item_ident ($item) get_item ($item_ident) get_taxonomy ($item_ident) get_children ($item_ident) convert_item ($item_ident) convert_taxonomy ($item_ident) convert_child ($child) store ($item, $update=false) run ()
-
-Protected Attributes
$itemlist = null $src_items = null $items = null
-
-Private Attributes
$credentials = null
-Member Function Documentation
-
-
-
-
-
- Hubzilla\Import\Import::convert_child
- (
-
- $child )
-
-
-
-
-Referenced by Hubzilla\Import\Import\run().
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::convert_item
- (
-
- $item_ident )
-
-
-
-
-Referenced by Hubzilla\Import\Import\run().
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::convert_taxonomy
- (
-
- $item_ident )
-
-
-
-
-Referenced by Hubzilla\Import\Import\run().
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::get_children
- (
-
- $item_ident )
-
-
-
-
-Referenced by Hubzilla\Import\Import\run().
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::get_credentials
- (
- )
-
-
-
-
-Referenced by Hubzilla\Import\Import\run().
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::get_item
- (
-
- $item_ident )
-
-
-
-
-Referenced by Hubzilla\Import\Import\run().
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::get_item_ident
- (
-
- $item )
-
-
-
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::get_itemlist
- (
- )
-
-
-
-
-Referenced by Hubzilla\Import\Import\run().
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::get_taxonomy
- (
-
- $item_ident )
-
-
-
-
-Referenced by Hubzilla\Import\Import\run().
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::run
- (
- )
-
-
-
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::store
- (
-
- $item,
-
-
-
- $update = false
-
-
- )
-
-
-
-
-
-
-Member Data Documentation
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::$credentials = null
-
-
-
-
-private
-
-
-
-
-Referenced by Hubzilla\Import\Import\get_credentials().
-
-
-
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::$itemlist = null
-
-
-
-
-protected
-
-
-
-
-Referenced by Hubzilla\Import\Import\get_itemlist().
-
-
-
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::$items = null
-
-
-
-
-protected
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hubzilla\Import\Import::$src_items = null
-
-
-
-
-protected
-
-
-
-
-
-
-
The documentation for this class was generated from the following file:
-- include/Import/Importer.php
-
-
-
\ No newline at end of file
diff --git a/doc/context/admin/security/help.html b/doc/context/admin/security/help.html
deleted file mode 100644
index e9a741a5e..000000000
--- a/doc/context/admin/security/help.html
+++ /dev/null
@@ -1,3 +0,0 @@
-Security Settings
-This page contains various administrator settings related to security.
-To save any changes you make to these settings, you must press the Submit button.
\ No newline at end of file
diff --git a/doc/context/channel/help.html b/doc/context/channel/help.html
deleted file mode 100644
index 810913ff3..000000000
--- a/doc/context/channel/help.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- - General
- - This is the home page of a channel. It is similar to someone's profile "wall" in a social network context. Posts created by the channel are displayed according to the observer's viewing permissions.
- - Create a Post
- - If you have permission to create posts on the channel page, then you will see the post editor at the top.
- - Channel Content Tabs
- - The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
-
\ No newline at end of file
diff --git a/doc/context/cloud/help.html b/doc/context/cloud/help.html
deleted file mode 100644
index 105947517..000000000
--- a/doc/context/cloud/help.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- - General
- - This page displays a channel's "cloud" files. The files visible to the observer depend on the individual file permissions set by the channel owner. If you have permission to create/upload files you will see control buttons above the file list.
- - Channel Content Tabs
- - The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
-
\ No newline at end of file
diff --git a/doc/context/de/admin/logs/help.html b/doc/context/de/admin/logs/help.html
new file mode 100644
index 000000000..1441d9075
--- /dev/null
+++ b/doc/context/de/admin/logs/help.html
@@ -0,0 +1,8 @@
+
+ - Allgemein
+ - Auf dieser Seite können die Einstellungen zur Protokollierung angepasst und vorhandene Protokolle angezeigt werden.
+ - Protokoll Einstellungen
+ - Bei aktivierter Debugging-Option werden System-Log Informationen an die Datei in der Protokolldatei im EIngabefeld hinzugefügt. Der Pfad ist relativ zum Hub-Wurzelverzeichnis. Daauf achten, dass diese Datei vom Webserver geschrieben werden kann.
+ - Protokollstufe
+ - Die Protokollstufe bestimmt, wie viele Informationen an die Protokolldatei angefügt werden. Warnung: Eine hohe Protokollstufe kann sehr schnell die Größe der Protokolldatei anwachsen lassen, vor allem, wenn der Hub viele Mitglieder hat.
+
diff --git a/doc/context/de/admin/queue/help.html b/doc/context/de/admin/queue/help.html
new file mode 100644
index 000000000..e59fdcaee
--- /dev/null
+++ b/doc/context/de/admin/queue/help.html
@@ -0,0 +1,4 @@
+
+ - Allgemein
+ - Die Warteschlangenstatistik zeigt, wie viele Nachrichten zur Auslieferung an andere Hubs noch in der Warteschlange stehen. Die Priorität steht in Beziehung mit der Anzahl fehlgeschlagener Auslieferungsversuche.
+
diff --git a/doc/context/de/admin/security/help.html b/doc/context/de/admin/security/help.html
new file mode 100644
index 000000000..6465e8f0e
--- /dev/null
+++ b/doc/context/de/admin/security/help.html
@@ -0,0 +1,4 @@
+
+ - Allgemein
+ - Auf dieser Seite können verschiedene Sicherheitseinstellungen vorgenommen werden. Um geänderte Einstellungen zu speichern, muss der Knopf "Bestätigen" gedrückt werden.
+
diff --git a/doc/context/de/channel/help.html b/doc/context/de/channel/help.html
new file mode 100644
index 000000000..fbfcac3c1
--- /dev/null
+++ b/doc/context/de/channel/help.html
@@ -0,0 +1,8 @@
+
+ - Allgemein
+ - Auf dieser Seite wird der eigene aktuelle Kanal angezeigt. Dies entspricht ungefähr den Profilseiten in anderen sozialen Netzwerken. Im Kanal veröffentliche Beiträge werden gemäß den Anzeige-Berechtigungen des Betrachters angezeigt.
+ - Beitrag anlegen
+ - Falls der Betrachter/Besucher die Berechtigung zum Anlegen von Beiträgen besitzt, wird im oberen Bereich der Beitragseditor angezeigt.
+ - Kanal-Inhalte-Tabs
+ - Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
+
diff --git a/doc/context/de/chat/help.html b/doc/context/de/chat/help.html
new file mode 100644
index 000000000..ba355365f
--- /dev/null
+++ b/doc/context/de/chat/help.html
@@ -0,0 +1,8 @@
+
+ - Allgemein
+ - Chaträume können angelegt und für die Echtzeit-Kommunikation verwendet werden. Die Zugriffskontrolle verwendet dabei das Hubzilla-Berechtigungssystem.
+ - Chatraum anlegen
+ - Über den Knopf "Neu anlegen" wird ein neuer Chatraum eröffnet. Hierfür einen Namen und angeben, wie lange Nachrichten aufbewahrt werden sollen.
+ - Chatten
+ - Die Nachricht in der der Nachrichtenbox eingeben und "Bestätigen" drücken. Über den Menüknopf neben "Bestätigen" kann ein Anwesenheitsstatus gesetzt werden. Andere Teilnehmer am Chatraum werden im Seitenpanel unter "Chatmitglieder" angezeigt.
+
diff --git a/doc/context/de/cloud/help.html b/doc/context/de/cloud/help.html
new file mode 100644
index 000000000..e72ad1743
--- /dev/null
+++ b/doc/context/de/cloud/help.html
@@ -0,0 +1,6 @@
+
+ - Allgemein
+ - Diese Seite zeigt die veröffentlichten und geteilten Dateien des Kanals an. Welche Dateien ein Besucher sehen kann, wird über die individuellen Dateiberechtigungen bestimmt, die vom Kanal-Besitzer bestimmt werden. Wurde die Berechtigung zum Anlegen/Hochladen von Dateien vergeben, werden die entsprechenden Steuerungsknöpfe angezeigt.
+ - Kanal-Inhalte-Tabs
+ - Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
+
diff --git a/doc/context/de/connections/help.html b/doc/context/de/connections/help.html
new file mode 100644
index 000000000..61789ea38
--- /dev/null
+++ b/doc/context/de/connections/help.html
@@ -0,0 +1,8 @@
+
+ - Allgemein
+ - Auf dieser Seite werden die Verbindungen des Kanals angezeigt. Diese Liste kann sortiert und gefilter werden über den Menüknopf neben dem Suchknopf.
+ - Verbindungsdetails
+ - Jeder Eintrag in der Liste zeigt die Details einer Verbindung. Ein durchsichtiges (ausgegrautes) Avatar-Bild zeigt archivierte Verbindungen an (diese konnten min. 30 Tage nicht erreicht werden).
+ - Verbindungsstatus
+ - Eine Verbindung kann sich in verschiedenen Stati befinden:
- Archiviert
- Ignoriert
- Blockiert
- Versteckt
+
diff --git a/doc/context/de/connections/ifpending/help.html b/doc/context/de/connections/ifpending/help.html
new file mode 100644
index 000000000..3e55b34c3
--- /dev/null
+++ b/doc/context/de/connections/ifpending/help.html
@@ -0,0 +1,8 @@
+
+ - Allgemein
+ - Auf dieser Seite werden Verbindungswünsche von anderen Kanälen an diesen Kanal angezeigt. Diese Liste kann sortiert und gefilter werden über den Menüknopf neben dem Suchknopf.
+ - Verbindungsdetails
+ - Jeder Eintrag in der Liste zeigt die Details einer Verbindung. Ein durchsichtiges (ausgegrautes) Avatar-Bild zeigt archivierte Verbindungen an (diese konnten min. 30 Tage nicht erreicht werden).
+ - Verbindungsstatus
+ - Eine Verbindung kann sich in verschiedenen Stati befinden:
- Archiviert
- Ignoriert
- Blockiert
- Versteckt
+
diff --git a/doc/context/de/events/help.html b/doc/context/de/events/help.html
new file mode 100644
index 000000000..b0dc95b3e
--- /dev/null
+++ b/doc/context/de/events/help.html
@@ -0,0 +1,8 @@
+
+ - Allgemein
+ - Auf dieser Seite wird ein Kalender mit eigenen und von anderen verbundenen Kanälen geteilte Ereignisse angezeigt.
+ - Kalenderanzeige
+ - Die Monats-, Wochen- und Tagesansicht des Kalenders kann im Panel ausgewählt werden.
+ - Export/Import
+ - Kalendereinträge können Eim Standard-Format iCalendar (.ics) exportiert oder importiert werden.
+
diff --git a/doc/context/de/mail/help.html b/doc/context/de/mail/help.html
new file mode 100644
index 000000000..b89135d8c
--- /dev/null
+++ b/doc/context/de/mail/help.html
@@ -0,0 +1,12 @@
+
+ - Allgemein
+ - Die Privaten Nachrichten sind nur für den Kanal-Besitzer und den Empfänger sichtbar.
+ - Konversationen
+ - Über Konversationen kann eine vollständige fortlaufene Ansicht einer Konversation angezeigt werden. Verfügbare Konversationen werden unter dem Punkt Konversationen im Panel angezeigt.
+ - Eingang/Ausgang
+ - Einzelne versandte Nachrichten kännen über den Punkt Ausgang und empfangene Nachrichten über Eingang gefiltert dargestellt werden.
+ - Neue Nachricht
+ - Ãœber Neue Nachricht kann eine neue Nachricht erstellt werden.
+ - Sonstiges
+ - Über das Menü einzelner Nachrichten können besondere Funktionen ausgelöst werden: Zustellungsbericht kann abgerufen werden, Nachrichten (die noch nicht angesehen wurden!) können widerrufen und gelöscht werden.
+
diff --git a/doc/context/de/network/help.html b/doc/context/de/network/help.html
new file mode 100644
index 000000000..6590f597d
--- /dev/null
+++ b/doc/context/de/network/help.html
@@ -0,0 +1,10 @@
+
+ - Allgemein
+ - Auf der Netzwerkseite wird der Strom von Beiträgen und Konversationen angezeigt. Typischerweise wird nach kürzlich aktualisierten Beiträgen sortiert. Diese Seite kann sehr weitgehend angepasst werden.
+ - Beitrag anlegen
+ - Im oberen Bereich der Seite wird eine Textbox "Teilen" angezeigt. Nach Klick in diese Box wird der Beitragseditor angezeigt. Der Beitragseditor kann angepasst werden; in den Basiseinstellungen stehen Felder für Inhalt und einem optionalen Titel bereit. Knöpfe unterhalb des Inhaltes erleichtern die Eingabe von Formatierungen, Links, Bildern und anderen Daten im Beitrag. Über die Knöpfe im rechten Bereich kann eine Vorschau aktiviert, Berechtigungen gesetzt und der Beitrag abgesendet werden.
+ - Gruppen
+ - Die erstellten Gruppen werden im Panel angezeigt. Über die Gruppen kann nach Beiträgen von Gruppenmitgliedern gefiltert werden.
+ - Beitragsberechtigungen
+ - Die Zugriffskontrollliste (Access Control List; ACL) steuert, wer den Beitrag sehen darf. Nach Klick auf das Schloß neben dem Knopf "Teilen" öffnet sich ein Dialog, in dem Kanäle oder Gruppen ausgewählt werdenkönnen, die diesen Beitrag sehen dürfen. s kann auch gezielt verboten werden, dass ein Kanal oder eine Gruppe den Artikel sehen darf (nützlich beispielsweise für die Planung einer Überraschungsparty in einer Gruppe, in der der Überraschte Mitglied ist).
+
diff --git a/doc/context/de/photos/help.html b/doc/context/de/photos/help.html
new file mode 100644
index 000000000..437d2c369
--- /dev/null
+++ b/doc/context/de/photos/help.html
@@ -0,0 +1,6 @@
+
+ - Allgemein
+ - Diese Seite zeigt die veröffentlichten und geteilten Fotos des Kanals an. Welche Fotos ein Besucher sehen kann, wird über die individuellen Berechtigungen bestimmt, die vom Kanal-Besitzer bestimmt werden. Wurde die Berechtigung zum Anlegen/Hochladen von Bildern vergeben, werden die entsprechenden Steuerungsknöpfe angezeigt.
+ - Kanal-Inhalte-Tabs
+ - Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
+
diff --git a/doc/context/de/profile/help.html b/doc/context/de/profile/help.html
new file mode 100644
index 000000000..ece33457d
--- /dev/null
+++ b/doc/context/de/profile/help.html
@@ -0,0 +1,6 @@
+
+ - Allgemein
+ - Dies ist die Profilseite eines Kanals. Hier werden typischerweise Informationen angezeigt, die den Kanal beschreiben. Wenn der Kanal beispielsweise eine Person in einem sozialen Netzwerk repräsentiert, könnten Kontaktinformationen und andere persönliche Details hier veröffentlicht werden. Kanäle können mehrere Profile besitzen, die abhängig vom Betrachter/Besucher angezeigt werden.
+ - Kanal-Inhalte-Tabs
+ - Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
+
diff --git a/doc/context/de/wiki/help.html b/doc/context/de/wiki/help.html
new file mode 100644
index 000000000..e203ee221
--- /dev/null
+++ b/doc/context/de/wiki/help.html
@@ -0,0 +1,10 @@
+
+ - Allgemein
+ - Jedes Wiki ist eine Sammlung aus mit Markdown formatierten Seiten.
+ - Wiki Liste
+ - Wikis die dem eigenen Kanal gehören und mit der Berechtigung zum Anschauen, sind in der Seitenleiste gelistet.
+ - Seiten Versionen
+ - Jede Änderung einer Seite wird gespeichert, um eine schnelle Berichtigung zu ermöglichen. Klick auf das Versionsgeschichte Tab um den Verlauf der Seitenbearbeitung zu sehen, einschließlich Datum und Autor. Der Zurück-Knopf lädt die ausgewählte Änderung, aber ohne die Seite automatisch zu spreichern.
+ - Seiten
+ - Die Seiten des Wikis werden in Wiki Seiten gelistet. Vor dem Speichern einer Seite über das Seiten Dropdown Menu, hast Du die Möglichkeit eine Zusammenfassung der Änderungen einzutragen. Dieser Text wird anschließend unter Seiten Versionen in der Versionsgeschichte angezeigt.
+
\ No newline at end of file
diff --git a/doc/context/en/admin/logs/help.html b/doc/context/en/admin/logs/help.html
new file mode 100644
index 000000000..708ec9bde
--- /dev/null
+++ b/doc/context/en/admin/logs/help.html
@@ -0,0 +1,8 @@
+
+ - General
+ - This page allows you to adjust log settings and to view and existing log.
+ - Log Settings
+ - When you enable the Debugging option, system log information will begin appending to the file specified in the "Log File" box (path is relative to the hub root, for example /var/www). Note that this file must be writable by the web server.
+ - Log Level
+ - The log level option allows you to set how much information is appended to the log file. Warning: Increasing this level can quickly inflate the size of the log file to >100MB, especially on hubs with more than a few members.
+
\ No newline at end of file
diff --git a/doc/context/en/admin/queue/help.html b/doc/context/en/admin/queue/help.html
new file mode 100644
index 000000000..28885a154
--- /dev/null
+++ b/doc/context/en/admin/queue/help.html
@@ -0,0 +1,4 @@
+
+ - General
+ - The queue statistics display how many posts are in the queue for delivery to other hubs. The priority is related to how many times the delivery has been unsuccessfully attempted.
+
\ No newline at end of file
diff --git a/doc/context/en/admin/security/help.html b/doc/context/en/admin/security/help.html
new file mode 100644
index 000000000..bfe81b132
--- /dev/null
+++ b/doc/context/en/admin/security/help.html
@@ -0,0 +1,4 @@
+
+ - General
+ - This page contains various administrator settings related to security. To save any changes you make to these settings, you must press the Submit button.
+
\ No newline at end of file
diff --git a/doc/context/en/channel/help.html b/doc/context/en/channel/help.html
new file mode 100644
index 000000000..6e3181cbf
--- /dev/null
+++ b/doc/context/en/channel/help.html
@@ -0,0 +1,8 @@
+
+ - General
+ - This is the home page of a channel. It is similar to someone's profile "wall" in a social network context. Posts created by the channel are displayed according to the observer's viewing permissions.
+ - Create a Post
+ - If you have permission to create posts on the channel page, then you will see the post editor at the top.
+ - Channel Content Tabs
+ - The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
+
\ No newline at end of file
diff --git a/doc/context/en/chat/help.html b/doc/context/en/chat/help.html
new file mode 100644
index 000000000..cc71686d8
--- /dev/null
+++ b/doc/context/en/chat/help.html
@@ -0,0 +1,8 @@
+
+ - General
+ - Create and use chat rooms to communicate in real-time, using the standard Hubzilla permissions system for chat room access control.
+ - Create new chat room
+ - Use the "Create New" button to create a new chat room. Enter a name and how long messages should be retained.
+ - Chatting
+ - Enter your message in the message box and press Submit. You can set a status by selecting the chat room menu button beside the Submit button. Other people "in the room" are visible in the side panel in the "Chat Members" panel.
+
\ No newline at end of file
diff --git a/doc/context/en/cloud/help.html b/doc/context/en/cloud/help.html
new file mode 100644
index 000000000..a8f193223
--- /dev/null
+++ b/doc/context/en/cloud/help.html
@@ -0,0 +1,6 @@
+
+ - General
+ - This page displays a channel's "cloud" files. The files visible to the observer depend on the individual file permissions set by the channel owner. If you have permission to create/upload files you will see control buttons above the file list.
+ - Channel Content Tabs
+ - The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
+
\ No newline at end of file
diff --git a/doc/context/en/connections/help.html b/doc/context/en/connections/help.html
new file mode 100644
index 000000000..0f95fde63
--- /dev/null
+++ b/doc/context/en/connections/help.html
@@ -0,0 +1,8 @@
+
+ - General
+ - This page displays a list of all this channel's connections. The list can be sorted and filtered using the menu button beside the search button.
+ - Connection Details
+ - Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.
+ - Connection Status
+ - A connection can be in different states:
- Archived
- Ignored
- Blocked
- Hidden
+
\ No newline at end of file
diff --git a/doc/context/en/connections/ifpending/help.html b/doc/context/en/connections/ifpending/help.html
new file mode 100644
index 000000000..0f95fde63
--- /dev/null
+++ b/doc/context/en/connections/ifpending/help.html
@@ -0,0 +1,8 @@
+
+ - General
+ - This page displays a list of all this channel's connections. The list can be sorted and filtered using the menu button beside the search button.
+ - Connection Details
+ - Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.
+ - Connection Status
+ - A connection can be in different states:
- Archived
- Ignored
- Blocked
- Hidden
+
\ No newline at end of file
diff --git a/doc/context/en/events/help.html b/doc/context/en/events/help.html
new file mode 100644
index 000000000..8c0b1d4ab
--- /dev/null
+++ b/doc/context/en/events/help.html
@@ -0,0 +1,8 @@
+
+ - General
+ - This page displays a calendar of events both owned by you and shared with you from other channels.
+ - Calendar View
+ - The calendar can be displayed in month, week, or day mode using the options in the side panel.
+ - Export/Import
+ - Export or import calendar events using standard iCalendar format (.ics) files.
+
\ No newline at end of file
diff --git a/doc/context/mail/help.html b/doc/context/en/mail/help.html
similarity index 100%
rename from doc/context/mail/help.html
rename to doc/context/en/mail/help.html
diff --git a/doc/context/en/network/help.html b/doc/context/en/network/help.html
new file mode 100644
index 000000000..53e993b69
--- /dev/null
+++ b/doc/context/en/network/help.html
@@ -0,0 +1,10 @@
+
+ - General
+ - The network page displays a stream of posts and conversations, typically ordered by the most recently updated. This page is highly customizable.
+ - Create a Post
+ - At the top of the page there is a text box that says "Share". Clicking this box opens a new post editor. The post editor is customizable, but the basic editor provides fields for a post body and an optional post Title. Buttons below the text area to the left provide shortcuts to text formatting and inserting links, images, and other data into the post. The buttons to the right provide a post preview, the post permissions setting, and a Submit button to send the post.
+ - Privacy Groups
+ - The privacy groups you have created are displayed in the side panel. Selecting them filters posts to those created by channels in the chosen group.
+ - Post Permissions
+ - The access control list (ACL) is what you use to set who can see your new post. Pressing the ACL button beside the Submit button will display a dialog in which you can select what channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your Friends group except the friend you are surprising. In this case you "show" the Friends group but "don't show" that one person.
+
\ No newline at end of file
diff --git a/doc/context/en/photos/help.html b/doc/context/en/photos/help.html
new file mode 100644
index 000000000..78b442bb4
--- /dev/null
+++ b/doc/context/en/photos/help.html
@@ -0,0 +1,6 @@
+
+ - General
+ - This page displays a channel's photo albums. The images visible to the observer depend on the individual image permissions.
+ - Channel Content Tabs
+ - The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
+
\ No newline at end of file
diff --git a/doc/context/en/profile/help.html b/doc/context/en/profile/help.html
new file mode 100644
index 000000000..563e0df99
--- /dev/null
+++ b/doc/context/en/profile/help.html
@@ -0,0 +1,6 @@
+
+ - General
+ - This is the profile page of a channel. It typically displays information describing the channel. If the channel represents a person in a social network, for example, then the profile might provide contact information and other personal details about the person. Channels can have multiple profiles, where the displayed profile depends on the observer.
+ - Channel Content Tabs
+ - The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
+
\ No newline at end of file
diff --git a/doc/context/en/wiki/help.html b/doc/context/en/wiki/help.html
new file mode 100644
index 000000000..314a9d60b
--- /dev/null
+++ b/doc/context/en/wiki/help.html
@@ -0,0 +1,10 @@
+
+ - General
+ - Each wiki is a collection of pages, composed as Markdown-formatted text files.
+ - Wiki List
+ - Wikis owned by the channel that you have permission to view are listed in the side panel.
+ - Page History
+ - Every revision of a page is saved to allow quick reversion. Click the History tab to view a history of page revisions, including the date and author of each. The revert button will load the selected revision but will not automatically save the page.
+ - Pages
+ - The list of pages in the wiki are listed in the Wiki Pages panel. Prior to saving page edits using the Page control dropdown menu, you may enter a custom message to be displayed in the Page History viewer along with the revision.
+
\ No newline at end of file
diff --git a/doc/context/es b/doc/context/es
new file mode 120000
index 000000000..c8ba7666b
--- /dev/null
+++ b/doc/context/es
@@ -0,0 +1 @@
+es-es
\ No newline at end of file
diff --git a/doc/context/es-es/admin/logs/help.html b/doc/context/es-es/admin/logs/help.html
new file mode 100644
index 000000000..3a2ec413d
--- /dev/null
+++ b/doc/context/es-es/admin/logs/help.html
@@ -0,0 +1,9 @@
+
+ - General
+ - Esta página le permite ajustar los parámetros de los informes del sistema (logs) y para ver uno existente.
+ - Ajustes de los informes (logs)
+ - Cuando se habilita la opción de depuración, el sistema de información comenzará a añadir los informes (logs) en el archivo especificado en el cuadro "Fichero de informes"
+ (la ruta es relativa al directorio raÃz del servidor, por ejemplo, /var /www). Tenga en cuenta que este archivo tiene que ser modificable por el servidor web.
+ - Nivel de depuración
+ - La opción de nivel de depuración le permite establecer la cantidad de información que se anexa al fichero de informes (logs). Advertencia: El aumento de este nivel puede aumentar rápidamente el tamaño de este fichero hasta en más de 100 MB, especialmente en los hubs con más que unos pocos miembros.
+
diff --git a/doc/context/es-es/admin/queue/help.html b/doc/context/es-es/admin/queue/help.html
new file mode 100644
index 000000000..de9e6cdbb
--- /dev/null
+++ b/doc/context/es-es/admin/queue/help.html
@@ -0,0 +1,4 @@
+
+ - General
+ - Las estadÃsticas de la cola muestran cuántos mensajes están en la cola para su entrega a otros hubs. La prioridad está relacionada con la cantidad de veces que la entrega se ha intentado, sin éxito.
+
diff --git a/doc/context/es-es/admin/security/help.html b/doc/context/es-es/admin/security/help.html
new file mode 100644
index 000000000..229a91561
--- /dev/null
+++ b/doc/context/es-es/admin/security/help.html
@@ -0,0 +1,4 @@
+
+ - General
+ - Esta página contiene varios ajustes para el administrador relacionados con la seguridad. Para guardar los cambios que realice en estos ajustes, debe pulsar el botón "Enviar".
+
diff --git a/doc/context/es-es/channel/help.html b/doc/context/es-es/channel/help.html
new file mode 100644
index 000000000..682125e27
--- /dev/null
+++ b/doc/context/es-es/channel/help.html
@@ -0,0 +1,8 @@
+- General
+- Esta es la página principal de un canal. Es similar al "muro" del perfil de una persona en un contexto de red social. Las entradas creadas por el canal se muestran de acuerdo con los permisos de visualización
+del observador.
+- Crear una entrada
+- Si tiene permiso para crear entradas en la página del canal, a continuación, podrá ver el editor de entradas en la parte superior.
+- Pestañas de los contenidos del canal
+- Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" enlaza con las galerÃas
+de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
\ No newline at end of file
diff --git a/doc/context/es-es/chat/help.html b/doc/context/es-es/chat/help.html
new file mode 100644
index 000000000..94df6a1d2
--- /dev/null
+++ b/doc/context/es-es/chat/help.html
@@ -0,0 +1,8 @@
+
+ - General
+ - Creación y uso de salas de chat para comunicarse en tiempo real, utilizando el sistema de permisos estándar de Hubzilla para el control de acceso a la sala de chat.
+ - Crear una nueva sala de chat
+ - Utilice el botón "Crear" para crear una nueva sala de chat. Introduzca un nombre y cuánto tiempo se deben conservar los mensajes.
+ - Chatear
+ - Introduzca su mensaje en el cuadro de mensaje y pulse "Enviar". Se puede establecer un estado seleccionando el botón de menú sala de chat junto al botón "Enviar". Si hay otras personas en la sala, serán visibles en el panel lateral, en "Miembros del chat".
+
diff --git a/doc/context/es-es/cloud/help.html b/doc/context/es-es/cloud/help.html
new file mode 100644
index 000000000..824fa5a94
--- /dev/null
+++ b/doc/context/es-es/cloud/help.html
@@ -0,0 +1,7 @@
+
+ - General
+ - Esta página muestra los ficheros en la "nube" de un canal. Los archivos visibles para el observador dependen de los permisos de archivo individuales establecidas por
+ el propietario del canal. Si tiene permiso para crear o cargar ficheros, verá botones de control por encima de la lista de ficheros.
+ - Pestañas de los contenidos del canal
+ - Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" enlaza con las galerÃas de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
+
diff --git a/doc/context/es-es/connections/help.html b/doc/context/es-es/connections/help.html
new file mode 100644
index 000000000..a0aa9cf32
--- /dev/null
+++ b/doc/context/es-es/connections/help.html
@@ -0,0 +1,15 @@
+
+ - General
+ - Esta página muestra una lista de todas las conexiones de este canal. La lista se puede ordenar y filtrar usando el botón de menú al lado del botón de búsqueda.
+ - Detalles de la conexión
+ - Cada entrada de la lista muestra los detalles de una conexión especÃfica. Una imagen de avatar translúcida indica una conexión archivada.
+ - Estado de la conexión
+ - Una conexión puede estar en diferentes estados:
+
+ - Archivada
+ - Ignorada
+ - Bloqueada
+ - Oculta
+
+
+
diff --git a/doc/context/es-es/connections/ifpending/help.html b/doc/context/es-es/connections/ifpending/help.html
new file mode 100644
index 000000000..84e547851
--- /dev/null
+++ b/doc/context/es-es/connections/ifpending/help.html
@@ -0,0 +1,15 @@
+
+ - General
+ - Esta página muestra una lista de todas las conexiones de este canal. La lista se puede ordenar y filtrar usando el botón de menú al lado del botón de búsqueda.
+ - Detalles de la conexión
+ - Cada entrada de la lista muestra los detalles de una conexión especÃfica. Una imagen de avatar translúcida indica una conexión archivada.
+ - Estado de la conexión
+ - Una conexión puede estar en diferentes estados:
+
+ - Archivada
+ - Ignorada
+ - Bloqueada
+ - Oculta
+
+
+
diff --git a/doc/context/es-es/events/help.html b/doc/context/es-es/events/help.html
new file mode 100644
index 000000000..b0ac1f9ea
--- /dev/null
+++ b/doc/context/es-es/events/help.html
@@ -0,0 +1,8 @@
+
+ - General
+ - Esta página muestra un calendario de eventos tanto de su propiedad como compartido con usted desde otros canales.
+ - Vistas del calendario
+ - El calendario se puede mostrar en modo mensual, semanal o diario usando las opciones del panel lateral.
+ - Exportar/Importar
+ - Exportar o importar eventos del calendario usando el formato estándar de los ficheros de iCalendar (.ics).
+
diff --git a/doc/context/es-es/mail/help.html b/doc/context/es-es/mail/help.html
new file mode 100644
index 000000000..794af38a9
--- /dev/null
+++ b/doc/context/es-es/mail/help.html
@@ -0,0 +1,10 @@
+
+ - General
+ - Los mensajes que aparecen en el correo privado son visibles sólo para usted y un único destinatario.
+ - Vista combinada
+ - Las conversaciones completas se pueden ver en un hilo continuo seleccionando "Vista combinada". Las conversaciones disponibles se muestran debajo del menú en el panel lateral.
+ - Bandeja de entrada/Bandeja de salida
+ - Los mensajes individuales enviados son visibles seleccionando la Bandeja de salida y los mensajes recibidos se pueden ver usando el filtro de la Bandeja de entrada.
+ - Mensaje nuevo
+ - Los mensajes individuales tienen informes de entrega que se pueden ver usando el menú desplegable. Los mensajes también se pueden revocar desde el mismo menú, lo que puede evitar que el destinatario vea el mensaje, si aún no lo ha leÃdo.
+
\ No newline at end of file
diff --git a/doc/context/es-es/network/help.html b/doc/context/es-es/network/help.html
new file mode 100644
index 000000000..082f52a49
--- /dev/null
+++ b/doc/context/es-es/network/help.html
@@ -0,0 +1,12 @@
+
+ - General
+ - La página de "Mi red" muestra un flujo de entradas y conversaciones, normalmente ordenadas según la actualización más reciente. Esta página es altamente personalizable.
+ - Crear una entrada
+ - En la parte superior de la página hay un cuadro de texto que dice "Compartir". Al hacer clic en esta casilla se abre un nuevo editor de entradas. El editor de entradas es personalizable, pero el editor básico proporciona campos para el cuerpo de la publicación y un tÃtulo opcional. Los botones que hay debajo de la zona de texto, a la izquierda, proporcionan
+ accesos directos para el Formato de texto y para insertar enlaces, imágenes y otros datos en la entrada. Los botones a la derecha proporcionan una vista previa del mensaje, los ajustes de permisos de la entrada, y un botón Enviar para publicarla.
+ - Grupos de canales
+ - Los grupos de canales que ha creado se muestran en el panel lateral. Seleccionándolos, se filtran las entradas creadas por los canales incluidos en el grupo elegido.
+ - Permisos de una entrada
+ - La lista de control de acceso (ACL) es lo que se utiliza para establecer quién puede ver su nueva entrada. Al pulsar el botón ACL, al lado del botón Enviar, se mostrará un cuadro de diálogo en el que puede seleccionar qué canales y / o grupos de canales pueden ver el mensaje. También puede seleccionar a quién se le niega el acceso explÃcitamente. Por ejemplo,di gamos que usted está planeando una
+ fiesta sorpresa para un amigo. Puede enviar un mensaje de invitación a todos los miembros de su grupo de Amigos, excepto el amigo al que quiere sorprender. En este caso, "se mostrará" al grupo de amigos, pero "no se mostrará" a esa única persona.
+
diff --git a/doc/context/es-es/photos/help.html b/doc/context/es-es/photos/help.html
new file mode 100644
index 000000000..6623456eb
--- /dev/null
+++ b/doc/context/es-es/photos/help.html
@@ -0,0 +1,6 @@
+
+ - General
+ - Esta página muestra los álbumes de fotos de un canal. Las imágenes visibles para el observador dependen de los permisos individuales de cada imagen.
+ - Pestañas de los contenidos del canal
+- Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" enlaza con las galerÃas de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
+
diff --git a/doc/context/es-es/profile/help.html b/doc/context/es-es/profile/help.html
new file mode 100644
index 000000000..28ff22499
--- /dev/null
+++ b/doc/context/es-es/profile/help.html
@@ -0,0 +1,6 @@
+
+ - General
+ - Esta es la página de perfil de un canal. Por lo general muestra la información que describe el canal. Si el canal representa a una persona en una red social, por ejemplo, el perfil podrÃa proporcionar información de contacto y otros datos personales. Los canales pueden tener varios perfiles, en cuyo caso el perfil que se muestra depende del observador.
+ - Pestañas de los contenidos del canal
+ - Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" nlaza con las galerÃas de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
+
diff --git a/doc/context/es-es/wiki/help.html b/doc/context/es-es/wiki/help.html
new file mode 100644
index 000000000..fdae1f095
--- /dev/null
+++ b/doc/context/es-es/wiki/help.html
@@ -0,0 +1,10 @@
+
+ - General
+ - Cada wiki es una colección de páginas, compuestas como ficheros de texto formateados en Markdown.
+ - Lista de wikis
+ - Las páginas wiki propiedad del canal que esté autorizado a ver aparecen en el panel lateral.
+ - Historial de la página
+ - Cada revisión de una página se salva para permitir su rápida recuperación. Pulsar en la pestaña Historial para ver las revisiones de la página, incluyendo la fecha y el autor de cada una. El botón de reversión cargará la revisión seleccionada, pero no salvará automáticamente la página.
+ - Páginas
+ - La lista de páginas en el wiki aparece en el panel Páginas del wiki. Antes de salvar las páginas editadas usando el control Página en el menú desplegable, puede escribir un mensaje personalizado que se verá en el visor Historial de la página junto con la revisión.
+
diff --git a/doc/context/it/wiki/help.html b/doc/context/it/wiki/help.html
new file mode 100644
index 000000000..e93e18eb4
--- /dev/null
+++ b/doc/context/it/wiki/help.html
@@ -0,0 +1,10 @@
+
+ - General
+ - Ogni wiki è una raccolta di pagine, composta di file di testo formattati con Markdown.
+ - Elenco dei Wiki
+ - I Wiki del canale che sei abilitato a vedere sono elencati nel pannello laterale.
+ - Cronologia della pagina
+ - Le revisioni di ogni pagina vengono salvate per rendere possibile un ripristino veloce. Fai click sulla tab Cronologia per vedere l'elenco delle revisioni, con autore e data delle stesse. Il bottone di ripristino riporterà alla revisione selezionata, senza salvare automaticamente la pagina.
+ - Pagine
+ - L'elenco delle pagine del wiki si trova nel pannello Pagine del wiki. Prima di salvare le modifiche con il menu a discela Pagina, puoi inserire un messaggio che verrà visualizzato nella visualizzazione della storia della pagina insieme alla revisione.
+
\ No newline at end of file
diff --git a/doc/context/network/help.html b/doc/context/network/help.html
deleted file mode 100644
index 956af7380..000000000
--- a/doc/context/network/help.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- - General
- - The network page displays a stream of posts and conversations, typically ordered by the most recently updated. This page is highly customizable.
- - Create a Post
- - At the top of the page there is a text box that says "Share". Clicking this box opens a new post editor. The post editor is customizable, but the basic editor provides fields for a post body and an optional post Title. Buttons below the text area to the left provide shortcuts to text formatting and inserting links, images, and other data into the post. The buttons to the right provide a post preview, the post permissions setting, and a Submit button to send the post.
- - Privacy Groups
- - The privacy groups you have created are displayed in the side panel. Selecting them filters posts to those created by channels in the chosen group.
- - Post Permissions
- - The access control list (ACL) is what you use to set who can see your new post. Pressing the ACL button beside the Submit button will display a dialog in which you can select what channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your Friends group except the friend you are surprising. In this case you "show" the Friends group but "don't show" that one person.
-
\ No newline at end of file
diff --git a/doc/context/photos/help.html b/doc/context/photos/help.html
deleted file mode 100644
index f41611f8d..000000000
--- a/doc/context/photos/help.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- - General
- - This page displays a channel's photo albums. The images visible to the observer depend on the individual image permissions.
- - Channel Content Tabs
- - The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
-
\ No newline at end of file
diff --git a/doc/context/profile/help.html b/doc/context/profile/help.html
deleted file mode 100644
index 0d4abb8cb..000000000
--- a/doc/context/profile/help.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- - General
- - This is the profile page of a channel. It typically displays information describing the channel. If the channel represents a person in a social network, for example, then the profile might provide contact information and other personal details about the person. Channels can have multiple profiles, where the displayed profile depends on the observer.
- - Channel Content Tabs
- - The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
-
\ No newline at end of file
diff --git a/doc/database.bb b/doc/database.bb
index d327adbdc..02a70e2c7 100644
--- a/doc/database.bb
+++ b/doc/database.bb
@@ -1,6 +1,7 @@
[h2]Database Tables[/h2]
[table]
[tr][th]Table[/th][th]Description[/th][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_abconfig]abconfig[/zrl][/td][td]arbitrary storage for connections of local channels[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_abook]abook[/zrl][/td][td]connections of local channels[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_account]account[/zrl][/td][td]service provider account[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_addon]addon[/zrl][/td][td]registered plugins[/td][/tr]
@@ -8,6 +9,7 @@
[tr][td][zrl=[baseurl]/help/database/db_attach]attach[/zrl][/td][td]file attachments[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_auth_codes]auth_codes[/zrl][/td][td]OAuth usage[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_cache]cache[/zrl][/td][td]OEmbed cache[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_cal]cal[/zrl][/td][td]CalDAV containers for events[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_channel]channel[/zrl][/td][td]local channels[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_chat]chat[/zrl][/td][td]chat room content[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_chatpresence]chatpresence[/zrl][/td][td]channel presence information for chat[/td][/tr]
@@ -16,17 +18,14 @@
[tr][td][zrl=[baseurl]/help/database/db_config]config[/zrl][/td][td]main configuration storage[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_conv]conv[/zrl][/td][td]Diaspora private messages meta conversation structure[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_event]event[/zrl][/td][td]Events[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_fcontact]fcontact[/zrl][/td][td]friend suggestion stuff (obsolete)[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_ffinder]ffinder[/zrl][/td][td]friend suggestion stuff (obsolete)[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_fserver]fserver[/zrl][/td][td]obsolete[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_fsuggest]fsuggest[/zrl][/td][td]friend suggestion stuff (unused)[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_group_member]group_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_groups]groups[/zrl][/td][td]privacy groups (collections), member info[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_hook]hook[/zrl][/td][td]plugin hook registry[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]xchan location storage, ties a hub location to an xchan[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_iconfig]iconfig[/zrl][/td][td]extensible arbitrary storage for items[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_issue]issue[/zrl][/td][td]future bug/issue database[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_item]item[/zrl][/td][td]all posts and webpages[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_item_id]item_id[/zrl][/td][td]other identifiers on other services for posts[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_item_id]item_id[/zrl][/td][td](deprecated by iconfig) other identifiers on other services for posts[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_likes]likes[/zrl][/td][td]likes of 'things'[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_mail]mail[/zrl][/td][td]private messages[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_menu]menu[/zrl][/td][td]webpage menu data[/td][/tr]
@@ -48,7 +47,6 @@
[tr][td][zrl=[baseurl]/help/database/db_sign]sign[/zrl][/td][td]Diaspora signatures. To be phased out.[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_site]site[/zrl][/td][td]site table to find directory peers[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_source]source[/zrl][/td][td]channel sources data[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_spam]spam[/zrl][/td][td]unfinished[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_sys_perms]sys_perms[/zrl][/td][td]extensible permissions for OAuth[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_term]term[/zrl][/td][td]item taxonomy (categories, tags, etc.) table[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_tokens]tokens[/zrl][/td][td]OAuth usage[/td][/tr]
@@ -60,6 +58,7 @@
[tr][td][zrl=[baseurl]/help/database/db_xconfig]xconfig[/zrl][/td][td]as pconfig but for channels with no local account[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_xign]xign[/zrl][/td][td]channels ignored by friend suggestions[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_xlink]xlink[/zrl][/td][td]"friends of friends" linkages derived from poco, also ratings storage[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_xperm]xperm[/zrl][/td][td]OAuth/OpenID-Connect extensible permissions permissions storage[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_xprof]xprof[/zrl][/td][td]if this hub is a directory server, contains basic public profile info of everybody in the network[/td][/tr]
[tr][td][zrl=[baseurl]/help/database/db_xtag]xtag[/zrl][/td][td]if this hub is a directory server, contains tags or interests of everybody in the network[/td][/tr]
[/table]
diff --git a/doc/database/db_abook.bb b/doc/database/db_abook.bb
index 364429884..a346480d7 100644
--- a/doc/database/db_abook.bb
+++ b/doc/database/db_abook.bb
@@ -15,10 +15,6 @@
[/td][/tr]
[tr][td]abook_closeness[/td][td]"closeness" value for optional affinity tool, 0-99[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]99[/td][td]
[/td][/tr]
-[tr][td]abook_rating[/td][td]The channel owner's (public) rating of this connection -10 to +10, default 0 or unrated[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
-[/td][/tr]
-[tr][td]abook_rating_text[/td][td]The channel owner's (public) rating of this connection free form text[/td][td]text[/td][td]NO[/td][td]MUL[/td][td][/td][td]
-[/td][/tr]
[tr][td]abook_created[/td][td]Datetime this record was created[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
[/td][/tr]
[tr][td]abook_updated[/td][td]Datetime this record was modified[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
@@ -32,16 +28,27 @@
[tr][td]abook_profile[/td][td]profile.guid of profile to display to this connection if authenticated[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td]
[/td][/tr]
[tr][td]abook_blocked[/td][td]Bi-directional communications with this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_ignored[/td][td]Incoming communications from this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_hidden[/td][td]This connection will not be shown as a connection to anybody but the channel owner[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_archived[/td][td]This connection is likely non-functioning and the entry and conversations are preserved, but further polled communications will not be attempted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_pending[/td][td]A connection request was received from this channel but has not been approved by the channel owner, public communications may still be visible but no additional permissions have been granted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_unconnected[/td][td]currently unused. Projected usage is to indicate "one-way" connections which were insitgated on this end but are still pending on the remote end. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_self[/td][td]is a special case where the owner is the target. Every channel has one abook entry with abook_self and with a target abook_xchan set to channel.channel_hash . When this flag is present, abook_my_perms is the default permissions granted to all new connections and several other fields are unused.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_feed[/td][td]indicates this connection is an RSS/Atom feed and may trigger special handling.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_incl[/td][td]connection filter allow rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_excl[/td][td]connection filter deny rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]abook_instance[/td][td]comma separated list of site urls of all channel clones that this connection is connected with (used only for singleton networks which don't support cloning)[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[/table]
diff --git a/doc/database/db_addon.bb b/doc/database/db_addon.bb
index afa06d56c..bccd295f5 100644
--- a/doc/database/db_addon.bb
+++ b/doc/database/db_addon.bb
@@ -3,7 +3,7 @@
[/th][/tr]
[tr][td]id[/td][td][/td]generated index[td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment
[/td][/tr]
-[tr][td]name[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]aname[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]version[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
@@ -11,7 +11,7 @@
[/td][/tr]
[tr][td]hidden[/td][td]currently unused[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
-[tr][td]timestamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td]
+[tr][td]tstamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td]
[/td][/tr]
[tr][td]plugin_admin[/td][td]1 = has admin config, 0 = has no admin config[/td][td]tinyint(1)[/td][td]NO[/td][td][/td][td]0[/td][td]
[/td][/tr]
diff --git a/doc/database/db_app.bb b/doc/database/db_app.bb
index 7076bffdd..09df473ee 100644
--- a/doc/database/db_app.bb
+++ b/doc/database/db_app.bb
@@ -27,8 +27,20 @@
[/td][/tr]
[tr][td]app_page[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
[/td][/tr]
-[tr][td]app_requires[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
+[tr][td]app_requires[/td][td]access rules[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
[/td][/tr]
+
+[tr][td]app_created[/td][td]datetime of app creation[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+[tr][td]app_edited[/td][td]datetime of last app edit[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+
+[tr][td]app_deleted[/td][td]1 = deleted, 0 = normal[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+[tr][td]app_system[/td][td]1 = imported system app, 0 = member created app[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+
+
[/table]
Storage for personal apps
diff --git a/doc/database/db_attach.bb b/doc/database/db_attach.bb
index 7d2befb47..5098401de 100644
--- a/doc/database/db_attach.bb
+++ b/doc/database/db_attach.bb
@@ -29,9 +29,11 @@
[/td][/tr]
[tr][td]os_storage[/td][td]if 0, data contains content; if 1 data contains path to content (always 1 in hubzilla)[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
+[tr][td]os_path[/td][td]under construction, store the system path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
[tr][td]display_path[/td][td]under construction, store the human readable path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
-[tr][td]data[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]content[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]created[/td][td]creation time[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
[/td][/tr]
diff --git a/doc/database/db_channel.bb b/doc/database/db_channel.bb
index 6f53517d8..518ff0978 100644
--- a/doc/database/db_channel.bb
+++ b/doc/database/db_channel.bb
@@ -35,6 +35,8 @@
[/td][/tr]
[tr][td]channel_dirdate[/td][td]time when directory was last pinged. Must do this once a month[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
[/td][/tr]
+[tr][td]channel_lastpost[/td][td]date of last post for this channel. May not be fully implemented[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
+[/td][/tr]
[tr][td]channel_deleted[/td][td]time when channel was deleted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
[/td][/tr]
[tr][td]channel_max_anon_mail[/td][td]unused[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]10[/td][td]
@@ -95,6 +97,8 @@
[/td][/tr]
[tr][td]channel_system[/td][td]if 1, this is the special system channel on this site[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td]
[/td][/tr]
+[tr][td]channel_moved[/td][td]URL of relocated channel, making this instance abandoned if set[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td]
+[/td][/tr]
[/table]
Return to [zrl=[baseurl]/help/database]database documentation[/zrl]
diff --git a/doc/database/db_chatpresence.bb b/doc/database/db_chatpresence.bb
index 28cd6f207..0a7f666c9 100644
--- a/doc/database/db_chatpresence.bb
+++ b/doc/database/db_chatpresence.bb
@@ -11,7 +11,7 @@
[/td][/tr]
[tr][td]cp_status[/td][td]text status description e.g. "online"[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]cp_client[/td][td][/td]IP address of this client[td]char(128)[/td][td]NO[/td][td][/td][td][/td][td]
+[tr][td]cp_client[/td][td]IP address of this client[/td][td]char(128)[/td][td]NO[/td][td][/td][td][/td][td]
[/td][/tr]
[/table]
diff --git a/doc/database/db_clients.bb b/doc/database/db_clients.bb
index d342b529f..0c66a4fc2 100644
--- a/doc/database/db_clients.bb
+++ b/doc/database/db_clients.bb
@@ -7,7 +7,7 @@
[/td][/tr]
[tr][td]redirect_uri[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]name[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
+[tr][td]clname[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]icon[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
diff --git a/doc/database/db_event.bb b/doc/database/db_event.bb
index 7c31d7fde..ad3c15789 100644
--- a/doc/database/db_event.bb
+++ b/doc/database/db_event.bb
@@ -15,9 +15,9 @@
[/td][/tr]
[tr][td]edited[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]start[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]dtstart[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]finish[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]dtend[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]summary[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
@@ -25,13 +25,13 @@
[/td][/tr]
[tr][td]location[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]type[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]etype[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]nofinish[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
[tr][td]adjust[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]1[/td][td]
[/td][/tr]
-[tr][td]ignore[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]dismissed[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
@@ -41,6 +41,24 @@
[/td][/tr]
[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
+
+[tr][td]event_status[/td][td][/td][td]charr(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_status_date[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_percent[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_repeat[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_sequence[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_priority[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_vdata[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]cal_id[/td][td][/td][td]int(10)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+
[/table]
Return to [zrl=[baseurl]/help/database]database documentation[/zrl]
\ No newline at end of file
diff --git a/doc/database/db_groups.bb b/doc/database/db_groups.bb
index 078d96464..73265b90e 100644
--- a/doc/database/db_groups.bb
+++ b/doc/database/db_groups.bb
@@ -11,7 +11,7 @@
[/td][/tr]
[tr][td]deleted[/td][td]1 indicates the group has been deleted[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
-[tr][td]name[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]gname[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[/table]
diff --git a/doc/database/db_hook.bb b/doc/database/db_hook.bb
index 0812b1b41..233062f98 100644
--- a/doc/database/db_hook.bb
+++ b/doc/database/db_hook.bb
@@ -7,9 +7,11 @@
[/td][/tr]
[tr][td]file[/td][td]relative filename of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]function[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]fn[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]priority[/td][td]not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
+[tr][td]priority[/td][td]can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
+[/td][/tr]
+[tr][td]hook_version[/td][td]version 0 hooks must have two arguments, the App and the hook data. version 1 hooks have 1 argument - the hook data[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
[/td][/tr]
[/table]
diff --git a/doc/database/db_item.bb b/doc/database/db_item.bb
index e4e594196..6383e13f8 100644
--- a/doc/database/db_item.bb
+++ b/doc/database/db_item.bb
@@ -51,7 +51,7 @@
[/td][/tr]
[tr][td]obj_type[/td][td]ActivityStreams object type (old style URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
[/td][/tr]
-[tr][td]object[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]obj[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]tgt_type[/td][td]ActivityStreams target type if applicable (URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
[/td][/tr]
diff --git a/doc/database/db_notify.bb b/doc/database/db_notify.bb
index 42f9350e5..4787266cd 100644
--- a/doc/database/db_notify.bb
+++ b/doc/database/db_notify.bb
@@ -5,7 +5,7 @@
[/td][/tr]
[tr][td]hash[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]xname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
@@ -25,7 +25,7 @@
[/td][/tr]
[tr][td]seen[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
-[tr][td]type[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]ntype[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
diff --git a/doc/database/db_photo.bb b/doc/database/db_photo.bb
index 6a0cdf362..91840ec1e 100644
--- a/doc/database/db_photo.bb
+++ b/doc/database/db_photo.bb
@@ -23,15 +23,15 @@
[/td][/tr]
[tr][td]filename[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]type[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td]
+[tr][td]mimetype[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td]
[/td][/tr]
[tr][td]height[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]width[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]size[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]filesize[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
-[tr][td]data[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]content[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]scale[/td][td][/td][td]tinyint(3)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
diff --git a/doc/database/db_profile.bb b/doc/database/db_profile.bb
index 83db75713..717fae585 100644
--- a/doc/database/db_profile.bb
+++ b/doc/database/db_profile.bb
@@ -15,7 +15,7 @@
[/td][/tr]
[tr][td]hide_friends[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
[/td][/tr]
-[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]fullname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]pdesc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
@@ -41,7 +41,7 @@
[/td][/tr]
[tr][td]marital[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]with[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]partner[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]howlong[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td]
[/td][/tr]
@@ -73,7 +73,7 @@
[/td][/tr]
[tr][td]romance[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]work[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]employment[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]education[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
[/td][/tr]
diff --git a/doc/database/db_term.bb b/doc/database/db_term.bb
index e1f6415fa..bd155fe21 100644
--- a/doc/database/db_term.bb
+++ b/doc/database/db_term.bb
@@ -11,7 +11,7 @@
[/td][/tr]
[tr][td]otype[/td][td]type of linked thing[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
-[tr][td]type[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]ttype[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
[tr][td]term[/td][td]the actual taxonomy term[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
[/td][/tr]
diff --git a/doc/de/develop.bb b/doc/de/develop.bb
index 473b18b68..30e2954c6 100644
--- a/doc/de/develop.bb
+++ b/doc/de/develop.bb
@@ -25,9 +25,6 @@
[zrl=[baseurl]/help/git_for_non_developers]Git für Nicht-Entwickler[/zrl]
[zrl=[baseurl]/help/dev_beginner]Schritt-für-Schritt-Einführung für neue Entwickler[/zrl]
-[h3]Häufig gestellte Fragen für Entwickler[/h3]
-[zrl=[baseurl]/help/faq_developers]FAQ für Entwickler[/zrl]
-
[h3]Externe Ressourcen[/h3]
[url=https://zothub.com/channel/one]Entwickler-Kanal[/url]
[url=https://federated.social/channel/postgres]Postgres-spezifischer Admin-Support-Kanal[/url]
diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md
index 1ef80d343..fa8a98ff3 100644
--- a/doc/dev-function-overview.md
+++ b/doc/dev-function-overview.md
@@ -1,5 +1,5 @@
-Red development - some useful basic functions
-=============================================
+$Projectname development - some useful basic functions
+======================================================
@@ -17,11 +17,11 @@ Returns authenticated string hash of Red global identifier, if authenticated via
* get_app()
-Returns the global app structure ($a).
+Returns the global app structure ($a). No longer used as App is a static class
* App::get_observer()
-(App:: is usually assigned to the global $a), so App::get_observer() or App::get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely).
+returns an xchan structure representing the current viewer if authenticated (locally or remotely).
* get_config($family,$key), get_pconfig($uid,$family,$key)
diff --git a/doc/develop.bb b/doc/develop.bb
index 56ba08421..ef3ea5bd0 100644
--- a/doc/develop.bb
+++ b/doc/develop.bb
@@ -26,9 +26,6 @@
[zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]
[zrl=[baseurl]/help/dev_beginner]Step-for-step manual for beginning developers[/zrl]
-[h3]Frequently Asked Questions For Developers[/h3]
-[zrl=[baseurl]/help/faq_developers]FAQ For Developers[/zrl]
-
[h3]External Resources[/h3]
[url=https://zothub.com/channel/one]Development Channel[/url]
[url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url]
diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb
index 373454440..183581361 100644
--- a/doc/developer_function_primer.bb
+++ b/doc/developer_function_primer.bb
@@ -1,4 +1,4 @@
-[b]Red development - some useful basic functions[/b]
+[b]$Projectname development - some useful basic functions[/b]
[b]get_account_id()[/b]
@@ -12,13 +12,9 @@ Returns authenticated numeric channel_id if authenticated and connected to a cha
Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string.
-[b]get_app()[/b]
-
-Returns the global app structure ($a).
-
[b]App::get_observer()[/b]
-(App:: is usually assigned to the global $a), so $a->get_observer() or get_app()->get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely).
+returns an xchan structure representing the current viewer if authenticated (locally or remotely).
[b]get_config($family,$key), get_pconfig($uid,$family,$key), get_xconfig($xchan_hash,$family,$key)[/b]
diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb
index 412e84467..a679e9381 100644
--- a/doc/external-resource-links.bb
+++ b/doc/external-resource-links.bb
@@ -1,20 +1,21 @@
-[b]External Resource Links[/b]
-
-[b][color= grey][size=24]External Links[/size][/color][/b]
-[b]Third-Party Themes[/b]
-
+[h2]External resource links[/h2]
+[h3]Third-Party Themes[/h3]
+[ul]
[*][url=https://github.com/omigeot/redstrap3]Redstrap[/url]
[*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url]
[*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url]
[*][url=https://github.com/deadsuperhero/redmatrix-themes]Sean Tilley's themes[/url]
-
-[b]Third-Party Addons[/b]
+[/ul]
+[h3]Third-Party addons[/h3]
+[ul]
[*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url]
-[b]Related Projects[/b]
-
+[/ul]
+[h3]Related projects[/h3]
+[ul]
[*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url]
[*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url]
[*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url]
[*][url=https://wordpress.org/plugins/hubzilla-wp/]WordPress gateway (combine with wppost addon for full features)[/url]
+[/ul]
#include doc/macros/main_footer.bb;
diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb
deleted file mode 100644
index 5da2c19ff..000000000
--- a/doc/faq_developers.bb
+++ /dev/null
@@ -1,454 +0,0 @@
-[size=large][b]Frequently Asked Questions For Developers[/b][/size]
-
-[toc]
-
-
-[h3]What does $a mean?[/h3]
-$a is a class defined in boot.php and passed all around $Projectname as a global reference variable. It defines everything necessary for the $Projectname application: Server variables, URL arguments, page structures, layouts, content, installed plugins, output device info, theme info, identity of the observer and (potential) page owner ...
-
-We don't ever create more than one instance and always modify the elements of the single instance. The mechanics of this are somewhat tricky. If you have a function that is passed $a and needs to modify $a you need to declare it as a reference with '&' e.g.
-
-[code]function foo(&$a) { App::$something = 'x'; // whatever };
-
-*or* access it within your function as a global variable via get_app()
-
-function foo() {
- $a = get_app();
- App::$something = 'x';
-}
-
-
-function foo($a) { App::$something = 'x'; };
-
-will *not* change the global app state.
-
-function foo() {
- App::$something = 'x';
-}
-[/code]
-
-
-An example (large) &$a object showing some of its many members and structures-- in JSON format for easier readability-- is here:
-
-[code] {
- "category": null,
- "nav_sel": {
- "home": null,
- "community": null,
- "contacts": null,
- "directory": null,
- "settings": null,
- "notifications": null,
- "intros": null,
- "messages": null,
- "register": null,
- "manage": null,
- "profiles": null,
- "network": null,
- "help": "active"
- },
- "argc": 2,
- "install": false,
- "is_mobile": false,
- "timezone": "America/Los_Angeles",
- "sourcename": "",
- "module_loaded": true,
- "contacts": null,
- "interactive": true,
- "config": {
- "system": {
- "max_import_size": 200000,
- "logfile": "/tmp/hubzilla.log",
- "channels_active_monthly_stat": "3",
- "last_expire_day": "4",
- "loglevel": "4",
- "sitename": "Hubzilla",
- "access_policy": 0,
- "directory_mode": 0,
- "debugging": "1",
- "verify_email": 1,
- "register_text": "",
- "urlverify": "687474703a2f2f6875627a696c6c61",
- "register_policy": 2,
- "theme": "redbasic",
- "smarty3_folder": "/home/src/hubzilla/store/[data]/smarty3",
- "channels_total_stat": "4",
- "admin_email": "foo@bar.com",
- "channels_active_halfyear_stat": "3",
- "location_hash": "910792b7bf75296cbf238ae29a5493f3c78805812652d3f0396e88763a26ce1b",
- "local_posts_stat": "63",
- "lastpollcheck": "2015-11-03 07:40:38",
- "baseurl": "http://hubzilla",
- "config_loaded": true,
- "pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuR4neYAxuWwZg34fqofU\nZg8y1YSTX39Tzhgcgn7QFCeH600NHJBHWXbPdS5imdYq6W+P1vtKxsVNLI9d01+j\ns3MF3amgEuJH0X+JLLjyittQksyAiukvh/o4MSit8mcYcXs8Dxaybe+KaY09N4ys\ndxKcn6EPlthUiQPJMPitybp4vYkw9LupWZOQWThz9ur6T5wnk9ehBIPFN8gYvKrT\nAG9RFfbq3y59rTOiSHNA2PIUMzo2HEh4QBVCvVolKt7GPhUM4Bze40VRe8ELZTPp\nyehNxEHyhHZfnC+XRVNlvSPXBU2vtE+zcok+5DXsKAqMt8YgFIThNEOLQKvff/lv\nsdGvk6jJZok7+9lKtYfwnNnRWf51aVVuSAO3aIIVLroLyhiji0KA7G5YRHeF1rNL\np88e8peMyUMCX2Svv1wudJzqOfWSvOpY0NLZrdGZXRN2/rXyHPRD/TtS3SNDdd7J\nYQUjyxGjF1/zB3xqvPr09s8tzXqJl9pZNcN9iz58oPBbTuGdUr8CJro/3nVHgkRf\nw7/zhapSW1UaroJjecrC9yWx5QUD3KNU51phsP9iHCFdMyPBdUHjmNvE5f7YJWBh\nO1rRKUoE3i+eHLYAWeYblFX7T+EKOCB2hd3NUrIqDL98OSpfDiZT7rf9PdcWCOY5\nuddm6KzwHjffl5kZd8MM8bMCAwEAAQ==\n-----END PUBLIC KEY-----\n",
- "addon": "converse",
- "lastpoll": "2015-11-04 07:40:01",
- "php_path": "/usr/bin/php",
- "allowed_themes": "redbasic",
- "sellpage": "",
- "prvkey": "-----BEGIN PRIVATE KEY-----\n-----END PRIVATE KEY-----\n",
- "directory_server": "https://red.zottel.red",
- "curl_ssl_ciphers": "ALL:!eNULL",
- "db_version": "1158"
- },
- "config": {
- "config_loaded": true
- },
- "feature": {
- "config_loaded": true
- },
- "2": {
- "redbasic": {
- "schema": "dark",
- "comment_indent": "",
- "toolicon_activecolour": "",
- "item_colour": "",
- "nav_gradient_top": "",
- "nav_active_icon_colour": "",
- "nav_active_gradient_top": "",
- "top_photo": "",
- "converse_width": "",
- "nav_min_opacity": "",
- "body_font_size": "",
- "reply_photo": "",
- "background_colour": "",
- "radius": "",
- "nav_gradient_bottom": "",
- "toolicon_colour": "",
- "nav_active_gradient_bottom": "",
- "nav_icon_colour": "",
- "narrow_navbar": "",
- "nav_bg": "",
- "comment_item_colour": "",
- "config_loaded": true,
- "banner_colour": "",
- "comment_border_colour": "",
- "align_left": "",
- "font_size": "",
- "font_colour": "",
- "nav_bd": "",
- "photo_shadow": "",
- "background_image": "",
- "link_colour": ""
- },
- "system": {
- "network_list_mode": "0",
- "post_joingroup": "0",
- "channel_list_mode": "0",
- "title_tosource": "0",
- "blocktags": "0",
- "photo_path": "%Y-%m",
- "suggestme": "0",
- "autoperms": "0",
- "hide_presence": "0",
- "channel_divmore_height": "400",
- "network_divmore_height": "400",
- "post_profilechange": "0",
- "channel_menu": "",
- "always_show_in_notices": "0",
- "use_browser_location": "0",
- "update_interval": "80000",
- "itemspage": "20",
- "attach_path": "%Y-%m",
- "permissions_role": "social",
- "vnotify": "2047",
- "post_newfriend": "0",
- "config_loaded": true,
- "no_smilies": "0",
- "evdays": "3",
- "user_scalable": "1"
- }
- }
- },
- "layout": {
- "region_aside": "\n<div class="widget"><h3>Documentation</h3><ul class="nav nav-pills nav-stacked"><li><a href="help/general">Project/Site Information</a></li><li><a href="help/members">For Members</a></li><li><a href="help/admins">For Administrators</a></li><li><a href="help/develop">For Developers</a></li></ul></div>\n"
- },
- "is_sys": false,
- "content": null,
- "cid": null,
- "profile_uid": 0,
- "hooks": {
- "construct_page": [
- [
- "addon/converse/converse.php",
- "converse_content"
- ]
- ]
- },
- "strings": [],
- "js_sources": [
- "jquery.js",
- "library/justifiedGallery/jquery.justifiedGallery.min.js",
- "library/sprintf.js/dist/sprintf.min.js",
- "spin.js",
- "jquery.spin.js",
- "jquery.textinputs.js",
- "autocomplete.js",
- "library/jquery-textcomplete/jquery.textcomplete.js",
- "library/jquery.timeago.js",
- "library/readmore.js/readmore.js",
- "library/jgrowl/jquery.jgrowl_minimized.js",
- "library/cryptojs/components/core-min.js",
- "library/cryptojs/rollups/aes.js",
- "library/cryptojs/rollups/rabbit.js",
- "library/cryptojs/rollups/tripledes.js",
- "acl.js",
- "webtoolkit.base64.js",
- "main.js",
- "crypto.js",
- "library/jRange/jquery.range.js",
- "library/colorbox/jquery.colorbox-min.js",
- "library/jquery.AreYouSure/jquery.are-you-sure.js",
- "library/tableofcontents/jquery.toc.js",
- "library/bootstrap/js/bootstrap.min.js",
- "library/bootbox/bootbox.min.js",
- "library/bootstrap-tagsinput/bootstrap-tagsinput.js",
- "library/datetimepicker/jquery.datetimepicker.js",
- "library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js",
- "view/theme/redbasic/js/redbasic.js",
- "mod_help.js"
- ],
- "channel": {
- "channel_hash": "uRy0nF-urp6k_bFrkdtCc2EkBynwpgCJL_FQFoTwyw2Hep7AHkrSt1MZcHWV_8DQucNlHSY1vHgUNS2Fvoirpw",
- "channel_address": "testes",
- "channel_primary": "1",
- "channel_allow_gid": "",
- "xchan_deleted": "0",
- "xchan_connpage": "",
- "channel_r_storage": "1",
- "xchan_pubforum": "0",
- "channel_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7MP/xxsq/srA8I7m+WKf\nHlguwwg0b1tz+I3o+djp7b+wF8q03XPKQpYmKfXIj47vpAOu75nKA4Tn90lLymmk\nSXUHogOqOMy1CHoaVrAw2T2/tAeRoMAjAJ5IxSOAM7Xda0nVUK6FmfxPcvftKf9y\nPmvvFadXpaHT4JGPH0tszDhGXLkqlt9xSkIkpsgMA6emj/7bacc6x8eTdtvzo2e5\n/NyPXvBKH4henmYaKjq/4aIYZcBWYVGt6onxaP2j1cSNbksnOY7GbJl+hy95iFoZ\nDWGxiFwQd+CroiBbdlpVGp13cV/WKp2spZzlzkmCRGYoNbbM5RlgFLnmyTa4XMZE\nwnA3ZUB59MsrUJK+0H/utiZrpX5NQcFl33z8k5zB3pPnhc5S5/P+UJZRnqhet1wQ\n7AZVmdP30D75QD8LZ4SytZ1DHn/N76EsVhSADNMnUfEphs708V33Z0gFWultYDoK\nlvXUf4O0/V8GTufFHb6XdAiy92IUzrormXCpXoOmdOcJdaH9RnotZi/DkuQ0zP+Y\nCvxU9nrjyZvAwAdew//XFDjw4HoThVM4k4jzkIhCTlCao/yRnNM7A/i3OKcXq9wU\n7OZqcRfM9o0BFpZTIoXB7BMtpeioJcBi/7FUaV9U9uYLFuLL0qWa1YxLwfsN9rDk\n6A1gbhD60G9/dAbolp8xAHkCAwEAAQ==\n-----END PUBLIC KEY-----\n",
- "xchan_flags": "0",
- "channel_allow_cid": "",
- "xchan_censored": "0",
- "channel_w_pages": "128",
- "xchan_instance_url": "",
- "xchan_photo_s": "http://hubzilla/photo/profile/s/2",
- "channel_w_stream": "128",
- "channel_timezone": "America/Los_Angeles",
- "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7MP/xxsq/srA8I7m+WKf\nHlguwwg0b1tz+I3o+djp7b+wF8q03XPKQpYmKfXIj47vpAOu75nKA4Tn90lLymmk\nSXUHogOqOMy1CHoaVrAw2T2/tAeRoMAjAJ5IxSOAM7Xda0nVUK6FmfxPcvftKf9y\nPmvvFadXpaHT4JGPH0tszDhGXLkqlt9xSkIkpsgMA6emj/7bacc6x8eTdtvzo2e5\n/NyPXvBKH4henmYaKjq/4aIYZcBWYVGt6onxaP2j1cSNbksnOY7GbJl+hy95iFoZ\nDWGxiFwQd+CroiBbdlpVGp13cV/WKp2spZzlzkmCRGYoNbbM5RlgFLnmyTa4XMZE\nwnA3ZUB59MsrUJK+0H/utiZrpX5NQcFl33z8k5zB3pPnhc5S5/P+UJZRnqhet1wQ\n7AZVmdP30D75QD8LZ4SytZ1DHn/N76EsVhSADNMnUfEphs708V33Z0gFWultYDoK\nlvXUf4O0/V8GTufFHb6XdAiy92IUzrormXCpXoOmdOcJdaH9RnotZi/DkuQ0zP+Y\nCvxU9nrjyZvAwAdew//XFDjw4HoThVM4k4jzkIhCTlCao/yRnNM7A/i3OKcXq9wU\n7OZqcRfM9o0BFpZTIoXB7BMtpeioJcBi/7FUaV9U9uYLFuLL0qWa1YxLwfsN9rDk\n6A1gbhD60G9/dAbolp8xAHkCAwEAAQ==\n-----END PUBLIC KEY-----\n",
- "channel_w_chat": "128",
- "xchan_connurl": "http://hubzilla/poco/testes",
- "channel_guid_sig": "XXX",
- "xchan_name_date": "2015-10-09 00:45:41",
- "channel_expire_days": "0",
- "xchan_system": "0",
- "xchan_photo_date": "2015-10-09 00:45:41",
- "channel_startpage": "",
- "channel_deny_gid": "",
- "channel_lastpost": "2015-10-09 02:53:23",
- "xchan_photo_m": "http://hubzilla/photo/profile/m/2",
- "channel_passwd_reset": "",
- "xchan_hidden": "0",
- "xchan_selfcensored": "0",
- "xchan_photo_mimetype": "image/jpeg",
- "channel_a_republish": "128",
- "channel_w_tagwall": "128",
- "channel_r_stream": "1",
- "channel_w_comment": "128",
- "channel_system": "0",
- "channel_w_mail": "128",
- "channel_pageflags": "0",
- "xchan_network": "zot",
- "channel_id": "2",
- "xchan_guid": "Ok-ycNKQYMzjokLnIz5OTCF8M5f4CtRT4vJCUeUivJhIOJWk3ORwIQgGx3P5g2Yz79KxQ-rs_Cn2G_jsgM6hmw",
- "channel_removed": "0",
- "channel_dirdate": "2015-10-09 00:46:00",
- "channel_w_storage": "128",
- "channel_w_photos": "0",
- "channel_prvkey": "-----BEGIN PRIVATE KEY----------END PRIVATE KEY-----\n",
- "channel_guid": "Ok-ycNKQYMzjokLnIz5OTCF8M5f4CtRT4vJCUeUivJhIOJWk3ORwIQgGx3P5g2Yz79KxQ-rs_Cn2G_jsgM6hmw",
- "channel_max_friend_req": "0",
- "channel_w_wall": "128",
- "channel_r_abook": "1",
- "channel_max_anon_mail": "0",
- "channel_location": "",
- "channel_a_delegate": "128",
- "channel_deny_cid": "",
- "channel_r_profile": "1",
- "channel_name": "testes",
- "xchan_guid_sig": "XXX",
- "xchan_hash": "uRy0nF-urp6k_bFrkdtCc2EkBynwpgCJL_FQFoTwyw2Hep7AHkrSt1MZcHWV_8DQucNlHSY1vHgUNS2Fvoirpw",
- "channel_notifyflags": "703",
- "channel_theme": "redbasic",
- "channel_w_like": "2",
- "xchan_url": "http://hubzilla/channel/testes",
- "channel_default_group": "",
- "channel_r_photos": "0",
- "channel_account_id": "1",
- "xchan_addr": "testes@hubzilla",
- "channel_r_pages": "1",
- "channel_deleted": "0000-00-00 00:00:00",
- "xchan_orphan": "0",
- "xchan_follow": "http://hubzilla/follow?f=&url=%s",
- "xchan_name": "testes",
- "xchan_photo_l": "http://hubzilla/photo/profile/l/2"
- },
- "page": {
- "content": "<div id="help-content" class="generic-content-wrapper">\n\t<div class="section-title-wrapper">\n\t<h2>Hubzilla Documentation</h2>\n\t</div>\n\t<div class="section-content-wrapper">\n\t<h2>Documentation for Developers</h2><br /><br /><h3>Technical Documentation</h3><br /><a class="zrl" href="http://hubzilla/help/Zot---A-High-Level-Overview" target="_blank" >A high level overview of Zot</a><br /><a class="zrl" href="http://hubzilla/help/zot" target="_blank" >An introduction to Zot</a><br /><a class="zrl" href="http://hubzilla/help/zot_structures" target="_blank" >Zot Stuctures</a><br /><a class="zrl" href="http://hubzilla/help/comanche" target="_blank" >Comanche Page Descriptions</a><br /><a class="zrl" href="http://hubzilla/help/Creating-Templates" target="_blank" >Creating Comanche Templates</a><br /><a class="zrl" href="http://hubzilla/help/Widgets" target="_blank" >Widgets</a><br /><a class="zrl" href="http://hubzilla/help/plugins" target="_blank" >Plugins</a><br /><a class="zrl" href="http://hubzilla/help/hooks" target="_blank" >Hooks</a><br /><a class="zrl" href="http://hubzilla/help/doco" target="_blank" >Contributing Documentation</a><br /><a class="zrl" href="http://hubzilla/help/DerivedTheme1" target="_blank" >Creating Derivative Themes</a><br /><a class="zrl" href="http://hubzilla/help/schema_development" target="_blank" >Schemas</a><br /><a class="zrl" href="http://hubzilla/help/Translations" target="_blank" >Translations</a><br /><a class="zrl" href="http://hubzilla/help/developers" target="_blank" >Developers</a><br /><a class="zrl" href="http://hubzilla/help/intro_for_developers" target="_blank" >Intro for Developers</a><br /><a class="zrl" href="http://hubzilla/help/database" target="_blank" >Database schema documentation</a><br /><a class="zrl" href="http://hubzilla/help/api_functions" target="_blank" >API functions</a><br /><a class="zrl" href="http://hubzilla/help/api_posting" target="_blank" >Posting to the red# using the API</a><br /><a class="zrl" href="http://hubzilla/help/developer_function_primer" target="_blank" >Red Functions 101</a><br /><a class="zrl" href="http://hubzilla/doc/html/" target="_blank" >Code Reference (Doxygen generated - sets cookies)</a><br /><a class="zrl" href="http://hubzilla/help/to_do_doco" target="_blank" >To-Do list for the Red Documentation Project</a><br /><a class="zrl" href="http://hubzilla/help/to_do_code" target="_blank" >To-Do list for Developers</a><br /><a class="zrl" href="http://hubzilla/help/roadmap" target="_blank" >Version 3 roadmap</a><br /><a class="zrl" href="http://hubzilla/help/git_for_non_developers" target="_blank" >Git for Non-Developers</a><br /><a class="zrl" href="http://hubzilla/help/dev_beginner" target="_blank" >Step-for-step manual for beginning developers</a><br /><br /><h3>Frequently Asked Questions For Developers</h3><br /><a class="zrl" href="http://hubzilla/help/faq_developers" target="_blank" >FAQ For Developers</a><br /><br /><h3>External Resources</h3><br /><br /><a href="https://zothub.com/channel/one" target="_blank" >Development Channel</a><br /><a href="https://federated.social/channel/postgres" target="_blank" >Postgres-specific Hubzilla Admin Support Channel</a><br />\n\t</div>\n</div>\n<script>var homebase = "http://hubzilla/channel/testes";</script>",
- "page_title": "help",
- "title": "Help: Develop",
- "nav": "\t<div class="container-fluid">\n\t\t<div class="navbar-header">\n\t\t\t<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">\n\t\t\t\t<span class="icon-bar"></span>\n\t\t\t\t<span class="icon-bar"></span>\n\t\t\t\t<span class="icon-bar"></span>\n\t\t\t</button>\n\t\t\t<button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1">\n\t\t\t\t<i class="icon-circle-arrow-down" id="expand-tabs-icon"></i>\n\t\t\t</button>\n\t\t\t<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">\n\t\t\t\t<i class="icon-circle-arrow-right" id="expand-aside-icon"></i>\n\t\t\t</button>\n\t\t\t\t\t\t\t<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="http://hubzilla/photo/profile/m/2" alt="testes@hubzilla"><span class="caret" id="usermenu-caret"></span>\n\t\t\t\t\t\t\t\t\t<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="channel/testes" title="Your posts and conversations" role="menuitem" id="channel_nav_btn">Home</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="profile/testes" title="Your profile page" role="menuitem" id="profile_nav_btn">View Profile</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="profiles/2" title="Edit your profile" role="menuitem" id="profiles_nav_btn">Edit Profile</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="photos/testes" title="Your photos" role="menuitem" id="photos_nav_btn">Photos</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="cloud/testes" title="Your files" role="menuitem" id="cloud_nav_btn">Files</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="chat/testes/new" title="Your chatrooms" role="menuitem" id="chat_nav_btn">Chat</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation" class="divider"></li>\n\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation"><a href="settings" title="Account/Channel Settings" role="menuitem" id="settings_nav_btn">Settings</a></li>\t\t\t\t\t\t<li role="presentation"><a href="manage" title="Manage Your Channels" role="menuitem" id="manage_nav_btn">Channel Manager</a></li>\t\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation" class="divider"></li>\n\t\t\t\t\t\t<li role="presentation"><a href="admin/" title="Site Setup and Configuration" role="menuitem" id="admin_nav_btn">Admin</a></li>\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t<li role="presentation" class="divider"></li>\n\t\t\t\t\t\t<li role="presentation"><a href="logout" title="End this session" role="menuitem" id="logout_nav_btn">Logout</a></li>\n\t\t\t\t\t\t\t\t\t\t\t</ul>\n\t\t\t\t\t\t\t\t\t</div>\n\t\t<div class="collapse navbar-collapse" id="navbar-collapse-1">\n\t\t\t<ul class="nav navbar-nav navbar-left">\n\t\t\t\t\t\t\n\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a href="network" title="Your grid" id="network_nav_btn"><i class="icon-th"></i></a>\n\t\t\t\t\t<span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span>\n\t\t\t\t\t<ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network">\n\t\t\t\t\t\t\n\t\t\t\t\t\t<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">Mark all grid notifications seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a href="network" title="Your grid" ><i class="icon-th"></i></a>\n\t\t\t\t\t<span class="net-update badge" rel="#nav-network-menu"></span>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a class="" href="channel/testes" title="Channel home" id="home_nav_btn"><i class="icon-home"></i></a>\n\t\t\t\t\t<span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span>\n\t\t\t\t\t<ul id="nav-home-menu" class="dropdown-menu" rel="home">\n\t\t\t\t\t\t\n\t\t\t\t\t\t<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">Mark all channel notifications seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a class="" href="channel/testes" title="Channel home" ><i class="icon-home"></i></a>\n\t\t\t\t\t<span class="home-update badge" rel="#nav-home-menu"></span>\n\t\t\t\t</li>\n\t\t\t\n\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a class="" href="mail/combined" title="Private mail" id="mail_nav_btn"><i class="icon-envelope"></i></a>\n\t\t\t\t\t<span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span>\n\t\t\t\t\t<ul id="nav-messages-menu" class="dropdown-menu" rel="messages">\n\t\t\t\t\t\t<li id="nav-messages-see-all"><a href="mail/combined">See all private messages</a></li>\n\t\t\t\t\t\t<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">Mark all private messages seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a class="" href="mail/combined" title="Private mail" ><i class="icon-envelope"></i></a>\n\t\t\t\t\t<span class="mail-update badge" rel="#nav-messages-menu"></span>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a class="" href="events" title="Event Calendar" id='events_nav_btn'><i class="icon-calendar"></i></a>\n\t\t\t\t\t<span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span>\n\t\t\t\t\t<ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events">\n\t\t\t\t\t\t<li id="nav-all_events-see-all"><a href="events">See all events</a></li>\n\t\t\t\t\t\t<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">Mark all events seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a class="" href="events" title="Event Calendar" ><i class="icon-calendar"></i></a>\n\t\t\t\t\t<span class="all_events-update badge" rel="#nav-all_events-menu"></span>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a class="" href="connections/ifpending" title="Connections" id="connections_nav_btn"><i class="icon-user"></i></a>\n\t\t\t\t\t<span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span>\n\t\t\t\t\t<ul id="nav-intros-menu" class="dropdown-menu" rel="intros">\n\t\t\t\t\t\t<li id="nav-intros-see-all"><a href=""></a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a class="" href="connections/ifpending" title="Connections" ><i class="icon-user"></i></a>\n\t\t\t\t\t<span class="intro-update badge" rel="#nav-intros-menu"></span>\n\t\t\t\t</li>\n\t\t\t\t\t\n\t\t\t\t\t\t\t<li class=" hidden-xs">\n\t\t\t\t\t<a href="notifications/system" title="Notices" id="notifications_nav_btn"><i class="icon-exclamation"></i></a>\n\t\t\t\t\t<span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span>\n\t\t\t\t\t<ul id="nav-notify-menu" class="dropdown-menu" rel="notify">\n\t\t\t\t\t\t<li id="nav-notify-see-all"><a href="notifications/system">See all notifications</a></li>\n\t\t\t\t\t\t<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">Mark all system notifications seen</a></li>\n\t\t\t\t\t\t<li class="empty">Loading...</li>\n\t\t\t\t\t</ul>\n\t\t\t\t</li>\n\t\t\t\t<li class=" visible-xs">\n\t\t\t\t\t<a href="notifications/system" title="Notices"><i class="icon-exclamation"></i></a>\n\t\t\t\t\t<span class="notify-update badge" rel="#nav-notify-menu"></span>\n\t\t\t\t</li>\n\t\t\t\t\t\t</ul>\n\t\t\t<ul class="nav navbar-nav navbar-right">\n\t\t\t\t<li class="hidden-xs">\n\t\t\t\t\t<form method="get" action="search" role="search">\n\t\t\t\t\t\t<div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder=" @name, #tag, ?doc, content" name="search" title="Search site @name, #tag, ?docs, content" onclick="this.submit();"/>\n\t\t\t\t\t</form>\n\t\t\t\t</li>\n\t\t\t\t<li class="visible-xs">\n\t\t\t\t\t<a href="/search" title="Search site @name, #tag, ?docs, content"><i class="icon-search"></i></a>\n\t\t\t\t</li>\n\n\t\t\t\t\t\t\t\t\t\t<li class="">\n\t\t\t\t\t<a class="" href="directory" title="Channel Directory" id="directory_nav_btn"><i class="icon-sitemap"></i></a>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class="">\n\t\t\t\t\t<a class="" href="apps" title="Applications, utilities, links, games" id="apps_nav_btn"><i class="icon-cogs"></i></a>\n\t\t\t\t</li>\n\t\t\t\n\t\t\t\t\t\t\t<li class="active">\n\t\t\t\t\t<a class="" target="hubzilla-help" href="http://hubzilla/help?f=&cmd=help/develop" title="Help and documentation" id="help_nav_btn"><i class="icon-question"></i></a>\n\t\t\t\t</li>\n\t\t\t\t\t\t</ul>\n\t\t</div>\n\t</div>\n",
- "htmlhead": "<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />\n<base href="http://hubzilla/" />\n<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=1" />\n<meta name="generator" content="hubzilla 2015-11-03.1205H" />\n\n<!--[if IE]>\n<script src="http://hubzilla/library/html5.js"></script>\n<![endif]-->\n\n<link rel="stylesheet" href="http://hubzilla/library/font_awesome/css/font-awesome.min.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/bootstrap/css/bootstrap.min.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/bootstrap-tagsinput/bootstrap-tagsinput.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/bootstrap-red.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/datetimepicker/jquery.datetimepicker.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/tiptip/tipTip.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/jRange/jquery.range.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/conversation.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/widgets.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/colorbox.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/library/justifiedGallery/justifiedGallery.min.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/css/default.css" type="text/css" media="screen">\r\n<link rel="stylesheet" href="http://hubzilla/view/theme/redbasic/php/style.pcss" type="text/css" media="screen">\r\n\n\n<script>\n\n\tvar aStr = {\n\n\t\t'delitem' : "Delete this item?",\n\t\t'comment' : "Comment",\n\t\t'showmore' : "[+] show all",\n\t\t'showfewer' : "[-] show less",\n\t\t'divgrowmore' : "[+] expand",\n\t\t'divgrowless' : "[-] collapse",\n\t\t'pwshort' : "Password too short",\n\t\t'pwnomatch' : "Passwords do not match",\n\t\t'everybody' : "everybody",\n\t\t'passphrase' : "Secret Passphrase",\n\t\t'passhint' : "Passphrase hint",\n\t\t'permschange' : "Notice: Permissions have changed but have not yet been submitted.",\n\t\t'closeAll' : "close all",\n\t\t'nothingnew' : "Nothing new here",\n\t\t'rating_desc' : "Rate This Channel (this is public)",\n\t\t'rating_val' : "Rating",\n\t\t'rating_text' : "Describe (optional)",\n\t\t'submit' : "Submit",\n\t\t'linkurl' : "Please enter a link URL",\n\t\t'leavethispage' : "Unsaved changes. Are you sure you wish to leave this page?",\n\n\t\t't01' : "",\n\t\t't02' : "",\n\t\t't03' : "ago",\n\t\t't04' : "from now",\n\t\t't05' : "less than a minute",\n\t\t't06' : "about a minute",\n\t\t't07' : "%d minutes",\n\t\t't08' : "about an hour",\n\t\t't09' : "about %d hours",\n\t\t't10' : "a day",\n\t\t't11' : "%d days",\n\t\t't12' : "about a month",\n\t\t't13' : "%d months",\n\t\t't14' : "about a year",\n\t\t't15' : "%d years",\n\t\t't16' : " ",\n\t\t't17' : "[]",\n\n\t\t'monthNames' : [ "January","February","March","April","May","June","July","August","September","October","November","December" ],\n\t\t'monthNamesShort' : [ "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" ],\n\t\t'dayNames' : ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],\n\t\t'dayNamesShort' : ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],\n\t\t'today' : "today",\n\t\t'month' : "month",\n\t\t'week' : "week",\n\t\t'day' : "day",\n\t\t'allday' : "All day"\n\t};\n\n</script>\n\t\t\n\n\n<script src="http://hubzilla/view/js/jquery.js" ></script>\r\n<script src="http://hubzilla/library/justifiedGallery/jquery.justifiedGallery.min.js" ></script>\r\n<script src="http://hubzilla/library/sprintf.js/dist/sprintf.min.js" ></script>\r\n<script src="http://hubzilla/view/js/spin.js" ></script>\r\n<script src="http://hubzilla/view/js/jquery.spin.js" ></script>\r\n<script src="http://hubzilla/view/js/jquery.textinputs.js" ></script>\r\n<script src="http://hubzilla/view/js/autocomplete.js" ></script>\r\n<script src="http://hubzilla/library/jquery-textcomplete/jquery.textcomplete.js" ></script>\r\n<script src="http://hubzilla/library/jquery.timeago.js" ></script>\r\n<script src="http://hubzilla/library/readmore.js/readmore.js" ></script>\r\n<script src="http://hubzilla/library/jgrowl/jquery.jgrowl_minimized.js" ></script>\r\n<script src="http://hubzilla/library/cryptojs/components/core-min.js" ></script>\r\n<script src="http://hubzilla/library/cryptojs/rollups/aes.js" ></script>\r\n<script src="http://hubzilla/library/cryptojs/rollups/rabbit.js" ></script>\r\n<script src="http://hubzilla/library/cryptojs/rollups/tripledes.js" ></script>\r\n<script src="http://hubzilla/view/js/acl.js" ></script>\r\n<script src="http://hubzilla/view/js/webtoolkit.base64.js" ></script>\r\n<script src="http://hubzilla/view/js/crypto.js" ></script>\r\n<script src="http://hubzilla/library/jRange/jquery.range.js" ></script>\r\n<script src="http://hubzilla/library/colorbox/jquery.colorbox-min.js" ></script>\r\n<script src="http://hubzilla/library/jquery.AreYouSure/jquery.are-you-sure.js" ></script>\r\n<script src="http://hubzilla/library/tableofcontents/jquery.toc.js" ></script>\r\n<script src="http://hubzilla/library/bootstrap/js/bootstrap.min.js" ></script>\r\n<script src="http://hubzilla/library/bootbox/bootbox.min.js" ></script>\r\n<script src="http://hubzilla/library/bootstrap-tagsinput/bootstrap-tagsinput.js" ></script>\r\n<script src="http://hubzilla/library/datetimepicker/jquery.datetimepicker.js" ></script>\r\n<script src="http://hubzilla/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js" ></script>\r\n<script src="http://hubzilla/view/theme/redbasic/js/redbasic.js" ></script>\r\n\n\n<link rel="shortcut icon" href="http://hubzilla/images/hz-32.png" />\n<link rel="search"\n href="http://hubzilla/opensearch" \n type="application/opensearchdescription+xml" \n title="Search in the Hubzilla" />\n\n\n<script>\n\n\tvar updateInterval = 80000;\n\tvar localUser = 2;\n\tvar zid = 'testes@hubzilla';\n\tvar justifiedGalleryActive = false;\n\t\t\n</script>\n\n\n\n\n<script>$(document).ready(function() {\n\t$("#nav-search-text").search_autocomplete('http://hubzilla/acl');\n});\n\n</script><script src="http://hubzilla/view/js/main.js" ></script>\r\n<link rel="stylesheet" href="http://hubzilla/addon/converse/converse.min.js" media="all" /><script src="http://hubzilla/addon/converse/converse.min.js"></script>",
- "header": "<div id="banner" class="hidden-sm hidden-xs">Hubzilla</div>\n\n<ul id="nav-notifications-template" style="display:none;" rel="template">\n\t<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li>\n</ul>\n"
- },
- "poi": null,
- "force_max_items": 0,
- "module": "help",
- "template_engines": {
- "smarty3": "FriendicaSmartyEngine",
- "internal": "Template"
- },
- "account": {
- "account_flags": "0",
- "account_service_class": "",
- "account_id": "1",
- "account_salt": "9bf8c193c35a56c4c666f47728fe20da",
- "account_expires": "0000-00-00 00:00:00",
- "account_lastlog": "2015-11-04 07:47:55",
- "account_password_changed": "0000-00-00 00:00:00",
- "account_language": "en",
- "account_default_channel": "2",
- "account_password": "",
- "account_parent": "1",
- "account_expire_notified": "0000-00-00 00:00:00",
- "account_reset": "",
- "account_email": "foo@bar.com",
- "account_level": "0",
- "account_roles": "4096",
- "account_external": "",
- "account_created": "2015-10-09 00:44:51"
- },
- "theme_info": [],
- "argv": [
- "help",
- "develop"
- ],
- "template_engine_instance": {
- "smarty3": {}
- },
- "language": "en",
- "pager": {
- "page": 1,
- "itemspage": 60,
- "start": 0,
- "total": 0
- },
- "plugins": [
- "converse"
- ],
- "error": false,
- "pdl": "[region=aside]\n[widget=helpindex][/widget]\n[/region]\n",
- "query_string": "help/develop",
- "cmd": "help/develop",
- "groups": null,
- "videowidth": 425,
- "css_sources": [
- [
- "library/font_awesome/css/font-awesome.min.css",
- "screen"
- ],
- [
- "library/bootstrap/css/bootstrap.min.css",
- "screen"
- ],
- [
- "library/bootstrap-tagsinput/bootstrap-tagsinput.css",
- "screen"
- ],
- [
- "view/css/bootstrap-red.css",
- "screen"
- ],
- [
- "library/datetimepicker/jquery.datetimepicker.css",
- "screen"
- ],
- [
- "library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css",
- "screen"
- ],
- [
- "library/tiptip/tipTip.css",
- "screen"
- ],
- [
- "library/jgrowl/jquery.jgrowl.css",
- "screen"
- ],
- [
- "library/jRange/jquery.range.css",
- "screen"
- ],
- [
- "view/css/conversation.css",
- "screen"
- ],
- [
- "view/css/widgets.css",
- "screen"
- ],
- [
- "view/css/colorbox.css",
- "screen"
- ],
- [
- "library/justifiedGallery/justifiedGallery.min.css",
- "screen"
- ],
- [
- "default.css",
- "screen"
- ],
- [
- "mod_help.css",
- "screen"
- ],
- [
- "view/theme/redbasic/php/style.pcss",
- "screen"
- ]
- ],
- "is_tablet": false,
- "observer": {
- "xchan_deleted": "0",
- "xchan_connpage": "",
- "xchan_pubforum": "0",
- "xchan_flags": "0",
- "xchan_censored": "0",
- "xchan_instance_url": "",
- "xchan_photo_s": "http://hubzilla/photo/profile/s/2",
- "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7MP/xxsq/srA8I7m+WKf\nHlguwwg0b1tz+I3o+djp7b+wF8q03XPKQpYmKfXIj47vpAOu75nKA4Tn90lLymmk\nSXUHogOqOMy1CHoaVrAw2T2/tAeRoMAjAJ5IxSOAM7Xda0nVUK6FmfxPcvftKf9y\nPmvvFadXpaHT4JGPH0tszDhGXLkqlt9xSkIkpsgMA6emj/7bacc6x8eTdtvzo2e5\n/NyPXvBKH4henmYaKjq/4aIYZcBWYVGt6onxaP2j1cSNbksnOY7GbJl+hy95iFoZ\nDWGxiFwQd+CroiBbdlpVGp13cV/WKp2spZzlzkmCRGYoNbbM5RlgFLnmyTa4XMZE\nwnA3ZUB59MsrUJK+0H/utiZrpX5NQcFl33z8k5zB3pPnhc5S5/P+UJZRnqhet1wQ\n7AZVmdP30D75QD8LZ4SytZ1DHn/N76EsVhSADNMnUfEphs708V33Z0gFWultYDoK\nlvXUf4O0/V8GTufFHb6XdAiy92IUzrormXCpXoOmdOcJdaH9RnotZi/DkuQ0zP+Y\nCvxU9nrjyZvAwAdew//XFDjw4HoThVM4k4jzkIhCTlCao/yRnNM7A/i3OKcXq9wU\n7OZqcRfM9o0BFpZTIoXB7BMtpeioJcBi/7FUaV9U9uYLFuLL0qWa1YxLwfsN9rDk\n6A1gbhD60G9/dAbolp8xAHkCAwEAAQ==\n-----END PUBLIC KEY-----\n",
- "xchan_connurl": "http://hubzilla/poco/testes",
- "xchan_name_date": "2015-10-09 00:45:41",
- "xchan_system": "0",
- "xchan_photo_date": "2015-10-09 00:45:41",
- "xchan_photo_m": "http://hubzilla/photo/profile/m/2",
- "xchan_hidden": "0",
- "xchan_selfcensored": "0",
- "xchan_photo_mimetype": "image/jpeg",
- "xchan_network": "zot",
- "xchan_guid": "Ok-ycNKQYMzjokLnIz5OTCF8M5f4CtRT4vJCUeUivJhIOJWk3ORwIQgGx3P5g2Yz79KxQ-rs_Cn2G_jsgM6hmw",
- "xchan_guid_sig": "XXX",
- "xchan_hash": "uRy0nF-urp6k_bFrkdtCc2EkBynwpgCJL_FQFoTwyw2Hep7AHkrSt1MZcHWV_8DQucNlHSY1vHgUNS2Fvoirpw",
- "xchan_url": "http://hubzilla/channel/testes",
- "xchan_addr": "testes@hubzilla",
- "xchan_orphan": "0",
- "xchan_follow": "http://hubzilla/follow?f=&url=%s",
- "xchan_name": "testes",
- "xchan_photo_l": "http://hubzilla/photo/profile/l/2"
- },
- "contact": null,
- "identities": null,
- "user": null,
- "videoheight": 350,
- "profile": null,
- "theme_thread_allow": true,
- "data": {
- "pageicon": "/images/hz-32.png"
- }
-}[/code]
-
-
-#include doc/macros/main_footer.bb;
-
diff --git a/doc/general.bb b/doc/general.bb
index c9c2501e5..bbc85c900 100644
--- a/doc/general.bb
+++ b/doc/general.bb
@@ -1,20 +1,16 @@
-
-[h2]Project/Site Information[/h2]
-
+[h2]Project and site information[/h2]
+[h3]$Projectname[/h3]
[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]
-
[zrl=[baseurl]/help/history]$Projectname history[/zrl]
-
-[h3]External Resources[/h3]
-[zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl]
-
+[h3]External resources[/h3]
+[zrl=[baseurl]/help/external-resource-links]List of external resources[/zrl]
[url=https://github.com/redmatrix/hubzilla]Main Website[/url]
[url=https://github.com/redmatrix/hubzilla-addons]Addon Website[/url]
-
[url=[baseurl]/help/credits]$Projectname Credits[/url]
-
-[h3]About This $Projectname Hub[/h3]
+[h3]About this $Projectname hub[/h3]
[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl]
[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl]
[zrl=[baseurl]/siteinfo/json]Detailed Technical Hub Information in JSON format(/siteinfo/json)[/zrl]
+#include doc/macros/main_footer.bb;
+
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 520abc22b..6e093dbfc 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -1,214 +1,105 @@
-[b]Advanced Configurations for Administrators[/b]
-
+[h1]Advanced Configurations for Administrators[/h1]
$Projectname contains many configuration options hidden from the main admin panel.
-These are generally options considered too niche, confusing, or advanced for
-the average member. These settings can be activated from the the top level web
-directory with the syntax [code]util/config cat key value[/code] for a site
-configuration, or [code]util/pconfig channel_id cat key value[/code] for a
-member configuration.
+These are generally options considered too niche, confusing, or advanced for the average member. These settings can be activated from the the top level web directory with the syntax
+
+[code]util/config cat key value[/code]
+for a site configuration, or
+
+[code]util/pconfig channel_id cat key value[/code]
+for a member configuration.
This document assumes you're an administrator.
+[h2]pconfig[/h2][dl terms="mb"]
+ [*= system.always_my_theme ] Always use your own theme when viewing channels on the same hub. This will break in some quite imaginative ways when viewing channels with theme dependent Comanche.
+ [*= system.blocked ] An array of xchans blocked by this channel. Technically, this is a hidden config and does belong here, however, addons (notably superblock) have made this available in the UI.
+ [*= system.default_cipher ] Set the default cipher used for E2EE items.
+ [*= system.display_friend_count ] Set the number of connections to display in the connections profile widget.
+ [*= system.do_not_track ] As the browser header. This will break many identity based features. You should really just set permissions that make sense.
+ [*= system.forcepublicuploads ] Force uploaded photos to be public when uploaded as wall items. It makes far more sense to just set your permissions properly in the first place. Do that instead.
+ [*= system.network_page_default ] Set default params when viewing the network page. This should contain the same querystring as manual filtering.
+ [*= system.paranoia ] Sets the security level of IP checking. If the IP address of a logged-in session changes apply this level to determine if the account should be logged out as a security breach.
+Options are:
+ 0 — no IP checking
+ 1 — check 3 octets
+ 2 — check 2 octets
+ 3 — check for any difference at all
-[b]pconfig[/b]
- [b]system.user_scalable[/b]
- Determine if the app is scalable on touch screens. Defaults to on, to
- disable, set to zero - real zero, not just false.
- [b]system.always_my_theme[/b]
- Always use your own theme when viewing channels on the same hub. This
- will break in some quite imaginative ways when viewing channels with
- theme dependent Comanche.
- [b]system.paranoia[/b]
- Sets the security level of IP checking. If the IP address of a logged-in session changes
- apply this level to determine if the account should be logged out as a security breach.
- Options are:
- 0 - no IP checking
- 1 - check 3 octets
- 2 - check 2 octets
- 3 - check for any difference at all
- [b]system.prevent_tag_hijacking[/b]
- Prevent foreign networks hijacking hashtags in your posts and directing them at its own resources.
- [b]system.blocked[/b]
- An array of xchans blocked by this channel. Technically, this is a
- hidden config and does belong here, however, addons (notably
- superblock) have made this available in the UI.
- [b]system.default_cipher[/b]
- Set the default cipher used for E2EE items.
- [b]system.network_page_default[/b]
- Set default params when viewing the network page. This should contain
- the same querystring as manual filtering.
- [b]system.display_friend_count[/b]
- Set the number of connections to display in the connections profile
- widget.
- [b]system.taganyone[/b]
- Requires the config of the same name to be enabled. Allow the @mention tagging
- of anyone, whether you are connected or not. This doesn't scale.
- [b]system.startpage[/b]
- Another of those technically hidden configs made available by addons.
- Sets the default page to view when logging in. This is exposed to the
- UI by the startpage addon.
- [b]system.forcepublicuploads[/b]
- Force uploaded photos to be public when uploaded as wall items. It
- makes far more sense to just set your permissions properly in the first
- place. Do that instead.
- [b]system.do_not_track[/b]
- As the browser header. This will break many identity based features.
- You should really just set permissions that make sense.
+ [*= system.prevent_tag_hijacking ] Prevent foreign networks hijacking hashtags in your posts and directing them at its own resources.
+ [*= system.startpage ] Another of those technically hidden configs made available by addons. Sets the default page to view when logging in. This is exposed to the UI by the startpage addon.
+ [*= system.taganyone ] Requires the config of the same name to be enabled. Allow the @mention tagging of anyone, whether you are connected or not. This doesn't scale.
+ [*= system.user_scalable ] Determine if the app is scalable on touch screens. Defaults to on, to disable, set to zero - real zero, not just false.
+[/dl]
+[h2]Site config[/h2][dl terms="mb"]
+ [*= randprofile.check ] When requesting a random profile, check that it actually exists first
+ [*= randprofile.retry ] Number of times to retry getting a random profile
+ [*= system.admin_email ] Specifies the administrator's email for this site. This is initially set during install.
+ [*= system.authlog ] Logfile to use for logging auth errors. Used to plug in to server side software such as fail2ban. Auth failures are still logged to the main logs as well.
+ [*= system.auto_channel_create ] Add the necessary form elements to create the first channel on the account registration page, and create it (possibly following email validation or administrator approval). This precludes the ability to import a channel from another site as the first channel created on this site for a new account. Use with system.default_permissions_role to streamline registration.
+ [*= system.auto_follow ] Make the first channel of an account auto-follow channels listed here - comma separated list of webbies (member@hub addresses).
+ [*= system.blacklisted_sites ] An array of specific hubs to block from this hub completely.
+ [*= system.block_public_search ] Similar to block_public, except only blocks public access to search features. Useful for sites that want to be public, but keep getting hammered by search engines.
+ [*= system.cron_hour ] Specify an hour in which to run cron_daily. By default with no config, this will run at midnight UTC.
+ [*= system.default_permissions_role ] If set to a valid permissions role name, use that role for the first channel created by a new account and don't ask for the "Channel Type" on the channel creation form. Examples of valid names are: 'social', 'social_restricted', 'social_private', 'forum', 'forum_restricted' and 'forum_private'. Read more about permissions roles [zrl=[baseurl]/help/roles]here[/zrl].
+ [*= system.default_photo_profile ] Set the profile photo that new channels start with. This should contain the name of a directory located under [font=courier]images/default_profile_photos/[/font], or be left unset. If not set then 'rainbow_man' is assumed.
+ [*= system.directorytags ] Set the number of keyword tags displayed on the directory page. Default is 50 unless set to a positive integer.
+ [*= system.disable_directory_keywords ] If '1', do not show directory keywords. If the hub is a directory server, prevent returning tags to any directory clients. Please do not set this for directory servers in the RED_GLOBAL realm.
+ [*= system.disable_discover_tab ] This allows you to completely disable the ability to discover public content from external sites.
+ [*= system.disable_dreport ] If '1', don't store or link to delivery reports
+ [*= system.dlogfile ] Logfile to use for logging development errors. Exactly the same as logger otherwise. This isn't magic, and requires your own logging statements. Developer tool.
+ [*= system.email_notify_icon_url ] URL of image (32x32) to display in email notifications (HTML bodies).
+ [*= system.expire_delivery_reports ] Expiration in days for delivery reports - default 10
+ [*= system.expire_limit ] Don't expire any more than this number of posts per channel per expiration run to keep from exhausting memory. Default 5000.
+ [*= system.hidden_version_siteinfo ] If true, do not report the software version on siteinfo pages (system.hide_version also hides the version on these pages, this setting *only* hides the version on siteinfo pages).
+ [*= system.hide_help ] Don't display help documentation link in nav bar
+ [*= system.hide_in_statistics ] Tell the red statistics servers to completely hide this hub in hub lists.
+ [*= system.hide_version ] If true, do not report the software version on webpages and tools. (*) Must be set in .htconfig.php
+ [*= system.ignore_imagick ] Ignore imagick and use GD, even if imagick is installed on the server. Prevents some issues with PNG files in older versions of imagick.
+ [*= system.max_daily_registrations ] Set the maximum number of new registrations allowed on any day. Useful to prevent oversubscription after a bout of publicity for the project.
+ [*= system.max_import_size ] If configured, the maximum length of an imported text message. This is normally left at 200Kbytes or more to accomodate Friendica private photos, which are embedded.
+ [*= system.max_tagged_forums ] Spam prevention. Limits the number of tagged forums which are recognised in any post. Default is 2. Only the first 'n' tags will be delivered as forums, the others will not cause any delivery.
+ [*= system.minimum_feedcheck_minutes ] The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'.
+ [*= system.no_age_restriction ] Do not restrict registration to people over the age of 13. This carries legal responsibilities in many countries to require that age be provided and to block all personal information from minors, so please check your local laws before changing.
+ [*= system.openssl_conf_file ] Specify a file containing OpenSSL configuration. Needed in some Windows installations to locate the openssl configuration file on the system. Read the code first. If you can't read the code, don't play with it.
+ [*= system.openssl_encrypt ] Use openssl encryption engine, default is false (uses mcrypt for AES encryption)
+ [*= system.optimize_items ] Runs optimise_table during some tasks to keep your database nice and defragmented. This comes at a performance cost while the operations are running, but also keeps things a bit faster while it's not. There also exist CLI utilities for performing this operation, which you may prefer, especially if you're a large site.
+ [*= system.override_poll_lockfile ] Ignore the lock file in the poller process to allow more than one process to run at a time.
+ [*= system.paranoia ] As the pconfig, but on a site-wide basis. Can be overwritten by member settings.
+ [*= system.photo_cache_time ] How long to cache photos, in seconds. Default is 86400 (1 day). Longer time increases performance, but it also means it takes longer for changed permissions to apply.
+ [*= system.platform_name ] What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php
+ [*= system.poco_rating_enable ] Distributed reputation reporting and data collection may be disabled. If your site does not participate in distributed reputation you will also not be able to make use of the data from your connections on other sites. By default and in the absence of any setting it is enabled. Individual members can opt out by restricting who can see their connections or by not providing any reputation information for their connections.
+ [*= system.poke_basic ] Reduce the number of poke verbs to exactly 1 ("poke"). Disable other verbs.
+ [*= system.proc_run_use_exec ] If 1, use the exec system call in proc_run to run background tasks. By default we use proc_open and proc_close. On some (currently rare) systems this does not work well.
+ [*= system.projecthome ] Display the project page on your home page for logged out viewers.
+ [*= system.projecthome ] Set the project homepage as the homepage of your hub. (Obsolete)
+ [*= system.register_link ] path to direct to from the "register" link on the login form. On closed sites this will direct to 'pubsites'. For open sites it will normally redirect to 'register' but you may change this to a custom site page offering subscriptions or whatever.
+ [*= system.reserved_channels ] Don't allow members to register channels with this comma separated list of names (no spaces)
+ [*= system.sellpage ] A URL shown in the public sites list to sell your hub - display service classes, etc.
+ [*= system.startpage ] Set the default page to be taken to after a login for all channels at this website. Can be overwritten by user settings.
+ [*= system.sys_expire_days ] How many days to keep discovered public content from other sites
+ [*= system.taganyone ] Allow the @mention tagging of anyone whether you are connected or not.
+ [*= system.tempdir ] Place to store temporary files (currently unused), default is defined in the PHP configuration
+ [*= system.tos_url ] Set an alternative link for the ToS location.
+ [*= system.transport_security_header ] if non-zero and SSL is being used, include a strict-transport-security header on webpages
+ [*= system.uploaddir ] Location to upload files (default is system.tempdir, currently used only by js_upload plugin)
+ [*= system.workflow_channel_next ] The page to direct new members to immediately after creating a channel.
+ [*= system.workflow_register_next ] The page to direct members to immediately after creating an account (only when auto_channel_create or UNO is enabled).
+[/dl]
+[h2]Directory config[/h2]
+[h3]Directory search defaults[/h3][dl terms="mb"]
+ [*= directory.globaldir ] 0 or 1. Default 0. If you visit the directory on a site you'll just see the members of that site by default. You have to go through an extra step to see the people in the rest of the network; and by doing so there's a clear delineation that these people *aren't* members of that site but of a larger network.
+ [*= directory.pubforums ] 0 or 1. Public forums [i]should[/i] be default 0.
+ [*= directory.safemode ] 0 or 1.
+[/dl]
+[h3]Directory server configuration[/h3][i](see [zrl=[baseurl]/help/directories]help/directories[/zrl])[/i]
-[b]Site config[/b]
- [b]system.taganyone[/b]
- Allow the @mention tagging of anyone whether you are connected or not.
- [b]system.directorytags[/b]
- Set the number of keyword tags displayed on the directory page. Default is 50 unless set to a
- positive integer.
- [b]system.disable_directory_keywords[/b]
- If '1', do not show directory keywords. If the hub is a directory server, prevent returning
- tags to any directory clients. Please do not set this for directory servers in the RED_GLOBAL realm.
- [b]system.disable_dreport[/b]
- If '1', don't store or link to delivery reports
- [b]system.startpage[/b]
- Set the default page to be taken to after a login for all channels at
- this website. Can be overwritten by user settings.
- [b]system.projecthome[/b]
- Set the project homepage as the homepage of your hub. (Obsolete)
- [b]system.auto_channel_create[/b]
- Add the necessary form elements to create the first channel on the account registration page, and create it
- (possibly following email validation or administrator approval). This precludes the ability to import a channel
- from another site as the first channel created on this site for a new account.
- Use with system.default_permissions_role to streamline registration.
- [b]system.default_permissions_role[/b]
- If set to a valid permissions role name, use that role for
- the first channel created by a new account and don't ask for the "Channel Type" on
- the channel creation form. Examples of valid names are: 'social', 'social_restricted', 'social_private',
- 'forum', 'forum_restricted' and 'forum_private'.
- Read more about permissions roles [zrl=[baseurl]/help/roles]here[/zrl].
- [b]system.workflow_channel_next[/b]
- The page to direct new members to immediately after creating a channel.
- [b]system.workflow_register_next[/b]
- The page to direct members to immediately after creating an account (only when auto_channel_create or UNO is enabled).
- [b]system.max_daily_registrations[/b]
- Set the maximum number of new registrations allowed on any day.
- Useful to prevent oversubscription after a bout of publicity
- for the project.
- [b]system.tos_url[/b]
- Set an alternative link for the ToS location.
- [b]system.block_public_search[/b]
- Similar to block_public, except only blocks public access to
- search features. Useful for sites that want to be public, but
- keep getting hammered by search engines.
- [b]system.proc_run_use_exec
- If 1, use the exec system call in proc_run to run background tasks. By default
- we use proc_open and proc_close. On some (currently rare) systems this does not work well.
- [b]system.paranoia[/b]
- As the pconfig, but on a site-wide basis. Can be overwritten
- by member settings.
- [b]system.transport_security_header[/b]
- if non-zero and SSL is being used, include a strict-transport-security header on webpages
- [b]system.poke_basic[/b]
- Reduce the number of poke verbs to exactly 1 ("poke"). Disable other verbs.
- [b]system.openssl_conf_file[/b]
- Specify a file containing OpenSSL configuration. Read the code first.
- If you can't read the code, don't play with it.
- [b]system.optimize_items[/b]
- Runs optimise_table during some tasks to keep your database nice and
- defragmented. This comes at a performance cost while the operations
- are running, but also keeps things a bit faster while it's not.
- There also exist CLI utilities for performing this operation, which you
- may prefer, especially if you're a large site.
- [b]system.expire_limit
- Don't expire any more than this number of posts per channel per
- expiration run to keep from exhausting memory. Default 5000.
- [b]system.dlogfile[/b]
- Logfile to use for logging development errors. Exactly the same as
- logger otherwise. This isn't magic, and requires your own logging
- statements. Developer tool.
- [b]system.authlog[/b]
- Logfile to use for logging auth errors. Used to plug in to server
- side software such as fail2ban. Auth failures are still logged to
- the main logs as well.
- [b]system.hide_in_statistics[/b]
- Tell the red statistics servers to completely hide this hub in hub lists.
- [b]system.reserved_channels[/b]
- Don't allow members to register channels with this comma separated
- list of names (no spaces)
- [b]system.auto_follow[/b]
- Make the first channel of an account auto-follow channels listed here - comma separated list of webbies (member@hub addresses).
- [b]system.admin_email[/b]
- Specifies the administrator's email for this site. This is initially set during install.
- [b]system.cron_hour[/b]
- Specify an hour in which to run cron_daily. By default with no config, this will run at midnight UTC.
- [b]system.minimum_feedcheck_minutes[/b]
- The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'.
- [b]system.blacklisted_sites[/b]
- An array of specific hubs to block from this hub completely.
- [b]system.ignore_imagick[/b]
- Ignore imagick and use GD, even if imagick is installed on the server. Prevents some issues with PNG files in older versions of imagick.
- [b]system.no_age_restriction[/b]
- Do not restrict registration to people over the age of 13. This carries legal responsibilities in many countries to require that age be provided and to block all personal information from minors, so please check your local laws before changing.
- [b]system.override_poll_lockfile[/b]
- Ignore the lock file in the poller process to allow more than one process to run at a time.
- [b]system.projecthome[/b]
- Display the project page on your home page for logged out viewers.
- [b]system.sellpage[/b]
- A URL shown in the public sites list to sell your hub - display service classes, etc.
- [b]randprofile.check[/b]
- When requesting a random profile, check that it actually exists first
- [b]randprofile.retry[/b]
- Number of times to retry getting a random profile
- [b]system.photo_cache_time[/b]
- How long to cache photos, in seconds. Default is 86400 (1 day).
- Longer time increases performance, but it also means it takes longer for changed permissions to apply.
- [b]system.poco_rating_enable[/b]
- Distributed reputation reporting and data collection may be disabled. If your site does not participate in distributed reputation you will also not be able to make use of the data from your connections on other sites. By default and in the absence of any setting it is enabled. Individual members can opt out by restricting who can see their connections or by not providing any reputation information for their connections.
- [b]system.register_link[/b]
- path to direct to from the "register" link on the login form. On closed sites this will direct to 'pubsites'. For open sites it will normally redirect to 'register' but you may change this to a custom site page offering subscriptions or whatever.
- [b]system.max_import_size[/b]
- If configured, the maximum length of an imported text message. This is normally left at 200Kbytes or more to accomodate Friendica private photos, which are embedded.
- [b]system.tempdir[/b]
- Place to store temporary files (currently unused), default is defined in the PHP configuration
- [b]system.uploaddir[/b]
- Location to upload files (default is system.tempdir, currently used only by js_upload plugin)
- [b]system.disable_discover_tab[/b]
- This allows you to completely disable the ability to discover public content from external sites.
- [b]system.sys_expire_days[/b]
- How many days to keep discovered public content from other sites
- [b]system.openssl_encrypt[/b]
- Use openssl encryption engine, default is false (uses mcrypt for AES encryption)
- [b]system.max_tagged_forums[/b]
- Spam prevention. Limits the number of tagged forums which are recognised in any post. Default is 2. Only the first 'n' tags will be delivered as forums, the others will not cause any delivery.
- [b]system.openssl_conf_file[/b]
- Needed in some Windows installations to locate the openssl configuration file on the system.
- [b]system.hide_help[/b]
- Don't display help documentation link in nav bar
- [b]system.expire_delivery_reports[/b]
- Expiration in days for delivery reports - default 10
- [b]system.platform_name[/b] *
- What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php
- [b]system.hide_version[/b] *
- If true, do not report the software version on webpages and tools. (*) Must be set in .htconfig.php
- [b]system.hidden_version_siteinfo[/b]
- If true, do not report the software version on siteinfo pages (system.hide_version also hides the version on these pages, this setting *only* hides the version on siteinfo pages).
- [b]system.email_notify_icon_url[/b]
- URL of image (32x32) to display in email notifications (HTML bodies).
+[dl terms="mb"]
+ [*= system.directory_mode ]
+ [*= system.directory_primary ]
+ [*= system.directory_realm ]
+ [*= system.directory_server ]
+ [*= system.realm_token ]
+[/dl]
-[b]Directory config[/b]
-[b]Directory search defaults[/b]
- [b]directory.safemode[/b]
- 0 or 1.
- [b]directory.globaldir[/b]
- 0 or 1. Default 0. If you visit the directory on a site you'll just see the members of that site by default. You have to go through an extra step to see the people in the rest of the network; and by doing so there's a clear delineation that these people *aren't* members of that site but of a larger network.
- [b]directory.pubforums[/b]
- 0 or 1. Public forums *should* be default 0.
-[b]Directory server configuration (see [zrl=[baseurl]/help/directories]help/directories[/zrl])[/b]
- [b]system.directory_server[/b]
- [b]system.directory_primary[/b]
- [b]system.directory_realm[/b]
- [b]system.realm_token[/b]
- [b]system.directory_mode[/b]
-
-
-
-
-
#include doc/macros/main_footer.bb;
diff --git a/doc/hook/change_channel.bb b/doc/hook/change_channel.bb
new file mode 100644
index 000000000..4514b9265
--- /dev/null
+++ b/doc/hook/change_channel.bb
@@ -0,0 +1,11 @@
+[h2]change_channel[/h2]
+
+Called when entering a logged in state in a channel context (as opposed to an account context).
+The hook array provides two arguments, 'channel_id' and 'chanx'. 'chanx' is a union of the channel
+and xchan records for the now active channel.
+
+Use this to capture what would traditionally be known as 'login events'. In this platform, login is
+a separate authentication activity and doesn't necessarily require "connecting to an identity", which
+is what the change_channel activity represents.
+
+
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index bae641585..66ff1cf71 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -34,12 +34,18 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/activity_received]activity_received[/zrl]
Called when an activity (post, comment, like, etc.) has been received from a zot source
+[zrl=[baseurl]/help/hook/admin_aside]admin_aside[/zrl]
+ Called when generating the admin page sidebar widget
+
[zrl=[baseurl]/help/hook/affinity_labels]affinity_labels[/zrl]
Used to generate alternate labels for the affinity slider.
[zrl=[baseurl]/help/hook/api_perm_is_allowed]api_perm_is_allowed[/zrl]
Called when perm_is_allowed() is executed from an API call.
+[zrl=[baseurl]/help/hook/app_menu]app_menu[/zrl]
+ Called when generating the app_menu dropdown (may be obsolete)
+
[zrl=[baseurl]/help/hook/atom_author]atom_author[/zrl]
Called when generating an author or owner element for an Atom ActivityStream feed
@@ -64,6 +70,12 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/bbcode]bbcode[/zrl]
Called when converting bbcode to HTML
+[zrl=[baseurl]/help/hook/bb_translate_video]bb_translate_video[/zrl]
+ Called when extracting embedded services from bbcode video elements (rarely used)
+
+[zrl=[baseurl]/help/hook/change_channel]change_channel[/zrl]
+ Called when logging in to a channel (either during login or afterward through the channel manager)
+
[zrl=[baseurl]/help/hook/channel_remove]channel_remove[/zrl]
Called when removing a channel
@@ -88,6 +100,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/check_siteallowed]check_siteallowed[/zrl]
Used to over-ride or bypass the site black/white block lists
+[zrl=[baseurl]/help/hook/comment_buttons]comment_buttons[/zrl]
+ Called when rendering the edit buttons for comments
+
[zrl=[baseurl]/help/hook/connect_premium]connect_premium[/zrl]
Called when connecting to a premium channel
@@ -112,6 +127,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/conversation_start]conversation_start[/zrl]
Called in the beginning of rendering a conversation (message or message collection or stream)
+[zrl=[baseurl]/help/hook/cover_photo_content_end]cover_photo_content_end[/zrl]
+ Called after a cover photo has been uplaoded
+
[zrl=[baseurl]/help/hook/create_identity]create_identity[/zrl]
Called when creating a channel
@@ -184,6 +202,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/follow]follow[/zrl]
called when a follow operation takes place
+[zrl=[baseurl]/help/hook/follow_from_feed]follow_from_feed[/zrl]
+ called when a follow operation takes place on an RSS feed
+
[zrl=[baseurl]/help/hook/follow_allow]follow_allow[/zrl]
called before storing the results of a follow operation
@@ -206,6 +227,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/get_all_perms]get_all_perms[/zrl]
called when get_all_perms() is used
+[zrl=[baseurl]/help/hook/get_best_language]get_best_language[/zrl]
+ called when choosing the preferred language for the page
+
[zrl=[baseurl]/help/hook/get_features]get_features[/zrl]
Called when get_features() is called
@@ -224,8 +248,11 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/hostxrd]hostxrd[/zrl]
Called when generating .well-known/hosts-meta for "old webfinger" (used by Diaspora protocol)
+[zrl=[baseurl]/help/hook/html2bb_video]html2bb_video[/zrl]
+ Called when using the html2bbcode translation to handle embedded media
+
[zrl=[baseurl]/help/hook/html2bbcode]html2bbcode[/zrl]
- Called when using the html2bbcode tranlsation
+ Called when using the html2bbcode translation
[zrl=[baseurl]/help/hook/identity_basic_export]identity_basic_export[/zrl]
Called when exporting a channel's basic information for backup or transfer
@@ -266,6 +293,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/local_dir_update]local_dir_update[/zrl]
Called when processing a directory update from a channel on the directory server
+[zrl=[baseurl]/help/hook/location_move]location_move[/zrl]
+ Called when a new location has been provided to a UNO channel (indicating a move rather than a clone)
+
[zrl=[baseurl]/help/hook/logged_in]logged_in[/zrl]
Called when authentication by any means has succeeeded
@@ -281,6 +311,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/magic_auth]magic_auth[/zrl]
Called when processing a magic-auth sequence
+[zrl=[baseurl]/help/hook/match_webfinger_location]match_webfinger_location[/zrl]
+ Called when processing webfinger requests
+
[zrl=[baseurl]/help/hook/magic_auth_openid_success]magic_auth_openid_success[/zrl]
Called when a magic-auth was successful due to openid credentials
@@ -324,11 +357,17 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
Called when a hub is delivered
[zrl=[baseurl]/help/hook/notifier_normal]notifier_normal[/zrl]
- Called when the notofoer is invoked for a 'normal' delivery
+ Called when the notifier is invoked for a 'normal' delivery
+
+[zrl=[baseurl]/help/hook/notifier_process]notifier_process[/zrl]
+ Called when the notifier is processing a message/event
[zrl=[baseurl]/help/hook/obj_verbs]obj_verbs[/zrl]
Called when creating the list of verbs available for profile "things".
+[zrl=[baseurl]/help/hook/oembed_action]oembed_action[/zrl]
+ Called when deciding if an oembed url is to be filter, blocked, or approved
+
[zrl=[baseurl]/help/hook/oembed_probe]oembed_probe[/zrl]
Called when performing an oembed content lookup
@@ -445,6 +484,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/profile_tabs]profile_tabs[/zrl]
Called when generating the tabs for channel related pages (channel,profile,files,etc.)
+
+[zrl=[baseurl]/help/hook/queue_deliver]queue_deliver[/zrl]
+ Called when delivering a queued message
[zrl=[baseurl]/help/hook/register_account]register_account[/zrl]
Called when an account has been created
@@ -458,6 +500,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/reverse_magic_auth]reverse_magic_auth[/zrl]
Called before invoking reverse magic auth to send you to your own site to authenticate on this site
+[zrl=[baseurl]/help/hook/settings_account]settings_account[/zrl]
+ Called when generating the account settings form
+
[zrl=[baseurl]/help/hook/settings_form]settings_form[/zrl]
Called when generating the channel settings form
diff --git a/doc/hooks.html b/doc/hooks.html
index c05de58ef..f4a5a7630 100644
--- a/doc/hooks.html
+++ b/doc/hooks.html
@@ -1 +1 @@
-Hooks
Function Source File Arg $a->module . _mod_aftercontent index.php $arr $a->module . _mod_content index.php $arr $a->module . _mod_init index.php $placeholder $a->module . _mod_post index.php $_POST $a->module . _post_ . $selname include/acl_selectors.php $o $a->module . _post_ . $selname include/acl_selectors.php $o $a->module . _post_ . $selname include/acl_selectors.php $o $a->module . _pre_ . $selname include/acl_selectors.php $arr $a->module . _pre_ . $selname include/acl_selectors.php $arr $a->module . _pre_ . $selname include/acl_selectors.php $arr $name include/plugin.php &$data = null about_hook mod/siteinfo.php $o accept_follow mod/connedit.php $arr account_downgrade include/account.php $ret account_downgrade include/account.php $ret account_settings mod/settings.php $account_settings activity_received include/zot.php $parr affinity_labels include/widgets.php $labels affinity_labels mod/connedit.php $labels api_perm_is_allowed include/permissions.php $arr app_menu index.php $arr atom_author include/items.php $o atom_entry include/items.php $o atom_feed include/items.php $atom atom_feed_end include/items.php $atom attach_upload_file include/attach.php $f authenticate include/auth.php $addon_auth avatar_lookup include/network.php $avatar bb2diaspora include/bb2diaspora.php $Text bbcode include/bbcode.php $Text channel_remove include/Contact.php $r[0] chat_message include/chat.php $arr chat_post mod/chatsvc.php $arr check_account_email include/account.php $arr check_account_invite include/account.php $arr check_account_password include/account.php $arr connect_premium mod/connect.php $arr connector_settings mod/settings.php $settings_connectors construct_page boot.php $arr contact_block_end include/text.php $arr contact_edit mod/connedit.php $arr contact_edit_post mod/connedit.php $_POST contact_select_options include/acl_selectors.php $x conversation_start include/conversation.php $cb create_identity include/identity.php $newuid cron include/cronhooks.php $d cron_daily include/poller.php datetime_convert() cron_weekly include/poller.php datetime_convert() directory_item mod/directory.php $arr discover_by_webbie include/network.php $arr display_item include/ItemObject.php $arr display_item include/conversation.php $arr display_settings mod/settings.php $o display_settings_post mod/settings.php $_POST donate_contributors extend/addon/matrix/donate/donate.php $contributors donate_plugin extend/addon/matrix/donate/donate.php $o donate_sponsors extend/addon/matrix/donate/donate.php $sponsors dreport_is_storable include/zot.php $dr drop_item include/items.php $arr enotify include/enotify.php $h enotify_mail include/enotify.php $datarray enotify_store include/enotify.php $datarray event_created include/event.php $event[id] event_updated include/event.php $event[id] externals_url_select include/externals.php $arr feature_enabled include/features.php $arr feature_settings mod/settings.php $settings_addons feature_settings_post mod/settings.php $_POST follow include/follow.php $arr follow include/follow.php $arr follow_allow include/follow.php $x gender_selector include/profile_selectors.php $select gender_selector_min include/profile_selectors.php $select generate_map include/text.php $arr generate_named_map include/text.php $arr get_all_api_perms include/permissions.php $arr get_all_perms include/permissions.php $arr get_features include/features.php $arr get_role_perms include/permissions.php $ret get_widgets boot.php $arr get_widgets boot.php $arr global_permissions include/permissions.php $ret home_content mod/home.php $o home_init mod/home.php $ret hostxrd mod/hostxrd.php $arr html2bbcode include/html2bbcode.php $message identity_basic_export include/identity.php $addon import_author_xchan include/items.php $arr import_channel mod/import.php $addon import_directory_profile include/zot.php $d import_xchan include/zot.php $arr item_photo_menu include/conversation.php $args item_store include/items.php $d item_store include/items.php $arr item_store_update include/items.php $d item_translate include/items.php $translate item_translate include/items.php $translate jot_networks include/acl_selectors.php $jotnets jot_networks include/conversation.php $jotnets jot_networks mod/editblock.php $jotnets jot_networks mod/editpost.php $jotnets jot_networks mod/editwebpage.php $jotnets jot_networks mod/editlayout.php $jotnets jot_tool include/conversation.php $jotplugins jot_tool mod/editblock.php $jotplugins jot_tool mod/editpost.php $jotplugins jot_tool mod/editwebpage.php $jotplugins jot_tool mod/editlayout.php $jotplugins load_pdl boot.php $arr local_dir_update include/dir_fns.php $arr logged_in include/oauth.php $a->user logged_in include/api.php $a->user logged_in include/security.php $a->account logged_in include/security.php $user_record logging_out include/auth.php $args login_hook boot.php $o magic_auth mod/magic.php $arr magic_auth_openid_success mod/openid.php $arr magic_auth_openid_success mod/openid.php $arr magic_auth_success mod/post.php $arr main_slider include/widgets.php $arr marital_selector include/profile_selectors.php $select marital_selector_min include/profile_selectors.php $select module_loaded index.php $x mood_verbs include/text.php $arr nav include/nav.php $x network_content_init mod/network.php $arr network_ping mod/ping.php $arr network_tabs include/conversation.php $arr network_to_name include/contact_selectors.php $nets notifier_end include/notifier.php $target_item notifier_hub include/notifier.php $narr notifier_normal include/deliver_hooks.php $r[0] obj_verbs include/taxonomy.php $arr oembed_probe include/oembed.php $x page_content_top index.php $a->page[content] page_end index.php $a->page[content] page_header include/nav.php $a->page[nav] parse_atom include/items.php $arr parse_link mod/linkinfo.php $arr pdl_selector include/comanche.php $arr perm_is_allowed include/permissions.php $arr permissions_create include/notifier.php $perm_update permissions_update include/notifier.php $perm_update personal_xrd mod/xrd.php $arr photo_post_end include/photos.php $ret photo_post_end include/photos.php $ret photo_upload_begin include/attach.php $arr photo_upload_begin include/photos.php $args photo_upload_end include/attach.php $ret photo_upload_end include/attach.php $ret photo_upload_end include/attach.php $ret photo_upload_end include/attach.php $ret photo_upload_end include/attach.php $ret photo_upload_end include/photos.php $ret photo_upload_end include/photos.php $ret photo_upload_end include/photos.php $ret photo_upload_end include/photos.php $ret photo_upload_file include/attach.php $f photo_upload_file include/photos.php $f photo_upload_form mod/photos.php $ret poke_verbs include/text.php $arr post_local include/zot.php $arr post_local include/items.php $arr post_local mod/item.php $datarray post_local_end include/items.php $arr post_local_end include/attach.php $arr post_local_end include/attach.php $arr post_local_end extend/addon/matrix/randpost/randpost.php $x post_local_end extend/addon/matrix/randpost/randpost.php $x post_local_end mod/mood.php $arr post_local_end mod/like.php $arr post_local_end mod/item.php $datarray post_local_end mod/subthread.php $arr post_local_start mod/item.php $_REQUEST post_mail include/items.php $arr post_mail_end include/items.php $arr post_remote include/items.php $arr post_remote_end include/items.php $arr post_remote_update include/items.php $arr post_remote_update_end include/items.php $arr prepare_body include/text.php $prep_arr prepare_body_final include/text.php $prep_arr prepare_body_init include/text.php $item probe_well_known include/probe.php $ret proc_run boot.php $arr process_channel_sync_delivery include/zot.php $addon profile_advanced mod/profile.php $o profile_edit mod/profiles.php $arr profile_photo_content_end mod/profile_photo.php $o profile_post mod/profiles.php $_POST profile_sidebar include/identity.php $arr profile_sidebar_enter include/identity.php $profile profile_tabs include/conversation.php $arr register_account include/account.php $result render_location include/conversation.php $locate replace_macros include/text.php $arr reverse_magic_auth mod/rmagic.php $arr settings_account mod/settings.php $_POST settings_form mod/settings.php $o settings_post mod/settings.php $_POST sexpref_selector include/profile_selectors.php $select sexpref_selector_min include/profile_selectors.php $select smilie include/text.php $params smilie extend/addon/matrix/smileybutton/smileybutton.php $params tagged include/items.php $arr validate_channelname include/identity.php $arr webfinger mod/wfinger.php $arr well_known mod/_well_known.php $arr zid include/identity.php $arr zid_init include/identity.php $arr zot_finger include/zot.php $ret
Generated Tue Nov 03 21:19:02 PST 2015
\ No newline at end of file
+Hooks
Function Source File Arg $a->module . _mod_aftercontent index.php $arr $a->module . _mod_content index.php $arr $a->module . _mod_init index.php $placeholder $a->module . _mod_post index.php $_POST $a->module . _post_ . $selname include/acl_selectors.php $o $a->module . _post_ . $selname include/acl_selectors.php $o $a->module . _post_ . $selname include/acl_selectors.php $o $a->module . _pre_ . $selname include/acl_selectors.php $arr $a->module . _pre_ . $selname include/acl_selectors.php $arr $a->module . _pre_ . $selname include/acl_selectors.php $arr $name include/plugin.php &$data = null about_hook mod/siteinfo.php $o accept_follow mod/connedit.php $arr account_downgrade include/account.php $ret account_downgrade include/account.php $ret account_settings mod/settings.php $account_settings activity_received include/zot.php $parr affinity_labels include/widgets.php $labels affinity_labels mod/connedit.php $labels api_perm_is_allowed include/permissions.php $arr app_menu index.php $arr atom_author include/items.php $o atom_entry include/items.php $o atom_feed include/items.php $atom atom_feed_end include/items.php $atom attach_upload_file include/attach.php $f authenticate include/auth.php $addon_auth avatar_lookup include/network.php $avatar bb2diaspora include/bb2diaspora.php $Text bbcode include/bbcode.php $Text channel_remove include/Contact.php $r[0] chat_message include/chat.php $arr chat_post mod/chatsvc.php $arr check_account_email include/account.php $arr check_account_invite include/account.php $arr check_account_password include/account.php $arr connect_premium mod/connect.php $arr connector_settings mod/settings.php $settings_connectors construct_page boot.php $arr contact_block_end include/text.php $arr contact_edit mod/connedit.php $arr contact_edit_post mod/connedit.php $_POST contact_select_options include/acl_selectors.php $x conversation_start include/conversation.php $cb create_identity include/channel.php $newuid cron include/cronhooks.php $d cron_daily include/poller.php datetime_convert() cron_weekly include/poller.php datetime_convert() directory_item mod/directory.php $arr discover_by_webbie include/network.php $arr display_item include/ItemObject.php $arr display_item include/conversation.php $arr display_settings mod/settings.php $o display_settings_post mod/settings.php $_POST donate_contributors extend/addon/matrix/donate/donate.php $contributors donate_plugin extend/addon/matrix/donate/donate.php $o donate_sponsors extend/addon/matrix/donate/donate.php $sponsors dreport_is_storable include/zot.php $dr drop_item include/items.php $arr enotify include/enotify.php $h enotify_mail include/enotify.php $datarray enotify_store include/enotify.php $datarray event_created include/event.php $event[id] event_updated include/event.php $event[id] externals_url_select include/externals.php $arr feature_enabled include/features.php $arr feature_settings mod/settings.php $settings_addons feature_settings_post mod/settings.php $_POST follow include/follow.php $arr follow include/follow.php $arr follow_allow include/follow.php $x gender_selector include/profile_selectors.php $select gender_selector_min include/profile_selectors.php $select generate_map include/text.php $arr generate_named_map include/text.php $arr get_all_api_perms include/permissions.php $arr get_all_perms include/permissions.php $arr get_features include/features.php $arr get_role_perms include/permissions.php $ret get_widgets boot.php $arr get_widgets boot.php $arr global_permissions include/permissions.php $ret home_content mod/home.php $o home_init mod/home.php $ret hostxrd mod/hostxrd.php $arr html2bbcode include/html2bbcode.php $message identity_basic_export include/channel.php $addon import_author_xchan include/items.php $arr import_channel mod/import.php $addon import_directory_profile include/zot.php $d import_xchan include/zot.php $arr item_photo_menu include/conversation.php $args item_store include/items.php $d item_store include/items.php $arr item_store_update include/items.php $d item_translate include/items.php $translate item_translate include/items.php $translate jot_networks include/acl_selectors.php $jotnets jot_networks include/conversation.php $jotnets jot_networks mod/editblock.php $jotnets jot_networks mod/editpost.php $jotnets jot_networks mod/editwebpage.php $jotnets jot_networks mod/editlayout.php $jotnets jot_tool include/conversation.php $jotplugins jot_tool mod/editblock.php $jotplugins jot_tool mod/editpost.php $jotplugins jot_tool mod/editwebpage.php $jotplugins jot_tool mod/editlayout.php $jotplugins load_pdl boot.php $arr local_dir_update include/dir_fns.php $arr logged_in include/oauth.php $a->user logged_in include/api.php $a->user logged_in include/security.php $a->account logged_in include/security.php $user_record logging_out include/auth.php $args login_hook boot.php $o magic_auth mod/magic.php $arr magic_auth_openid_success mod/openid.php $arr magic_auth_openid_success mod/openid.php $arr magic_auth_success mod/post.php $arr main_slider include/widgets.php $arr marital_selector include/profile_selectors.php $select marital_selector_min include/profile_selectors.php $select module_loaded index.php $x mood_verbs include/text.php $arr nav include/nav.php $x network_content_init mod/network.php $arr network_ping mod/ping.php $arr network_tabs include/conversation.php $arr network_to_name include/contact_selectors.php $nets notifier_end include/notifier.php $target_item notifier_hub include/notifier.php $narr notifier_normal include/deliver_hooks.php $r[0] obj_verbs include/taxonomy.php $arr oembed_probe include/oembed.php $x page_content_top index.php $a->page[content] page_end index.php $a->page[content] page_header include/nav.php $a->page[nav] parse_atom include/items.php $arr parse_link mod/linkinfo.php $arr pdl_selector include/comanche.php $arr perm_is_allowed include/permissions.php $arr permissions_create include/notifier.php $perm_update permissions_update include/notifier.php $perm_update personal_xrd mod/xrd.php $arr photo_post_end include/photos.php $ret photo_post_end include/photos.php $ret photo_upload_begin include/attach.php $arr photo_upload_begin include/photos.php $args photo_upload_end include/attach.php $ret photo_upload_end include/attach.php $ret photo_upload_end include/attach.php $ret photo_upload_end include/attach.php $ret photo_upload_end include/attach.php $ret photo_upload_end include/photos.php $ret photo_upload_end include/photos.php $ret photo_upload_end include/photos.php $ret photo_upload_end include/photos.php $ret photo_upload_file include/attach.php $f photo_upload_file include/photos.php $f photo_upload_form mod/photos.php $ret poke_verbs include/text.php $arr post_local include/zot.php $arr post_local include/items.php $arr post_local mod/item.php $datarray post_local_end include/items.php $arr post_local_end include/attach.php $arr post_local_end include/attach.php $arr post_local_end extend/addon/matrix/randpost/randpost.php $x post_local_end extend/addon/matrix/randpost/randpost.php $x post_local_end mod/mood.php $arr post_local_end mod/like.php $arr post_local_end mod/item.php $datarray post_local_end mod/subthread.php $arr post_local_start mod/item.php $_REQUEST post_mail include/items.php $arr post_mail_end include/items.php $arr post_remote include/items.php $arr post_remote_end include/items.php $arr post_remote_update include/items.php $arr post_remote_update_end include/items.php $arr prepare_body include/text.php $prep_arr prepare_body_final include/text.php $prep_arr prepare_body_init include/text.php $item probe_well_known include/probe.php $ret proc_run boot.php $arr process_channel_sync_delivery include/zot.php $addon profile_advanced mod/profile.php $o profile_edit mod/profiles.php $arr profile_photo_content_end mod/profile_photo.php $o profile_post mod/profiles.php $_POST profile_sidebar include/channel.php $arr profile_sidebar_enter include/channel.php $profile profile_tabs include/conversation.php $arr register_account include/account.php $result render_location include/conversation.php $locate replace_macros include/text.php $arr reverse_magic_auth mod/rmagic.php $arr settings_account mod/settings.php $_POST settings_form mod/settings.php $o settings_post mod/settings.php $_POST sexpref_selector include/profile_selectors.php $select sexpref_selector_min include/profile_selectors.php $select smilie include/text.php $params smilie extend/addon/matrix/smileybutton/smileybutton.php $params tagged include/items.php $arr validate_channelname include/channel.php $arr webfinger mod/wfinger.php $arr well_known mod/_well_known.php $arr zid include/channel.php $arr zid_init include/channel.php $arr zot_finger include/zot.php $ret
Generated Tue Nov 03 21:19:02 PST 2015
\ No newline at end of file
diff --git a/doc/html/index.php b/doc/html/index.php
deleted file mode 100644
index 2e1b4277c..000000000
--- a/doc/html/index.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- $Projectname Doxygen API Documentation
-
-
-$Projectname Doxygen API Documentation not rendered
-
-To get the Doxygen API Documentation you must render it with the program Doxygen (included in most distributions).
-
-$ doxygen util/Doxyfile
-
-
-back
-
-
diff --git a/doc/members.bb b/doc/members.bb
index 13339ef2d..bf5b09898 100644
--- a/doc/members.bb
+++ b/doc/members.bb
@@ -1,6 +1,5 @@
-[h2]Documentation for Hub Members[/h2]
-
-[h3]Getting Started[/h3]
+[h2]Documentation for hub members[/h2]
+[h3]Getting started[/h3]
[zrl=[baseurl]/help/registration]Account Registration[/zrl]
[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at $Projectname: accounts, profiles and channels in short[/zrl]
[zrl=[baseurl]/help/profiles]Profiles[/zrl]
@@ -11,8 +10,7 @@
[zrl=[baseurl]/help/permissions]Permissions And Encryption: You Are In Control[/zrl]
[zrl=[baseurl]/help/cloud]Cloud Storage[/zrl]
[zrl=[baseurl]/help/remove_account]Remove Channel or Account[/zrl]
-
-[h3]Members Help[/h3]
+[h3]Members help[/h3]
[zrl=[baseurl]/help/tags_and_mentions]Tags and Mentions[/zrl]
[zrl=[baseurl]/help/webpages]Web Pages[/zrl]
[zrl=[baseurl]/help/bbcode]BBcode reference for posts and comments[/zrl]
@@ -23,3 +21,5 @@
[zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl]
[zrl=[baseurl]/help/faq_members]FAQ For Members[/zrl]
[zrl=[baseurl]/help/bugs]Bugs, Issues, and things that go bump in the night...[/zrl]
+
+#include doc/macros/main_footer.bb;
diff --git a/doc/permissions.bb b/doc/permissions.bb
index bcf3c43e0..cc831dd61 100644
--- a/doc/permissions.bb
+++ b/doc/permissions.bb
@@ -1,101 +1,73 @@
-[b]Permissions[/b]
+[h1]Permissions[/h1]
+Permissions in $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere.
-Permissions in the $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere.
+[b]Permission Roles[/b]
-[b]Default Permissions[/b]
+When you create a channel we allow you to select different 'roles' for that channel. These create an entire family of permissions and privacy settings that are appropriate for that role. Typical roles are "Social - mostly public", "Social - mostly private", "Forum - public" and many others. These bring a level of simplicity to managing permissions. Just choose a role and appropriate permissions are automatically applied. You can also choose 'Custom/Expert mode' and change any individual permission setting in any way you desire.
-On your settings page, you will find a list of default permissions. These permissions are automatically applied to everybody unless you specify otherwise. The scope of these permissions varies from "Only me" to "Everybody" - though some scopes may not be available for some permissions. For example, you can't allow "anybody on the internet" to send you private messages, because we'd have no way to identify the sender, therefore no way to reply to them.
+
+[b]Default Permission Limits[/b]
+
+There are a large number of individual permissions. These control everything from the ability to view your stream to the ability to chat with you. Every permission has a limit. The scope of these permissions varies from "Only me" to "Everybody on the internet" - though some scopes may not be available for some permissions. The limit applies to any published thing you create which has no privacy or access control. For example if you publish a photo and didn't select a specific audience with permission to view it, we apply the limit. These limits apply to everything within that permission rule, so you cannot apply a limit to one photo. The limit applies to all your photos. If all your photos are visible to everybody on the internet and you reduce the limit only to friends, [b]all[/b] of your photos will now be visible only to friends.
+
+[b]Access Control[/b]
+
+Access Control is the preferred method of managing privacy in [i]most[/i] cases, rather than using permission limits. This creates lists of either connections or privacy groups (or both) and uses the access list to decide if a permission is allowed. An access list is attached to everything you publish. Unlike permission limits, if you change the access control list on a single photo, it doesn't affect any of your other photos. You can use privacy groups and a "default access control list" to create and automate the management of access control lists to provide any level of privacy you desire on anything you publish.
We highly recommend that you use the "typical social network" settings when you create your first channel, as it allows others to communicate with you and help you out if you have difficulty. You will find that these settings allow you as much privacy as you desire - when you desire it; but also allow you to communicate in public if you choose to. You are free to use much more private settings once you have learned your way around.
-Be aware that altering the scope of who can see your "public" items is a more or less [b]permanent[/b] change. Your public items have no identified permissions attached to them - they are public. If you restrict who can see these items, there is no way of making any single item public ever again - without allowing access to every public item you ever created. You are certainly free to do this, but beware of the consequences.
-A more useful privacy setup is to leave "public" items visible to anybody on the internet; but force everything you create to be restricted. This can be done on your Channel Settings page by selecting the role "Social - restricted". This ensures a Default Privacy Group for all new contacts, and sets your Default Post Permissions to restrict all your posts to that group. We use the Default Post Permissions for everything you create - posts, photos, events, webpages, and everything else. However you can then edit the permissions when you create any individual thing and remove your default privacy group to make just that item visible to anybody.
+[dl terms="l"]
+[*= The scopes of permissions are:]
+[dl terms="i"]
+ [*= Nobody Except Yourself ] This is self explanatory. Only you will be allowed access.
+
+ [*= Only those you specifically allow ] By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on their contact edit screen.
+
+ [*= Anybody in your address book ] Anybody you do not know will have this permission denied, but anybody you accept as a contact will have this permission approved. This is the way most legacy platforms handle permissions.
+
+ [*= Anybody On This Hub ] Anybody with a channel on the same hub/website as you will have permission approved. Anybody who is registered at a different hub will have this permission denied.
+
+ [*= Anybody in this network ] Anybody in the $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.
+
+ [*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore [i]may[/i] include visitors from other networks.
+
+ [*= Anybody on the internet ] Completely public. This permission will be approved for anybody at all.
+[/dl]
+[*= The individual permissions are:]
+[dl terms="i"]
+ [*= Can view my "public" stream and posts. ] This permision determines who can view your channel "stream" that is, the non-private posts that appear on the "home" tab when you're logged in.
+ [*= Can view my "public" channel profile. ] This permission determines who can view your channel's profile. This refers to the "about" tab
+ [*= Can view my "public" photo albums. ] This permission determines who can view your photo albums. Individual photographs may still be posted to a more private audience.
-The scopes of permissions are:
+ [*= Can view my "public" address book. ] This permission determines who can view your contacts. These are the connections displayed in the "View connections" section.
-[li]Nobody Except Yourself. This is self explanatory. Only you will be allowed access.[/li]
+ [*= Can view my "public" file storage. ] This permission determines who can view your public files stored in your cloud.
-[li]Only those you specifically allow. By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on their contact edit screen.[/li]
+ [*= Can view my "public" pages. ] This permission determines who can view your public web pages.
-[li]Anybody in your address book. Anybody you do not know will have this permission denied, but anybody you accept as a contact will have this permission approved. This is the way most legacy platforms handle permissions.[/li]
+ [*= Can send me their channel stream and posts. ] This permission determines whose posts you will view. If your channel is a personal channel (ie, you as a person), you would probably want to set this to "anyone in my address book" at a minimum. A personal notes channel would probably want to choose "nobody except myself". Setting this to "Anybody in the network" will show you posts from complete strangers, which is a good form of discovery.
-[li]Anybody On This Hub. Anybody using the same hub as you will have permission approved. Anybody who registered at a different hub will have this permission denied.[/li]
+ [*= Can post on my channel page ("wall"). ] This permission determines who can write to your wall when clicking through to your channel.
-[li]Anybody in this network. Anybody in the $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.[/li]
+ [*= Can comment on my posts. ] This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission
-[li]Anybody authenticated. This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore may include visitors from other networks.[/li]
+ [*= Can send me private mail messages. ] This determines who can send you private messages (zotmail).
-[li]Anybody on the internet. Completely public. This permission will be approved for anybody at all.[/li]
+ [*= Can post photos to my photo albums. ] This determines who can post photographs in your albums. This is very useful for forum-like channels where connections may not be connected to each other.
-The individual permissions are:
+ [*= Can forward to all my channel contacts via post tags. ] Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way.
-[i]Can view my "public" stream and posts.[/i]
+ [*= Can chat with me (when available). ] This determines who can join the public chat rooms created by your channel.
-This permision determines who can view your channel "stream" that is, the non-private posts that appear on the "home" tab when you're logged in.
+ [*= Can write to my "public" file storage. ] This determines who can upload files to your public file storage, or 'cloud'.
-[i]Can view my "public" channel profile.[/i]
-
-This permission determines who can view your channel's profile. This refers to the "about" tab
-
-[i]Can view my "public" photo albums.[/i]
-
- This permission determines who can view your photo albums. Individual photographs may still be posted to a more private audience.
-
-[i]Can view my "public" address book.[/i]
-
-This permission determines who can view your contacts. These are the connections displayed in the "View connections" section.
-
-[i]Can view my "public" file storage.[/i]
-
-This permission determines who can view your public files stored in your cloud.
-
-[i]Can view my "public" pages.[/i]
-
-This permission determines who can view your public web pages.
-
-[i]Can send me their channel stream and posts.[/i]
-
-This permission determines whose posts you will view. If your channel is a personal channel (ie, you as a person), you would probably want to set this to "anyone in my address book" at a minimum. A personal notes channel would probably want to choose "nobody except myself". Setting this to "Anybody in the network" will show you posts from complete strangers, which is a good form of discovery.
-
-[i]Can post on my channel page ("wall").[/i]
-
-This permission determines who can write to your wall when clicking through to your channel.
-
-[i]Can comment on my posts.[/i]
-
-This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission
-
-[i]Can send me private mail messages.[/i]
-
-This determines who can send you private messages (zotmail).
-
-[i]Can post photos to my photo albums.[/i]
-
-This determines who can post photographs in your albums. This is very useful for forum-like channels where connections may not be connected to each other.
-
-[i]Can forward to all my channel contacts via post tags.[/i]
-
-Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way.
-
-[i]Can chat with me (when available).[/i]
-
-This determines who can join the public chat rooms created by your channel.
-
-[i]Can write to my "public" file storage.[/i]
-
-This determines who can upload files to your public file storage, or 'cloud'.
-
-[i]Can edit my "public" pages.[/i]
-
-This determines who can edit your webpages. This is useful for wikis or sites with multiple editors.
-
-[i]Can administer my channel resources.[/i]
-
-This determines who can have full control of your channel. This should normally be set to "nobody except myself".
+ [*= Can edit my "public" pages. ] This determines who can edit your webpages. This is useful for wikis or sites with multiple editors.
+ [*= Can administer my channel resources. ] This determines who can have full control of your channel. This should normally be set to "nobody except myself".
+[/dl][/dl]
[i]Note:[/i]
Plugins/addons may provide special permission settings, so you may be offered additional permission settings beyond what is described here.
diff --git a/doc/plugins.bb b/doc/plugins.bb
index f74276038..f2f0b04e8 100644
--- a/doc/plugins.bb
+++ b/doc/plugins.bb
@@ -1,6 +1,6 @@
[b]Plugins[/b]
-So you want to make the $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon.
+So you want to make $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon.
In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it.
@@ -45,16 +45,16 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is
pluginname_uninstall()
[/code]
-Next we'll talk about **hooks**. Hooks are places in the $Projectname code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
+Next we'll talk about [b]hooks[/b]. Hooks are places in the $Projectname code where we allow plugins to do stuff. There are a [url=[baseurl]/help/hooklist]lot of these[/url], and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
-We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now.
+We register hook handlers with the 'Zotlabs\Extend\Hook::register()' function. It typically takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now.
[code]
function randplace_load() {
- register_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
+ Zotlabs\Extend\Hook::register('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
- register_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings');
- register_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+ Zotlabs\Extend\Hook::register('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings');
+ Zotlabs\Extend\Hook::register('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
}
[/code]
@@ -64,21 +64,18 @@ So we're going to catch three events, 'post_local' which is triggered when a pos
Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments.
[code]
function randplace_unload() {
- unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
-
- unregister_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings');
- unregister_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+ Zotlabs\Extend\Hook::unregister('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
+ Zotlabs\Extend\Hook::unregister('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings');
+ Zotlabs\Extend\Hook::unregister('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
}
[/code]
-Hooks are called with two arguments. The first is always $a, which is our global App structure and contains a huge amount of information about the state of the web request we are processing; as well as who the viewer is, and what our login state is, and the current contents of the web page we're probably constructing.
-
-The second argument is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the second argument is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed.
+Hooks are always called with one argument which is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the passed data is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed.
Let's go ahead and add some code to implement our post_local hook handler.
[code]
- function randplace_post_hook($a, &$item) {
+ function randplace_post_hook(&$item) {
/**
*
@@ -145,7 +142,7 @@ Now let's add our functions to create and store preference settings.
*
*/
- function randplace_settings_post($a,$post) {
+ function randplace_settings_post($post) {
if(! local_channel())
return;
if($_POST['randplace-submit'])
@@ -171,7 +168,7 @@ Now let's add our functions to create and store preference settings.
- function randplace_settings(&$a,&$s) {
+ function randplace_settings(&$s) {
if(! local_channel())
return;
@@ -205,19 +202,46 @@ Now let's add our functions to create and store preference settings.
-***Advanced Plugins***
+[h2]Advanced Plugins[/h2]
Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin.
-The key to this is to create a simple function named pluginname_module() which does nothing.
+There are two ways to accomplish this. To create a module object use the following model:
+[code]
+/.hidden
@@ -259,6 +307,6 @@ The $Projectname has _install and _uninstall functions but these are used differ
[li] Friendica's "plugin_settings_post" hook is called "feature_settings_post"[/li]
-Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the $Projectname. Many structured data names (especially DB schema columns) are also quite different.
+Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in $Projectname. Many structured data names (especially DB schema columns) are also quite different.
#include doc/macros/main_footer.bb;
diff --git a/doc/roadmap.bb b/doc/roadmap.bb
index f57c76b74..9ef9f146a 100644
--- a/doc/roadmap.bb
+++ b/doc/roadmap.bb
@@ -8,18 +8,8 @@ Roadmap for $Projectname V3
Crypto
Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable.
-Diaspora
- Convert core Diaspora federation code into a plugin. This presents a number of challenges since it touches and special cases a lot of core functionality. (HZ - in progress)
-
Subscriptions and business models
- Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box (in progress Habeas Codice)
-
-Merge all uploads into common DAV interface
- Separate photo albums from photos and turn them into file directories. (HZ - done)
- Upload everything direct to /store (HZ - done)
- If photo, generate thumbnails and image resources (HZ - done)
- Provide default upload folders with %y (and other?) macros for both photos and other file resources (HZ - done)
- Allow "media" (anything that we can generate a thumbnail for) in the Photos section (and show thumbnails in the Files section where possible) (HZ - done)
+ Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box
Resolve the "every photo has an item" confusion, perhaps every file should also - but only if we can explain it and separate them conceptually.
diff --git a/doc/roadmapv4.bb b/doc/roadmapv4.bb
index 33a3384c5..419cd8d4c 100644
--- a/doc/roadmapv4.bb
+++ b/doc/roadmapv4.bb
@@ -9,20 +9,20 @@ Goals/Highlights:
Focus on visual website design tools, widgets, and sharing mechanisms
-App organisation.
+[x] App organisation.
-Conversion of core application to a composer format living under the namespace "Zotlabs"
+[x] Conversion of core application to a composer format living under the namespace "Zotlabs"
-Conversion of Modules to a more general purpose Controllers layout with DB/memory based
+[x] Conversion of Modules to a more general purpose Controllers layout with DB/memory based
controller routing as opposed to filesystem routing.
-Conversion of core Zot Protocol to a class library
+[x] (partial) Conversion of core Zot Protocol to a class library
-Abstraction of nomadic identity so that sending/receiving to/from singleton networks to/from any clone works flawlessly - [b]provided[/b] the clone physically connected to that singleton identity is up.
+[x] Abstraction of nomadic identity so that sending/receiving to/from singleton networks to/from any clone works flawlessly - [b]provided[/b] the clone physically connected to that singleton identity is up.
[h3]Community Development[/h3]
-CalDAV/CardDAV
+[x] CalDAV/CardDAV
E-Commerce
diff --git a/doc/service_classes.bb b/doc/service_classes.bb
index e5d4ecfad..4dead5d29 100644
--- a/doc/service_classes.bb
+++ b/doc/service_classes.bb
@@ -35,3 +35,4 @@ attach_upload_limit - maximum file upload storage (bytes)
minimum_feedcheck_minutes - lowest setting allowed for polling rss feeds
chatrooms - maximum chatrooms
chatters_inroom - maximum chatters per room
+access_tokens - maximum number of Guest Access Tokens per channel
\ No newline at end of file
diff --git a/doc/sv/main.bb b/doc/sv/main.bb
index 26d9c78f6..a5c1d4f7a 100644
--- a/doc/sv/main.bb
+++ b/doc/sv/main.bb
@@ -67,9 +67,6 @@ Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för $Proje
[zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]
[zrl=[baseurl]/help/dev_beginner]Sep-for-step manual for beginning developers[/zrl]
-[h3]FAQ för utvecklare[/h3]
-[zrl=[baseurl]/help/faq_developers]FAQ For Developers[/zrl]
-
[h3]Externa resurser[/h3]
[zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl]
[url=https://github.com/friendica/red]Main Website[/url]
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index d0860cf3a..b1c4923b1 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -6,6 +6,7 @@ We need much more than this, but here are areas where developers can help. Pleas
[li]Include TOS link in registration/verification email[/li]
[li]Auto preview posts/comments (configurable timer kicks in the preview if not 0)[/li]
[li]SAML 2.0 and OpenID Connect provider functionality[/li]
+[li]relmeauth (aka indieauth) support[/li]
[li]Create bug tracker module[/li]
[li]Filing posts - provide a dropdown menu integrated with the 'post actions menu'[/li]
[li]translation plugins - moses or apertium[/li]
@@ -17,7 +18,6 @@ We need much more than this, but here are areas where developers can help. Pleas
[li]Integrate the "open site" list with the register page[/li]
[li]Support comments and member notes on documentation pages (to achieve an effect similar to php.net)[/li]
[li]Support comments on webpages[/li]
-[li]refactor the oembed client interface so that we can safely sandbox remote content[/li]
[li]Write more webpage layouts[/li]
[li]Write more webpage widgets[/li]
[li]restricted access OAuth clients[/li]
@@ -25,18 +25,15 @@ We need much more than this, but here are areas where developers can help. Pleas
[li](less advanced) create a way to preview Comanche results on a preview page while editing on another page[/li]
[li]External post connectors - create standard interface[/li]
[li]External post connectors, add popular services[/li]
-[li](in progress Habeas Codice) service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
-[li](in progress Habeas Codice) service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
-[li]implement CalDAV/CardDAV sync[/li]
+[li]service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
+[li]service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
[li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]
[li]API extensions, for Twitter API - search, friending, threading. For Red API, lots of stuff[/li]
[li]Import channel from Diaspora/Friendica (Diaspora partially done)[/li]
[li]MediaGoblin photo "crosspost" connector[/li]
-[li]App taxonomy[/li]
-[li]Customisable App collection pages[/li]
-[li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our "enhanced bbcode", but start with images, links, bold and highlight and work from there.[/li]
+[li]provide a visual editor[/li]
[li]Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from.[/li]
-[li](in progress Habeas Codice) Implement owned and exchangeable "things".[/li]
+[li]Implement owned and exchangeable "things".[/li]
[li]Family Account creation - using service classes (an account holder can create a certain number of sub-accounts which are all tied to their subscription - if the subscription lapses they all go away).[/li]
diff --git a/doc/troubleshooting.bb b/doc/troubleshooting.bb
index 1a2bd7f12..023d3c8b1 100644
--- a/doc/troubleshooting.bb
+++ b/doc/troubleshooting.bb
@@ -1,6 +1,4 @@
-[b]Troubleshooting[/b]
-
-[li][zrl=[baseurl]/help/problems-following-an-update]Problems following an update[/zrl][/li]
+[h2]Troubleshooting[/h2]
When reporting issues, please try to provide as much detail as may be necessary for developers to reproduce the issue and provide the complete text of all error messages.
@@ -13,9 +11,12 @@ In the case of "500" errors, the issues may often be logged in your webserver lo
We encourage you to try to the best of your abilities to use these logs combined with the source code in your possession to troubleshoot issues and find their cause. The community is often able to help, but only you have access to your site logfiles and it is considered a security risk to share them.
-
If a code issue has been uncovered, please report it on the project bugtracker (https://github.com/redmatrix/hubzilla/issues). Again provide as much detail as possible to avoid us going back and forth asking questions about your configuration or how to duplicate the problem, so that we can get right to the problem and figure out what to do about it. You are also welcome to offer your own solutions and submit patches. In fact we encourage this as we are all volunteers and have little spare time available. The more people that help, the easier the workload for everybody. It's OK if your solution isn't perfect. Every little bit helps and perhaps we can improve on it.
-#include doc/macros/troubleshooting_footer.bb;
+[h3]Troubleshooting updates[/h3]
+[ul]
+[li][zrl=[baseurl]/help/problems-following-an-update]Problems following an update[/zrl][/li]
+[/ul]
+
#include doc/macros/main_footer.bb;
diff --git a/doc/webpages.bb b/doc/webpages.bb
index 040ad0c5c..6b3a800cb 100644
--- a/doc/webpages.bb
+++ b/doc/webpages.bb
@@ -1,6 +1,6 @@
[b]Creating Web Pages[/b]
-Red enables users to create static webpages. To activate this feature, enable the web pages feature in your Additional Features section.
+Hubzilla enables users to create static webpages. To activate this feature, enable the web pages feature in your Additional Features section.
Once enabled, a new tab will appear on your channel page labelled "Webpages". Clicking this link will take you to the webpage editor.
Pages will be accessible at mydomain/page/username/pagelinktitle
diff --git a/doc/zot.md b/doc/zot.md
index f8881c551..1e454e495 100644
--- a/doc/zot.md
+++ b/doc/zot.md
@@ -140,6 +140,8 @@ target_sig => an RSA signature (base64url encoded) of the guid
key => The public key needed to verify the signature
+token => a string (possibly random) chosen by the requesting service. If provided, an entry in the discovered packet will be provided called 'signed_token' which consists of the base64url_encoded RSA signature of the concatenation of the string 'token.' and the provided token using the private key of the discovered channel. This can be verified using the provided 'key' entry, and provides assurance that the server is in possession of the private key for the discovered identity. After 2017-01-01 it is **required** that a server provide a signed_token *if* a token was provided in the request.
+
With no target provided, the permissions returned will be generic permissions
for unknown or unauthenticated observers
@@ -148,6 +150,7 @@ Example of discovery packet for 'mike@zothub.com'
{
"success": true,
+ "signed_token": "KBJrKTq1qrctNuxF3GwVh3GAGRqmgkirlXANPcJZAeWlvSt_9TMV097slR4AYnYCBEushbVqHEJ9Rb5wHTa0HzMbfRo8cRdl2yAirvvv5d98dtwHddQgX1jB0xEypXtmIYMdPGDLvhI1RNdIBhHkkrRcNreRzoy4xD--HM6m1W0-A8PJJJ9BcNxmGPcBtLzW08wzoP9trJ3M7DQ6Gkk6j7iwVsyApw1ZBaDvabGTdc_SFV-Iegtqw3rjzT_xXWsfzMlKBy-019MYn_KS-gu23YzjvGu5tS_zDfkQb8DMUlPLz5yyxM0yOMlUDtG2qQgIJAU2O0X6T5xDdJ6mtolNyhepg845PvFDEqBQGMIH1nc47CNumeudDi8IWymEALhjG_U8KAK7JVlQTJj2EKUb0au1g6fpiBFab5mmxCMtZEX3Jreyak5GOcFFz-WpxuXJD9TdSoIvaBfBFOoJnXkg2zE4RHXeQzZ2FotmrbBG5dm8B-_6byYGoHBc08ZsWze1K96JIeRnLpBaj6ifUDcVHxZMPcGHHT27dvU2PNbgLiBjlAsxhYqkhN5qOHN8XBcg2KRjcMBaI3V0YMxlzXz5MztmZq3fcB1p-ccIoIyMPMzSj3yMB7J9CEU2LYPSTHMdPkIeDE6GaCkQKviaQQJQde346tK_YjA2k7_SOBmvPYE",
"guid": "sebQ-IC4rmFn9d9iu17m4BXO-kHuNutWo2ySjeV2SIW1LzksUkss12xVo3m3fykYxN5HMcc7gUZVYv26asx-Pg",
"guid_sig": "Llenlbl4zHo6-g4sa63MlQmTP5dRCrsPmXHHFmoCHG63BLq5CUZJRLS1vRrrr_MNxr7zob_Ykt_m5xPKe5H0_i4pDj-UdP8dPZqH2fqhhx00kuYL4YUMJ8gRr5eO17vsZQ3XxTcyKewtgeW0j7ytwMp6-hFVUx_Cq08MrXas429ZrjzaEwgTfxGnbgeQYQ0R5EXpHpEmoERnZx77VaEahftmdjAUx9R4YKAp13pGYadJOX5xnLfqofHQD8DyRHWeMJ4G1OfWPSOlXfRayrV_jhnFlZjMU7vOdQwHoCMoR5TFsRsHuzd-qepbvo3pzvQZRWnTNu6oPucgbf94p13QbalYRpBXKOxdTXJrGdESNhGvhtaZnpT9c1QVqC46jdfP0LOX2xrVdbvvG2JMWFv7XJUVjLSk_yjzY6or2VD4V6ztYcjpCi9d_WoNHruoxro_br1YO3KatySxJs-LQ7SOkQI60FpysfbphNyvYMkotwUFI59G08IGKTMu3-GPnV1wp7NOQD1yzJbGGEGSEEysmEP0SO9vnN45kp3MiqbffBGc1r4_YM4e7DPmqOGM94qksOcLOJk1HNESw2dQYWxWQTBXPfOJT6jW9_crGLMEOsZ3Jcss0XS9KzBUA2p_9osvvhUKuKXbNztqH0oZIWlg37FEVsDs_hUwUJpv2Ar09k4",
"key": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7QCwvuEIwCHjhjbpz3Oc\ntyei/Pz9nDksNbsc44Cm8jxYGMXsTPFXDZYCcCB5rcAhPPdZSlzaPkv4vPVcMIrw\n5cdX0tvbwa3rNTng6uFE7qkt15D3YCTkwF0Y9FVZiZ2Ko+G23QeBt9wqb9dlDN1d\nuPmu9BLYXIT/JXoBwf0vjIPFM9WBi5W/EHGaiuqw7lt0qI7zDGw77yO5yehKE4cu\n7dt3SakrXphL70LGiZh2XGoLg9Gmpz98t+gvPAUEotAJxIUqnoiTA8jlxoiQjeRK\nHlJkwMOGmRNPS33awPos0kcSxAywuBbh2X3aSqUMjcbE4cGJ++/13zoa6RUZRObC\nZnaLYJxqYBh13/N8SfH7d005hecDxWnoYXeYuuMeT3a2hV0J84ztkJX5OoxIwk7S\nWmvBq4+m66usn6LNL+p5IAcs93KbvOxxrjtQrzohBXc6+elfLVSQ1Rr9g5xbgpub\npSc+hvzbB6p0tleDRzwAy9X16NI4DYiTj4nkmVjigNo9v2VPnAle5zSam86eiYLO\nt2u9YRqysMLPKevNdj3CIvst+BaGGQONlQalRdIcq8Lin+BhuX+1TBgqyav4XD9K\nd+JHMb1aBk/rFLI9/f2S3BJ1XqpbjXz7AbYlaCwKiJ836+HS8PmLKxwVOnpLMbfH\nPYM8k83Lip4bEKIyAuf02qkCAwEAAQ==\n-----END PUBLIC KEY-----\n",
@@ -217,6 +220,8 @@ Discovery returns a JSON array with the following components:
'success' => ('1' or '') Operation was successful if '1'. Otherwise an optional 'message' may be present indicating the source of error.
+'signed_token' => If a token parameter was provided in the request, it is prepended with the text 'token.' and then RSA signed with the channel private key and base64url encoded and returned as 'signed_token'.
+
'guid' => the guid of the address on the target system
'guid_sig' => the base64url encoded RSA signature of the guid, signed with the private key associated with that guid.
diff --git a/images/emoji/0023-20e3.png b/images/emoji/0023-20e3.png
new file mode 100644
index 000000000..6e26f0070
Binary files /dev/null and b/images/emoji/0023-20e3.png differ
diff --git a/images/emoji/0023.png b/images/emoji/0023.png
new file mode 100644
index 000000000..811f22af8
Binary files /dev/null and b/images/emoji/0023.png differ
diff --git a/images/emoji/002a-20e3.png b/images/emoji/002a-20e3.png
new file mode 100644
index 000000000..2f8e51138
Binary files /dev/null and b/images/emoji/002a-20e3.png differ
diff --git a/images/emoji/002a.png b/images/emoji/002a.png
new file mode 100644
index 000000000..c39443e24
Binary files /dev/null and b/images/emoji/002a.png differ
diff --git a/images/emoji/0030-20e3.png b/images/emoji/0030-20e3.png
new file mode 100644
index 000000000..13aca83e0
Binary files /dev/null and b/images/emoji/0030-20e3.png differ
diff --git a/images/emoji/0030.png b/images/emoji/0030.png
new file mode 100644
index 000000000..e730b28df
Binary files /dev/null and b/images/emoji/0030.png differ
diff --git a/images/emoji/0031-20e3.png b/images/emoji/0031-20e3.png
new file mode 100644
index 000000000..e6d84b801
Binary files /dev/null and b/images/emoji/0031-20e3.png differ
diff --git a/images/emoji/0031.png b/images/emoji/0031.png
new file mode 100644
index 000000000..9c4cbd6f7
Binary files /dev/null and b/images/emoji/0031.png differ
diff --git a/images/emoji/0032-20e3.png b/images/emoji/0032-20e3.png
new file mode 100644
index 000000000..927339c9b
Binary files /dev/null and b/images/emoji/0032-20e3.png differ
diff --git a/images/emoji/0032.png b/images/emoji/0032.png
new file mode 100644
index 000000000..9a0b49a0e
Binary files /dev/null and b/images/emoji/0032.png differ
diff --git a/images/emoji/0033-20e3.png b/images/emoji/0033-20e3.png
new file mode 100644
index 000000000..dbaa6183e
Binary files /dev/null and b/images/emoji/0033-20e3.png differ
diff --git a/images/emoji/0033.png b/images/emoji/0033.png
new file mode 100644
index 000000000..bc898b986
Binary files /dev/null and b/images/emoji/0033.png differ
diff --git a/images/emoji/0034-20e3.png b/images/emoji/0034-20e3.png
new file mode 100644
index 000000000..b0e914aac
Binary files /dev/null and b/images/emoji/0034-20e3.png differ
diff --git a/images/emoji/0034.png b/images/emoji/0034.png
new file mode 100644
index 000000000..7216ee32b
Binary files /dev/null and b/images/emoji/0034.png differ
diff --git a/images/emoji/0035-20e3.png b/images/emoji/0035-20e3.png
new file mode 100644
index 000000000..d14371f3f
Binary files /dev/null and b/images/emoji/0035-20e3.png differ
diff --git a/images/emoji/0035.png b/images/emoji/0035.png
new file mode 100644
index 000000000..c64709a7e
Binary files /dev/null and b/images/emoji/0035.png differ
diff --git a/images/emoji/0036-20e3.png b/images/emoji/0036-20e3.png
new file mode 100644
index 000000000..371b3acef
Binary files /dev/null and b/images/emoji/0036-20e3.png differ
diff --git a/images/emoji/0036.png b/images/emoji/0036.png
new file mode 100644
index 000000000..68e1e71e4
Binary files /dev/null and b/images/emoji/0036.png differ
diff --git a/images/emoji/0037-20e3.png b/images/emoji/0037-20e3.png
new file mode 100644
index 000000000..9b3476ae7
Binary files /dev/null and b/images/emoji/0037-20e3.png differ
diff --git a/images/emoji/0037.png b/images/emoji/0037.png
new file mode 100644
index 000000000..e4aa065c6
Binary files /dev/null and b/images/emoji/0037.png differ
diff --git a/images/emoji/0038-20e3.png b/images/emoji/0038-20e3.png
new file mode 100644
index 000000000..8c95874d4
Binary files /dev/null and b/images/emoji/0038-20e3.png differ
diff --git a/images/emoji/0038.png b/images/emoji/0038.png
new file mode 100644
index 000000000..27eae28e6
Binary files /dev/null and b/images/emoji/0038.png differ
diff --git a/images/emoji/0039-20e3.png b/images/emoji/0039-20e3.png
new file mode 100644
index 000000000..9fce3d1ec
Binary files /dev/null and b/images/emoji/0039-20e3.png differ
diff --git a/images/emoji/0039.png b/images/emoji/0039.png
new file mode 100644
index 000000000..fd9e98055
Binary files /dev/null and b/images/emoji/0039.png differ
diff --git a/images/emoji/00a9.png b/images/emoji/00a9.png
new file mode 100644
index 000000000..6b9a6adbf
Binary files /dev/null and b/images/emoji/00a9.png differ
diff --git a/images/emoji/00ae.png b/images/emoji/00ae.png
new file mode 100644
index 000000000..53ef9f2d4
Binary files /dev/null and b/images/emoji/00ae.png differ
diff --git a/images/emoji/1f004.png b/images/emoji/1f004.png
new file mode 100644
index 000000000..66fd32025
Binary files /dev/null and b/images/emoji/1f004.png differ
diff --git a/images/emoji/1f0cf.png b/images/emoji/1f0cf.png
new file mode 100644
index 000000000..3d0924b68
Binary files /dev/null and b/images/emoji/1f0cf.png differ
diff --git a/images/emoji/1f170.png b/images/emoji/1f170.png
new file mode 100644
index 000000000..8603ff05a
Binary files /dev/null and b/images/emoji/1f170.png differ
diff --git a/images/emoji/1f171.png b/images/emoji/1f171.png
new file mode 100644
index 000000000..25875bc6a
Binary files /dev/null and b/images/emoji/1f171.png differ
diff --git a/images/emoji/1f17e.png b/images/emoji/1f17e.png
new file mode 100644
index 000000000..73278ba19
Binary files /dev/null and b/images/emoji/1f17e.png differ
diff --git a/images/emoji/1f17f.png b/images/emoji/1f17f.png
new file mode 100644
index 000000000..7be7dac27
Binary files /dev/null and b/images/emoji/1f17f.png differ
diff --git a/images/emoji/1f18e.png b/images/emoji/1f18e.png
new file mode 100644
index 000000000..d9f2d17de
Binary files /dev/null and b/images/emoji/1f18e.png differ
diff --git a/images/emoji/1f191.png b/images/emoji/1f191.png
new file mode 100644
index 000000000..8b01b4343
Binary files /dev/null and b/images/emoji/1f191.png differ
diff --git a/images/emoji/1f192.png b/images/emoji/1f192.png
new file mode 100644
index 000000000..74674978d
Binary files /dev/null and b/images/emoji/1f192.png differ
diff --git a/images/emoji/1f193.png b/images/emoji/1f193.png
new file mode 100644
index 000000000..b71956eb4
Binary files /dev/null and b/images/emoji/1f193.png differ
diff --git a/images/emoji/1f194.png b/images/emoji/1f194.png
new file mode 100644
index 000000000..5bf69bf7b
Binary files /dev/null and b/images/emoji/1f194.png differ
diff --git a/images/emoji/1f195.png b/images/emoji/1f195.png
new file mode 100644
index 000000000..b4f85488d
Binary files /dev/null and b/images/emoji/1f195.png differ
diff --git a/images/emoji/1f196.png b/images/emoji/1f196.png
new file mode 100644
index 000000000..ee8d20f5e
Binary files /dev/null and b/images/emoji/1f196.png differ
diff --git a/images/emoji/1f197.png b/images/emoji/1f197.png
new file mode 100644
index 000000000..d0d775532
Binary files /dev/null and b/images/emoji/1f197.png differ
diff --git a/images/emoji/1f198.png b/images/emoji/1f198.png
new file mode 100644
index 000000000..d7d8c9953
Binary files /dev/null and b/images/emoji/1f198.png differ
diff --git a/images/emoji/1f199.png b/images/emoji/1f199.png
new file mode 100644
index 000000000..0d42142ba
Binary files /dev/null and b/images/emoji/1f199.png differ
diff --git a/images/emoji/1f19a.png b/images/emoji/1f19a.png
new file mode 100644
index 000000000..e1180f4a4
Binary files /dev/null and b/images/emoji/1f19a.png differ
diff --git a/images/emoji/1f1e6-1f1e8.png b/images/emoji/1f1e6-1f1e8.png
new file mode 100644
index 000000000..b939efeab
Binary files /dev/null and b/images/emoji/1f1e6-1f1e8.png differ
diff --git a/images/emoji/1f1e6-1f1e9.png b/images/emoji/1f1e6-1f1e9.png
new file mode 100644
index 000000000..20f4b14e8
Binary files /dev/null and b/images/emoji/1f1e6-1f1e9.png differ
diff --git a/images/emoji/1f1e6-1f1ea.png b/images/emoji/1f1e6-1f1ea.png
new file mode 100644
index 000000000..d16ffe4b8
Binary files /dev/null and b/images/emoji/1f1e6-1f1ea.png differ
diff --git a/images/emoji/1f1e6-1f1eb.png b/images/emoji/1f1e6-1f1eb.png
new file mode 100644
index 000000000..a51533b55
Binary files /dev/null and b/images/emoji/1f1e6-1f1eb.png differ
diff --git a/images/emoji/1f1e6-1f1ec.png b/images/emoji/1f1e6-1f1ec.png
new file mode 100644
index 000000000..07f2ce397
Binary files /dev/null and b/images/emoji/1f1e6-1f1ec.png differ
diff --git a/images/emoji/1f1e6-1f1ee.png b/images/emoji/1f1e6-1f1ee.png
new file mode 100644
index 000000000..500b5ab09
Binary files /dev/null and b/images/emoji/1f1e6-1f1ee.png differ
diff --git a/images/emoji/1f1e6-1f1f1.png b/images/emoji/1f1e6-1f1f1.png
new file mode 100644
index 000000000..03a20132c
Binary files /dev/null and b/images/emoji/1f1e6-1f1f1.png differ
diff --git a/images/emoji/1f1e6-1f1f2.png b/images/emoji/1f1e6-1f1f2.png
new file mode 100644
index 000000000..2ad60a273
Binary files /dev/null and b/images/emoji/1f1e6-1f1f2.png differ
diff --git a/images/emoji/1f1e6-1f1f4.png b/images/emoji/1f1e6-1f1f4.png
new file mode 100644
index 000000000..cb46c31f8
Binary files /dev/null and b/images/emoji/1f1e6-1f1f4.png differ
diff --git a/images/emoji/1f1e6-1f1f6.png b/images/emoji/1f1e6-1f1f6.png
new file mode 100644
index 000000000..b272021d3
Binary files /dev/null and b/images/emoji/1f1e6-1f1f6.png differ
diff --git a/images/emoji/1f1e6-1f1f7.png b/images/emoji/1f1e6-1f1f7.png
new file mode 100644
index 000000000..73136caf3
Binary files /dev/null and b/images/emoji/1f1e6-1f1f7.png differ
diff --git a/images/emoji/1f1e6-1f1f8.png b/images/emoji/1f1e6-1f1f8.png
new file mode 100644
index 000000000..3db45a0d9
Binary files /dev/null and b/images/emoji/1f1e6-1f1f8.png differ
diff --git a/images/emoji/1f1e6-1f1f9.png b/images/emoji/1f1e6-1f1f9.png
new file mode 100644
index 000000000..c43769dcb
Binary files /dev/null and b/images/emoji/1f1e6-1f1f9.png differ
diff --git a/images/emoji/1f1e6-1f1fa.png b/images/emoji/1f1e6-1f1fa.png
new file mode 100644
index 000000000..7794309c7
Binary files /dev/null and b/images/emoji/1f1e6-1f1fa.png differ
diff --git a/images/emoji/1f1e6-1f1fc.png b/images/emoji/1f1e6-1f1fc.png
new file mode 100644
index 000000000..02c840d12
Binary files /dev/null and b/images/emoji/1f1e6-1f1fc.png differ
diff --git a/images/emoji/1f1e6-1f1fd.png b/images/emoji/1f1e6-1f1fd.png
new file mode 100644
index 000000000..fc5466174
Binary files /dev/null and b/images/emoji/1f1e6-1f1fd.png differ
diff --git a/images/emoji/1f1e6-1f1ff.png b/images/emoji/1f1e6-1f1ff.png
new file mode 100644
index 000000000..89d3d15fd
Binary files /dev/null and b/images/emoji/1f1e6-1f1ff.png differ
diff --git a/images/emoji/1f1e7-1f1e6.png b/images/emoji/1f1e7-1f1e6.png
new file mode 100644
index 000000000..25fe407e1
Binary files /dev/null and b/images/emoji/1f1e7-1f1e6.png differ
diff --git a/images/emoji/1f1e7-1f1e7.png b/images/emoji/1f1e7-1f1e7.png
new file mode 100644
index 000000000..bccd8c5c9
Binary files /dev/null and b/images/emoji/1f1e7-1f1e7.png differ
diff --git a/images/emoji/1f1e7-1f1e9.png b/images/emoji/1f1e7-1f1e9.png
new file mode 100644
index 000000000..b0597a314
Binary files /dev/null and b/images/emoji/1f1e7-1f1e9.png differ
diff --git a/images/emoji/1f1e7-1f1ea.png b/images/emoji/1f1e7-1f1ea.png
new file mode 100644
index 000000000..551f086e3
Binary files /dev/null and b/images/emoji/1f1e7-1f1ea.png differ
diff --git a/images/emoji/1f1e7-1f1eb.png b/images/emoji/1f1e7-1f1eb.png
new file mode 100644
index 000000000..444d4829f
Binary files /dev/null and b/images/emoji/1f1e7-1f1eb.png differ
diff --git a/images/emoji/1f1e7-1f1ec.png b/images/emoji/1f1e7-1f1ec.png
new file mode 100644
index 000000000..821eee5e1
Binary files /dev/null and b/images/emoji/1f1e7-1f1ec.png differ
diff --git a/images/emoji/1f1e7-1f1ed.png b/images/emoji/1f1e7-1f1ed.png
new file mode 100644
index 000000000..f33724249
Binary files /dev/null and b/images/emoji/1f1e7-1f1ed.png differ
diff --git a/images/emoji/1f1e7-1f1ee.png b/images/emoji/1f1e7-1f1ee.png
new file mode 100644
index 000000000..ea20ac932
Binary files /dev/null and b/images/emoji/1f1e7-1f1ee.png differ
diff --git a/images/emoji/1f1e7-1f1ef.png b/images/emoji/1f1e7-1f1ef.png
new file mode 100644
index 000000000..7cca4f804
Binary files /dev/null and b/images/emoji/1f1e7-1f1ef.png differ
diff --git a/images/emoji/1f1e7-1f1f1.png b/images/emoji/1f1e7-1f1f1.png
new file mode 100644
index 000000000..0316ac99d
Binary files /dev/null and b/images/emoji/1f1e7-1f1f1.png differ
diff --git a/images/emoji/1f1e7-1f1f2.png b/images/emoji/1f1e7-1f1f2.png
new file mode 100644
index 000000000..ab8cafdac
Binary files /dev/null and b/images/emoji/1f1e7-1f1f2.png differ
diff --git a/images/emoji/1f1e7-1f1f3.png b/images/emoji/1f1e7-1f1f3.png
new file mode 100644
index 000000000..16a58f8f6
Binary files /dev/null and b/images/emoji/1f1e7-1f1f3.png differ
diff --git a/images/emoji/1f1e7-1f1f4.png b/images/emoji/1f1e7-1f1f4.png
new file mode 100644
index 000000000..98af62b3d
Binary files /dev/null and b/images/emoji/1f1e7-1f1f4.png differ
diff --git a/images/emoji/1f1e7-1f1f6.png b/images/emoji/1f1e7-1f1f6.png
new file mode 100644
index 000000000..cb978ef9d
Binary files /dev/null and b/images/emoji/1f1e7-1f1f6.png differ
diff --git a/images/emoji/1f1e7-1f1f7.png b/images/emoji/1f1e7-1f1f7.png
new file mode 100644
index 000000000..b139366a4
Binary files /dev/null and b/images/emoji/1f1e7-1f1f7.png differ
diff --git a/images/emoji/1f1e7-1f1f8.png b/images/emoji/1f1e7-1f1f8.png
new file mode 100644
index 000000000..d36bcd2fb
Binary files /dev/null and b/images/emoji/1f1e7-1f1f8.png differ
diff --git a/images/emoji/1f1e7-1f1f9.png b/images/emoji/1f1e7-1f1f9.png
new file mode 100644
index 000000000..b571dce1a
Binary files /dev/null and b/images/emoji/1f1e7-1f1f9.png differ
diff --git a/images/emoji/1f1e7-1f1fb.png b/images/emoji/1f1e7-1f1fb.png
new file mode 100644
index 000000000..5884e6482
Binary files /dev/null and b/images/emoji/1f1e7-1f1fb.png differ
diff --git a/images/emoji/1f1e7-1f1fc.png b/images/emoji/1f1e7-1f1fc.png
new file mode 100644
index 000000000..cb12f3473
Binary files /dev/null and b/images/emoji/1f1e7-1f1fc.png differ
diff --git a/images/emoji/1f1e7-1f1fe.png b/images/emoji/1f1e7-1f1fe.png
new file mode 100644
index 000000000..859c05beb
Binary files /dev/null and b/images/emoji/1f1e7-1f1fe.png differ
diff --git a/images/emoji/1f1e7-1f1ff.png b/images/emoji/1f1e7-1f1ff.png
new file mode 100644
index 000000000..db2c28bd7
Binary files /dev/null and b/images/emoji/1f1e7-1f1ff.png differ
diff --git a/images/emoji/1f1e7.png b/images/emoji/1f1e7.png
new file mode 100644
index 000000000..8f69fa973
Binary files /dev/null and b/images/emoji/1f1e7.png differ
diff --git a/images/emoji/1f1e8-1f1e6.png b/images/emoji/1f1e8-1f1e6.png
new file mode 100644
index 000000000..7c5b390e8
Binary files /dev/null and b/images/emoji/1f1e8-1f1e6.png differ
diff --git a/images/emoji/1f1e8-1f1e8.png b/images/emoji/1f1e8-1f1e8.png
new file mode 100644
index 000000000..b6555a23d
Binary files /dev/null and b/images/emoji/1f1e8-1f1e8.png differ
diff --git a/images/emoji/1f1e8-1f1e9.png b/images/emoji/1f1e8-1f1e9.png
new file mode 100644
index 000000000..fa9200977
Binary files /dev/null and b/images/emoji/1f1e8-1f1e9.png differ
diff --git a/images/emoji/1f1e8-1f1eb.png b/images/emoji/1f1e8-1f1eb.png
new file mode 100644
index 000000000..b969ae29e
Binary files /dev/null and b/images/emoji/1f1e8-1f1eb.png differ
diff --git a/images/emoji/1f1e8-1f1ec.png b/images/emoji/1f1e8-1f1ec.png
new file mode 100644
index 000000000..3a38a40a9
Binary files /dev/null and b/images/emoji/1f1e8-1f1ec.png differ
diff --git a/images/emoji/1f1e8-1f1ed.png b/images/emoji/1f1e8-1f1ed.png
new file mode 100644
index 000000000..5ff86b8a3
Binary files /dev/null and b/images/emoji/1f1e8-1f1ed.png differ
diff --git a/images/emoji/1f1e8-1f1ee.png b/images/emoji/1f1e8-1f1ee.png
new file mode 100644
index 000000000..e3b4d15c7
Binary files /dev/null and b/images/emoji/1f1e8-1f1ee.png differ
diff --git a/images/emoji/1f1e8-1f1f0.png b/images/emoji/1f1e8-1f1f0.png
new file mode 100644
index 000000000..b6b53dbc1
Binary files /dev/null and b/images/emoji/1f1e8-1f1f0.png differ
diff --git a/images/emoji/1f1e8-1f1f1.png b/images/emoji/1f1e8-1f1f1.png
new file mode 100644
index 000000000..c9390da54
Binary files /dev/null and b/images/emoji/1f1e8-1f1f1.png differ
diff --git a/images/emoji/1f1e8-1f1f2.png b/images/emoji/1f1e8-1f1f2.png
new file mode 100644
index 000000000..2d3f6ec45
Binary files /dev/null and b/images/emoji/1f1e8-1f1f2.png differ
diff --git a/images/emoji/1f1e8-1f1f3.png b/images/emoji/1f1e8-1f1f3.png
new file mode 100644
index 000000000..0a7f350a6
Binary files /dev/null and b/images/emoji/1f1e8-1f1f3.png differ
diff --git a/images/emoji/1f1e8-1f1f4.png b/images/emoji/1f1e8-1f1f4.png
new file mode 100644
index 000000000..7e0f5e0dc
Binary files /dev/null and b/images/emoji/1f1e8-1f1f4.png differ
diff --git a/images/emoji/1f1e8-1f1f5.png b/images/emoji/1f1e8-1f1f5.png
new file mode 100644
index 000000000..70c761036
Binary files /dev/null and b/images/emoji/1f1e8-1f1f5.png differ
diff --git a/images/emoji/1f1e8-1f1f7.png b/images/emoji/1f1e8-1f1f7.png
new file mode 100644
index 000000000..a5fce1265
Binary files /dev/null and b/images/emoji/1f1e8-1f1f7.png differ
diff --git a/images/emoji/1f1e8-1f1fa.png b/images/emoji/1f1e8-1f1fa.png
new file mode 100644
index 000000000..447328f7d
Binary files /dev/null and b/images/emoji/1f1e8-1f1fa.png differ
diff --git a/images/emoji/1f1e8-1f1fb.png b/images/emoji/1f1e8-1f1fb.png
new file mode 100644
index 000000000..43faf4d64
Binary files /dev/null and b/images/emoji/1f1e8-1f1fb.png differ
diff --git a/images/emoji/1f1e8-1f1fc.png b/images/emoji/1f1e8-1f1fc.png
new file mode 100644
index 000000000..eb39e8d00
Binary files /dev/null and b/images/emoji/1f1e8-1f1fc.png differ
diff --git a/images/emoji/1f1e8-1f1fd.png b/images/emoji/1f1e8-1f1fd.png
new file mode 100644
index 000000000..09d21359f
Binary files /dev/null and b/images/emoji/1f1e8-1f1fd.png differ
diff --git a/images/emoji/1f1e8-1f1fe.png b/images/emoji/1f1e8-1f1fe.png
new file mode 100644
index 000000000..154a7aa31
Binary files /dev/null and b/images/emoji/1f1e8-1f1fe.png differ
diff --git a/images/emoji/1f1e8-1f1ff.png b/images/emoji/1f1e8-1f1ff.png
new file mode 100644
index 000000000..9737ca223
Binary files /dev/null and b/images/emoji/1f1e8-1f1ff.png differ
diff --git a/images/emoji/1f1e8.png b/images/emoji/1f1e8.png
new file mode 100644
index 000000000..f94e668a2
Binary files /dev/null and b/images/emoji/1f1e8.png differ
diff --git a/images/emoji/1f1e9-1f1ea.png b/images/emoji/1f1e9-1f1ea.png
new file mode 100644
index 000000000..98ed76b3b
Binary files /dev/null and b/images/emoji/1f1e9-1f1ea.png differ
diff --git a/images/emoji/1f1e9-1f1ec.png b/images/emoji/1f1e9-1f1ec.png
new file mode 100644
index 000000000..fb6cc3cd4
Binary files /dev/null and b/images/emoji/1f1e9-1f1ec.png differ
diff --git a/images/emoji/1f1e9-1f1ef.png b/images/emoji/1f1e9-1f1ef.png
new file mode 100644
index 000000000..73c2a2acb
Binary files /dev/null and b/images/emoji/1f1e9-1f1ef.png differ
diff --git a/images/emoji/1f1e9-1f1f0.png b/images/emoji/1f1e9-1f1f0.png
new file mode 100644
index 000000000..e5a60b062
Binary files /dev/null and b/images/emoji/1f1e9-1f1f0.png differ
diff --git a/images/emoji/1f1e9-1f1f2.png b/images/emoji/1f1e9-1f1f2.png
new file mode 100644
index 000000000..4d4cf6444
Binary files /dev/null and b/images/emoji/1f1e9-1f1f2.png differ
diff --git a/images/emoji/1f1e9-1f1f4.png b/images/emoji/1f1e9-1f1f4.png
new file mode 100644
index 000000000..037a45d7c
Binary files /dev/null and b/images/emoji/1f1e9-1f1f4.png differ
diff --git a/images/emoji/1f1e9-1f1ff.png b/images/emoji/1f1e9-1f1ff.png
new file mode 100644
index 000000000..24945b10f
Binary files /dev/null and b/images/emoji/1f1e9-1f1ff.png differ
diff --git a/images/emoji/1f1e9.png b/images/emoji/1f1e9.png
new file mode 100644
index 000000000..4a36666e5
Binary files /dev/null and b/images/emoji/1f1e9.png differ
diff --git a/images/emoji/1f1ea-1f1e6.png b/images/emoji/1f1ea-1f1e6.png
new file mode 100644
index 000000000..9d05e1b0d
Binary files /dev/null and b/images/emoji/1f1ea-1f1e6.png differ
diff --git a/images/emoji/1f1ea-1f1e8.png b/images/emoji/1f1ea-1f1e8.png
new file mode 100644
index 000000000..138145946
Binary files /dev/null and b/images/emoji/1f1ea-1f1e8.png differ
diff --git a/images/emoji/1f1ea-1f1ea.png b/images/emoji/1f1ea-1f1ea.png
new file mode 100644
index 000000000..84f317e77
Binary files /dev/null and b/images/emoji/1f1ea-1f1ea.png differ
diff --git a/images/emoji/1f1ea-1f1ec.png b/images/emoji/1f1ea-1f1ec.png
new file mode 100644
index 000000000..57786064a
Binary files /dev/null and b/images/emoji/1f1ea-1f1ec.png differ
diff --git a/images/emoji/1f1ea-1f1ed.png b/images/emoji/1f1ea-1f1ed.png
new file mode 100644
index 000000000..4d7a76687
Binary files /dev/null and b/images/emoji/1f1ea-1f1ed.png differ
diff --git a/images/emoji/1f1ea-1f1f7.png b/images/emoji/1f1ea-1f1f7.png
new file mode 100644
index 000000000..0c3c724c1
Binary files /dev/null and b/images/emoji/1f1ea-1f1f7.png differ
diff --git a/images/emoji/1f1ea-1f1f8.png b/images/emoji/1f1ea-1f1f8.png
new file mode 100644
index 000000000..c37fdfe5c
Binary files /dev/null and b/images/emoji/1f1ea-1f1f8.png differ
diff --git a/images/emoji/1f1ea-1f1f9.png b/images/emoji/1f1ea-1f1f9.png
new file mode 100644
index 000000000..9560a134c
Binary files /dev/null and b/images/emoji/1f1ea-1f1f9.png differ
diff --git a/images/emoji/1f1ea-1f1fa.png b/images/emoji/1f1ea-1f1fa.png
new file mode 100644
index 000000000..0b456cf33
Binary files /dev/null and b/images/emoji/1f1ea-1f1fa.png differ
diff --git a/images/emoji/1f1ea.png b/images/emoji/1f1ea.png
new file mode 100644
index 000000000..66f7e8d8c
Binary files /dev/null and b/images/emoji/1f1ea.png differ
diff --git a/images/emoji/1f1eb-1f1ee.png b/images/emoji/1f1eb-1f1ee.png
new file mode 100644
index 000000000..ebcf58abf
Binary files /dev/null and b/images/emoji/1f1eb-1f1ee.png differ
diff --git a/images/emoji/1f1eb-1f1ef.png b/images/emoji/1f1eb-1f1ef.png
new file mode 100644
index 000000000..9cc8c37fe
Binary files /dev/null and b/images/emoji/1f1eb-1f1ef.png differ
diff --git a/images/emoji/1f1eb-1f1f0.png b/images/emoji/1f1eb-1f1f0.png
new file mode 100644
index 000000000..61372fd25
Binary files /dev/null and b/images/emoji/1f1eb-1f1f0.png differ
diff --git a/images/emoji/1f1eb-1f1f2.png b/images/emoji/1f1eb-1f1f2.png
new file mode 100644
index 000000000..0889825c8
Binary files /dev/null and b/images/emoji/1f1eb-1f1f2.png differ
diff --git a/images/emoji/1f1eb-1f1f4.png b/images/emoji/1f1eb-1f1f4.png
new file mode 100644
index 000000000..9a4431b08
Binary files /dev/null and b/images/emoji/1f1eb-1f1f4.png differ
diff --git a/images/emoji/1f1eb-1f1f7.png b/images/emoji/1f1eb-1f1f7.png
new file mode 100644
index 000000000..62ca19c3f
Binary files /dev/null and b/images/emoji/1f1eb-1f1f7.png differ
diff --git a/images/emoji/1f1eb.png b/images/emoji/1f1eb.png
new file mode 100644
index 000000000..913b230fd
Binary files /dev/null and b/images/emoji/1f1eb.png differ
diff --git a/images/emoji/1f1ec-1f1e6.png b/images/emoji/1f1ec-1f1e6.png
new file mode 100644
index 000000000..2e68e527a
Binary files /dev/null and b/images/emoji/1f1ec-1f1e6.png differ
diff --git a/images/emoji/1f1ec-1f1e7.png b/images/emoji/1f1ec-1f1e7.png
new file mode 100644
index 000000000..3ed10f623
Binary files /dev/null and b/images/emoji/1f1ec-1f1e7.png differ
diff --git a/images/emoji/1f1ec-1f1e9.png b/images/emoji/1f1ec-1f1e9.png
new file mode 100644
index 000000000..527aad338
Binary files /dev/null and b/images/emoji/1f1ec-1f1e9.png differ
diff --git a/images/emoji/1f1ec-1f1ea.png b/images/emoji/1f1ec-1f1ea.png
new file mode 100644
index 000000000..a75d14248
Binary files /dev/null and b/images/emoji/1f1ec-1f1ea.png differ
diff --git a/images/emoji/1f1ec-1f1eb.png b/images/emoji/1f1ec-1f1eb.png
new file mode 100644
index 000000000..0cf96f327
Binary files /dev/null and b/images/emoji/1f1ec-1f1eb.png differ
diff --git a/images/emoji/1f1ec-1f1ec.png b/images/emoji/1f1ec-1f1ec.png
new file mode 100644
index 000000000..970002c7f
Binary files /dev/null and b/images/emoji/1f1ec-1f1ec.png differ
diff --git a/images/emoji/1f1ec-1f1ed.png b/images/emoji/1f1ec-1f1ed.png
new file mode 100644
index 000000000..f31b5eb7b
Binary files /dev/null and b/images/emoji/1f1ec-1f1ed.png differ
diff --git a/images/emoji/1f1ec-1f1ee.png b/images/emoji/1f1ec-1f1ee.png
new file mode 100644
index 000000000..e554a2a1d
Binary files /dev/null and b/images/emoji/1f1ec-1f1ee.png differ
diff --git a/images/emoji/1f1ec-1f1f1.png b/images/emoji/1f1ec-1f1f1.png
new file mode 100644
index 000000000..2e795dd4e
Binary files /dev/null and b/images/emoji/1f1ec-1f1f1.png differ
diff --git a/images/emoji/1f1ec-1f1f2.png b/images/emoji/1f1ec-1f1f2.png
new file mode 100644
index 000000000..bb69c0975
Binary files /dev/null and b/images/emoji/1f1ec-1f1f2.png differ
diff --git a/images/emoji/1f1ec-1f1f3.png b/images/emoji/1f1ec-1f1f3.png
new file mode 100644
index 000000000..1981f61db
Binary files /dev/null and b/images/emoji/1f1ec-1f1f3.png differ
diff --git a/images/emoji/1f1ec-1f1f5.png b/images/emoji/1f1ec-1f1f5.png
new file mode 100644
index 000000000..10e42e672
Binary files /dev/null and b/images/emoji/1f1ec-1f1f5.png differ
diff --git a/images/emoji/1f1ec-1f1f6.png b/images/emoji/1f1ec-1f1f6.png
new file mode 100644
index 000000000..11475e61e
Binary files /dev/null and b/images/emoji/1f1ec-1f1f6.png differ
diff --git a/images/emoji/1f1ec-1f1f7.png b/images/emoji/1f1ec-1f1f7.png
new file mode 100644
index 000000000..0f6bb1b6b
Binary files /dev/null and b/images/emoji/1f1ec-1f1f7.png differ
diff --git a/images/emoji/1f1ec-1f1f8.png b/images/emoji/1f1ec-1f1f8.png
new file mode 100644
index 000000000..6fc927804
Binary files /dev/null and b/images/emoji/1f1ec-1f1f8.png differ
diff --git a/images/emoji/1f1ec-1f1f9.png b/images/emoji/1f1ec-1f1f9.png
new file mode 100644
index 000000000..7213d4139
Binary files /dev/null and b/images/emoji/1f1ec-1f1f9.png differ
diff --git a/images/emoji/1f1ec-1f1fa.png b/images/emoji/1f1ec-1f1fa.png
new file mode 100644
index 000000000..4027549ca
Binary files /dev/null and b/images/emoji/1f1ec-1f1fa.png differ
diff --git a/images/emoji/1f1ec-1f1fc.png b/images/emoji/1f1ec-1f1fc.png
new file mode 100644
index 000000000..6357f6225
Binary files /dev/null and b/images/emoji/1f1ec-1f1fc.png differ
diff --git a/images/emoji/1f1ec-1f1fe.png b/images/emoji/1f1ec-1f1fe.png
new file mode 100644
index 000000000..746e2fb7e
Binary files /dev/null and b/images/emoji/1f1ec-1f1fe.png differ
diff --git a/images/emoji/1f1ec.png b/images/emoji/1f1ec.png
new file mode 100644
index 000000000..271163075
Binary files /dev/null and b/images/emoji/1f1ec.png differ
diff --git a/images/emoji/1f1ed-1f1f0.png b/images/emoji/1f1ed-1f1f0.png
new file mode 100644
index 000000000..cf0c7151b
Binary files /dev/null and b/images/emoji/1f1ed-1f1f0.png differ
diff --git a/images/emoji/1f1ed-1f1f2.png b/images/emoji/1f1ed-1f1f2.png
new file mode 100644
index 000000000..b613509e4
Binary files /dev/null and b/images/emoji/1f1ed-1f1f2.png differ
diff --git a/images/emoji/1f1ed-1f1f3.png b/images/emoji/1f1ed-1f1f3.png
new file mode 100644
index 000000000..402cdcefd
Binary files /dev/null and b/images/emoji/1f1ed-1f1f3.png differ
diff --git a/images/emoji/1f1ed-1f1f7.png b/images/emoji/1f1ed-1f1f7.png
new file mode 100644
index 000000000..46f4f06b4
Binary files /dev/null and b/images/emoji/1f1ed-1f1f7.png differ
diff --git a/images/emoji/1f1ed-1f1f9.png b/images/emoji/1f1ed-1f1f9.png
new file mode 100644
index 000000000..d8d0c8884
Binary files /dev/null and b/images/emoji/1f1ed-1f1f9.png differ
diff --git a/images/emoji/1f1ed-1f1fa.png b/images/emoji/1f1ed-1f1fa.png
new file mode 100644
index 000000000..a898de636
Binary files /dev/null and b/images/emoji/1f1ed-1f1fa.png differ
diff --git a/images/emoji/1f1ed.png b/images/emoji/1f1ed.png
new file mode 100644
index 000000000..ca88e46bf
Binary files /dev/null and b/images/emoji/1f1ed.png differ
diff --git a/images/emoji/1f1ee-1f1e8.png b/images/emoji/1f1ee-1f1e8.png
new file mode 100644
index 000000000..69fd990aa
Binary files /dev/null and b/images/emoji/1f1ee-1f1e8.png differ
diff --git a/images/emoji/1f1ee-1f1e9.png b/images/emoji/1f1ee-1f1e9.png
new file mode 100644
index 000000000..85b4c063a
Binary files /dev/null and b/images/emoji/1f1ee-1f1e9.png differ
diff --git a/images/emoji/1f1ee-1f1ea.png b/images/emoji/1f1ee-1f1ea.png
new file mode 100644
index 000000000..a28295838
Binary files /dev/null and b/images/emoji/1f1ee-1f1ea.png differ
diff --git a/images/emoji/1f1ee-1f1f1.png b/images/emoji/1f1ee-1f1f1.png
new file mode 100644
index 000000000..85c410d45
Binary files /dev/null and b/images/emoji/1f1ee-1f1f1.png differ
diff --git a/images/emoji/1f1ee-1f1f2.png b/images/emoji/1f1ee-1f1f2.png
new file mode 100644
index 000000000..60a2458e3
Binary files /dev/null and b/images/emoji/1f1ee-1f1f2.png differ
diff --git a/images/emoji/1f1ee-1f1f3.png b/images/emoji/1f1ee-1f1f3.png
new file mode 100644
index 000000000..feccc8952
Binary files /dev/null and b/images/emoji/1f1ee-1f1f3.png differ
diff --git a/images/emoji/1f1ee-1f1f4.png b/images/emoji/1f1ee-1f1f4.png
new file mode 100644
index 000000000..fb6cc3cd4
Binary files /dev/null and b/images/emoji/1f1ee-1f1f4.png differ
diff --git a/images/emoji/1f1ee-1f1f6.png b/images/emoji/1f1ee-1f1f6.png
new file mode 100644
index 000000000..41fd1db6f
Binary files /dev/null and b/images/emoji/1f1ee-1f1f6.png differ
diff --git a/images/emoji/1f1ee-1f1f7.png b/images/emoji/1f1ee-1f1f7.png
new file mode 100644
index 000000000..ff7aaf62b
Binary files /dev/null and b/images/emoji/1f1ee-1f1f7.png differ
diff --git a/images/emoji/1f1ee-1f1f8.png b/images/emoji/1f1ee-1f1f8.png
new file mode 100644
index 000000000..ad8d4131d
Binary files /dev/null and b/images/emoji/1f1ee-1f1f8.png differ
diff --git a/images/emoji/1f1ee-1f1f9.png b/images/emoji/1f1ee-1f1f9.png
new file mode 100644
index 000000000..f21563ec5
Binary files /dev/null and b/images/emoji/1f1ee-1f1f9.png differ
diff --git a/images/emoji/1f1ee.png b/images/emoji/1f1ee.png
new file mode 100644
index 000000000..48dc16788
Binary files /dev/null and b/images/emoji/1f1ee.png differ
diff --git a/images/emoji/1f1ef-1f1ea.png b/images/emoji/1f1ef-1f1ea.png
new file mode 100644
index 000000000..198a918f6
Binary files /dev/null and b/images/emoji/1f1ef-1f1ea.png differ
diff --git a/images/emoji/1f1ef-1f1f2.png b/images/emoji/1f1ef-1f1f2.png
new file mode 100644
index 000000000..f84e4f9e8
Binary files /dev/null and b/images/emoji/1f1ef-1f1f2.png differ
diff --git a/images/emoji/1f1ef-1f1f4.png b/images/emoji/1f1ef-1f1f4.png
new file mode 100644
index 000000000..20bfa147e
Binary files /dev/null and b/images/emoji/1f1ef-1f1f4.png differ
diff --git a/images/emoji/1f1ef-1f1f5.png b/images/emoji/1f1ef-1f1f5.png
new file mode 100644
index 000000000..8d8838e47
Binary files /dev/null and b/images/emoji/1f1ef-1f1f5.png differ
diff --git a/images/emoji/1f1ef.png b/images/emoji/1f1ef.png
new file mode 100644
index 000000000..16599daa7
Binary files /dev/null and b/images/emoji/1f1ef.png differ
diff --git a/images/emoji/1f1f0-1f1ea.png b/images/emoji/1f1f0-1f1ea.png
new file mode 100644
index 000000000..9e417ab30
Binary files /dev/null and b/images/emoji/1f1f0-1f1ea.png differ
diff --git a/images/emoji/1f1f0-1f1ec.png b/images/emoji/1f1f0-1f1ec.png
new file mode 100644
index 000000000..b3eaf7e57
Binary files /dev/null and b/images/emoji/1f1f0-1f1ec.png differ
diff --git a/images/emoji/1f1f0-1f1ed.png b/images/emoji/1f1f0-1f1ed.png
new file mode 100644
index 000000000..9a2877dd6
Binary files /dev/null and b/images/emoji/1f1f0-1f1ed.png differ
diff --git a/images/emoji/1f1f0-1f1ee.png b/images/emoji/1f1f0-1f1ee.png
new file mode 100644
index 000000000..9a5abed3f
Binary files /dev/null and b/images/emoji/1f1f0-1f1ee.png differ
diff --git a/images/emoji/1f1f0-1f1f2.png b/images/emoji/1f1f0-1f1f2.png
new file mode 100644
index 000000000..bd5a0588e
Binary files /dev/null and b/images/emoji/1f1f0-1f1f2.png differ
diff --git a/images/emoji/1f1f0-1f1f3.png b/images/emoji/1f1f0-1f1f3.png
new file mode 100644
index 000000000..776207c96
Binary files /dev/null and b/images/emoji/1f1f0-1f1f3.png differ
diff --git a/images/emoji/1f1f0-1f1f5.png b/images/emoji/1f1f0-1f1f5.png
new file mode 100644
index 000000000..6b3fd89ea
Binary files /dev/null and b/images/emoji/1f1f0-1f1f5.png differ
diff --git a/images/emoji/1f1f0-1f1f7.png b/images/emoji/1f1f0-1f1f7.png
new file mode 100644
index 000000000..faa466f2d
Binary files /dev/null and b/images/emoji/1f1f0-1f1f7.png differ
diff --git a/images/emoji/1f1f0-1f1fc.png b/images/emoji/1f1f0-1f1fc.png
new file mode 100644
index 000000000..4d19bfa6c
Binary files /dev/null and b/images/emoji/1f1f0-1f1fc.png differ
diff --git a/images/emoji/1f1f0-1f1fe.png b/images/emoji/1f1f0-1f1fe.png
new file mode 100644
index 000000000..40daa4da5
Binary files /dev/null and b/images/emoji/1f1f0-1f1fe.png differ
diff --git a/images/emoji/1f1f0-1f1ff.png b/images/emoji/1f1f0-1f1ff.png
new file mode 100644
index 000000000..2f97a8fd3
Binary files /dev/null and b/images/emoji/1f1f0-1f1ff.png differ
diff --git a/images/emoji/1f1f0.png b/images/emoji/1f1f0.png
new file mode 100644
index 000000000..204b95d1b
Binary files /dev/null and b/images/emoji/1f1f0.png differ
diff --git a/images/emoji/1f1f1-1f1e6.png b/images/emoji/1f1f1-1f1e6.png
new file mode 100644
index 000000000..4d4179f34
Binary files /dev/null and b/images/emoji/1f1f1-1f1e6.png differ
diff --git a/images/emoji/1f1f1-1f1e7.png b/images/emoji/1f1f1-1f1e7.png
new file mode 100644
index 000000000..3d5944670
Binary files /dev/null and b/images/emoji/1f1f1-1f1e7.png differ
diff --git a/images/emoji/1f1f1-1f1e8.png b/images/emoji/1f1f1-1f1e8.png
new file mode 100644
index 000000000..45547b1e4
Binary files /dev/null and b/images/emoji/1f1f1-1f1e8.png differ
diff --git a/images/emoji/1f1f1-1f1ee.png b/images/emoji/1f1f1-1f1ee.png
new file mode 100644
index 000000000..0eafa6a22
Binary files /dev/null and b/images/emoji/1f1f1-1f1ee.png differ
diff --git a/images/emoji/1f1f1-1f1f0.png b/images/emoji/1f1f1-1f1f0.png
new file mode 100644
index 000000000..ab4fe10c4
Binary files /dev/null and b/images/emoji/1f1f1-1f1f0.png differ
diff --git a/images/emoji/1f1f1-1f1f7.png b/images/emoji/1f1f1-1f1f7.png
new file mode 100644
index 000000000..f66f267fe
Binary files /dev/null and b/images/emoji/1f1f1-1f1f7.png differ
diff --git a/images/emoji/1f1f1-1f1f8.png b/images/emoji/1f1f1-1f1f8.png
new file mode 100644
index 000000000..24745631e
Binary files /dev/null and b/images/emoji/1f1f1-1f1f8.png differ
diff --git a/images/emoji/1f1f1-1f1f9.png b/images/emoji/1f1f1-1f1f9.png
new file mode 100644
index 000000000..d644b56d6
Binary files /dev/null and b/images/emoji/1f1f1-1f1f9.png differ
diff --git a/images/emoji/1f1f1-1f1fa.png b/images/emoji/1f1f1-1f1fa.png
new file mode 100644
index 000000000..a2df9c929
Binary files /dev/null and b/images/emoji/1f1f1-1f1fa.png differ
diff --git a/images/emoji/1f1f1-1f1fb.png b/images/emoji/1f1f1-1f1fb.png
new file mode 100644
index 000000000..ae680d5f0
Binary files /dev/null and b/images/emoji/1f1f1-1f1fb.png differ
diff --git a/images/emoji/1f1f1-1f1fe.png b/images/emoji/1f1f1-1f1fe.png
new file mode 100644
index 000000000..f6e77b0f3
Binary files /dev/null and b/images/emoji/1f1f1-1f1fe.png differ
diff --git a/images/emoji/1f1f1.png b/images/emoji/1f1f1.png
new file mode 100644
index 000000000..7992b4f68
Binary files /dev/null and b/images/emoji/1f1f1.png differ
diff --git a/images/emoji/1f1f2-1f1e6.png b/images/emoji/1f1f2-1f1e6.png
new file mode 100644
index 000000000..c4a056722
Binary files /dev/null and b/images/emoji/1f1f2-1f1e6.png differ
diff --git a/images/emoji/1f1f2-1f1e8.png b/images/emoji/1f1f2-1f1e8.png
new file mode 100644
index 000000000..d479eab98
Binary files /dev/null and b/images/emoji/1f1f2-1f1e8.png differ
diff --git a/images/emoji/1f1f2-1f1e9.png b/images/emoji/1f1f2-1f1e9.png
new file mode 100644
index 000000000..a7a725398
Binary files /dev/null and b/images/emoji/1f1f2-1f1e9.png differ
diff --git a/images/emoji/1f1f2-1f1ea.png b/images/emoji/1f1f2-1f1ea.png
new file mode 100644
index 000000000..7c771e7e1
Binary files /dev/null and b/images/emoji/1f1f2-1f1ea.png differ
diff --git a/images/emoji/1f1f2-1f1eb.png b/images/emoji/1f1f2-1f1eb.png
new file mode 100644
index 000000000..70c761036
Binary files /dev/null and b/images/emoji/1f1f2-1f1eb.png differ
diff --git a/images/emoji/1f1f2-1f1ec.png b/images/emoji/1f1f2-1f1ec.png
new file mode 100644
index 000000000..2f3ccdda7
Binary files /dev/null and b/images/emoji/1f1f2-1f1ec.png differ
diff --git a/images/emoji/1f1f2-1f1ed.png b/images/emoji/1f1f2-1f1ed.png
new file mode 100644
index 000000000..598016481
Binary files /dev/null and b/images/emoji/1f1f2-1f1ed.png differ
diff --git a/images/emoji/1f1f2-1f1f0.png b/images/emoji/1f1f2-1f1f0.png
new file mode 100644
index 000000000..7ba775ee7
Binary files /dev/null and b/images/emoji/1f1f2-1f1f0.png differ
diff --git a/images/emoji/1f1f2-1f1f1.png b/images/emoji/1f1f2-1f1f1.png
new file mode 100644
index 000000000..683437854
Binary files /dev/null and b/images/emoji/1f1f2-1f1f1.png differ
diff --git a/images/emoji/1f1f2-1f1f2.png b/images/emoji/1f1f2-1f1f2.png
new file mode 100644
index 000000000..37dc7d715
Binary files /dev/null and b/images/emoji/1f1f2-1f1f2.png differ
diff --git a/images/emoji/1f1f2-1f1f3.png b/images/emoji/1f1f2-1f1f3.png
new file mode 100644
index 000000000..1f146bbcd
Binary files /dev/null and b/images/emoji/1f1f2-1f1f3.png differ
diff --git a/images/emoji/1f1f2-1f1f4.png b/images/emoji/1f1f2-1f1f4.png
new file mode 100644
index 000000000..7edde31f6
Binary files /dev/null and b/images/emoji/1f1f2-1f1f4.png differ
diff --git a/images/emoji/1f1f2-1f1f5.png b/images/emoji/1f1f2-1f1f5.png
new file mode 100644
index 000000000..17ec1c441
Binary files /dev/null and b/images/emoji/1f1f2-1f1f5.png differ
diff --git a/images/emoji/1f1f2-1f1f6.png b/images/emoji/1f1f2-1f1f6.png
new file mode 100644
index 000000000..1e672dc90
Binary files /dev/null and b/images/emoji/1f1f2-1f1f6.png differ
diff --git a/images/emoji/1f1f2-1f1f7.png b/images/emoji/1f1f2-1f1f7.png
new file mode 100644
index 000000000..f87de46ef
Binary files /dev/null and b/images/emoji/1f1f2-1f1f7.png differ
diff --git a/images/emoji/1f1f2-1f1f8.png b/images/emoji/1f1f2-1f1f8.png
new file mode 100644
index 000000000..480b0d4eb
Binary files /dev/null and b/images/emoji/1f1f2-1f1f8.png differ
diff --git a/images/emoji/1f1f2-1f1f9.png b/images/emoji/1f1f2-1f1f9.png
new file mode 100644
index 000000000..c9e1dbdce
Binary files /dev/null and b/images/emoji/1f1f2-1f1f9.png differ
diff --git a/images/emoji/1f1f2-1f1fa.png b/images/emoji/1f1f2-1f1fa.png
new file mode 100644
index 000000000..55b33cb7c
Binary files /dev/null and b/images/emoji/1f1f2-1f1fa.png differ
diff --git a/images/emoji/1f1f2-1f1fb.png b/images/emoji/1f1f2-1f1fb.png
new file mode 100644
index 000000000..ce5867126
Binary files /dev/null and b/images/emoji/1f1f2-1f1fb.png differ
diff --git a/images/emoji/1f1f2-1f1fc.png b/images/emoji/1f1f2-1f1fc.png
new file mode 100644
index 000000000..003d85484
Binary files /dev/null and b/images/emoji/1f1f2-1f1fc.png differ
diff --git a/images/emoji/1f1f2-1f1fd.png b/images/emoji/1f1f2-1f1fd.png
new file mode 100644
index 000000000..42572bcd0
Binary files /dev/null and b/images/emoji/1f1f2-1f1fd.png differ
diff --git a/images/emoji/1f1f2-1f1fe.png b/images/emoji/1f1f2-1f1fe.png
new file mode 100644
index 000000000..17526c267
Binary files /dev/null and b/images/emoji/1f1f2-1f1fe.png differ
diff --git a/images/emoji/1f1f2-1f1ff.png b/images/emoji/1f1f2-1f1ff.png
new file mode 100644
index 000000000..2352a78e7
Binary files /dev/null and b/images/emoji/1f1f2-1f1ff.png differ
diff --git a/images/emoji/1f1f2.png b/images/emoji/1f1f2.png
new file mode 100644
index 000000000..7b848b2ce
Binary files /dev/null and b/images/emoji/1f1f2.png differ
diff --git a/images/emoji/1f1f3-1f1e6.png b/images/emoji/1f1f3-1f1e6.png
new file mode 100644
index 000000000..ed31c3df0
Binary files /dev/null and b/images/emoji/1f1f3-1f1e6.png differ
diff --git a/images/emoji/1f1f3-1f1e8.png b/images/emoji/1f1f3-1f1e8.png
new file mode 100644
index 000000000..3c57ee942
Binary files /dev/null and b/images/emoji/1f1f3-1f1e8.png differ
diff --git a/images/emoji/1f1f3-1f1ea.png b/images/emoji/1f1f3-1f1ea.png
new file mode 100644
index 000000000..f98a1173c
Binary files /dev/null and b/images/emoji/1f1f3-1f1ea.png differ
diff --git a/images/emoji/1f1f3-1f1eb.png b/images/emoji/1f1f3-1f1eb.png
new file mode 100644
index 000000000..9099e7674
Binary files /dev/null and b/images/emoji/1f1f3-1f1eb.png differ
diff --git a/images/emoji/1f1f3-1f1ec.png b/images/emoji/1f1f3-1f1ec.png
new file mode 100644
index 000000000..ea0abeff1
Binary files /dev/null and b/images/emoji/1f1f3-1f1ec.png differ
diff --git a/images/emoji/1f1f3-1f1ee.png b/images/emoji/1f1f3-1f1ee.png
new file mode 100644
index 000000000..772920dfa
Binary files /dev/null and b/images/emoji/1f1f3-1f1ee.png differ
diff --git a/images/emoji/1f1f3-1f1f1.png b/images/emoji/1f1f3-1f1f1.png
new file mode 100644
index 000000000..83a0e817e
Binary files /dev/null and b/images/emoji/1f1f3-1f1f1.png differ
diff --git a/images/emoji/1f1f3-1f1f4.png b/images/emoji/1f1f3-1f1f4.png
new file mode 100644
index 000000000..99d3142eb
Binary files /dev/null and b/images/emoji/1f1f3-1f1f4.png differ
diff --git a/images/emoji/1f1f3-1f1f5.png b/images/emoji/1f1f3-1f1f5.png
new file mode 100644
index 000000000..87425a8df
Binary files /dev/null and b/images/emoji/1f1f3-1f1f5.png differ
diff --git a/images/emoji/1f1f3-1f1f7.png b/images/emoji/1f1f3-1f1f7.png
new file mode 100644
index 000000000..b3e3a5d56
Binary files /dev/null and b/images/emoji/1f1f3-1f1f7.png differ
diff --git a/images/emoji/1f1f3-1f1fa.png b/images/emoji/1f1f3-1f1fa.png
new file mode 100644
index 000000000..f03614443
Binary files /dev/null and b/images/emoji/1f1f3-1f1fa.png differ
diff --git a/images/emoji/1f1f3-1f1ff.png b/images/emoji/1f1f3-1f1ff.png
new file mode 100644
index 000000000..a4eeeab9c
Binary files /dev/null and b/images/emoji/1f1f3-1f1ff.png differ
diff --git a/images/emoji/1f1f3.png b/images/emoji/1f1f3.png
new file mode 100644
index 000000000..4a11e5043
Binary files /dev/null and b/images/emoji/1f1f3.png differ
diff --git a/images/emoji/1f1f4-1f1f2.png b/images/emoji/1f1f4-1f1f2.png
new file mode 100644
index 000000000..ea824ba31
Binary files /dev/null and b/images/emoji/1f1f4-1f1f2.png differ
diff --git a/images/emoji/1f1f4.png b/images/emoji/1f1f4.png
new file mode 100644
index 000000000..2a0760b31
Binary files /dev/null and b/images/emoji/1f1f4.png differ
diff --git a/images/emoji/1f1f5-1f1e6.png b/images/emoji/1f1f5-1f1e6.png
new file mode 100644
index 000000000..c3091d898
Binary files /dev/null and b/images/emoji/1f1f5-1f1e6.png differ
diff --git a/images/emoji/1f1f5-1f1ea.png b/images/emoji/1f1f5-1f1ea.png
new file mode 100644
index 000000000..39223aa9d
Binary files /dev/null and b/images/emoji/1f1f5-1f1ea.png differ
diff --git a/images/emoji/1f1f5-1f1eb.png b/images/emoji/1f1f5-1f1eb.png
new file mode 100644
index 000000000..113445f8f
Binary files /dev/null and b/images/emoji/1f1f5-1f1eb.png differ
diff --git a/images/emoji/1f1f5-1f1ec.png b/images/emoji/1f1f5-1f1ec.png
new file mode 100644
index 000000000..825e9dcb7
Binary files /dev/null and b/images/emoji/1f1f5-1f1ec.png differ
diff --git a/images/emoji/1f1f5-1f1ed.png b/images/emoji/1f1f5-1f1ed.png
new file mode 100644
index 000000000..8260e15bd
Binary files /dev/null and b/images/emoji/1f1f5-1f1ed.png differ
diff --git a/images/emoji/1f1f5-1f1f0.png b/images/emoji/1f1f5-1f1f0.png
new file mode 100644
index 000000000..a7b6a1c50
Binary files /dev/null and b/images/emoji/1f1f5-1f1f0.png differ
diff --git a/images/emoji/1f1f5-1f1f1.png b/images/emoji/1f1f5-1f1f1.png
new file mode 100644
index 000000000..19de2edec
Binary files /dev/null and b/images/emoji/1f1f5-1f1f1.png differ
diff --git a/images/emoji/1f1f5-1f1f2.png b/images/emoji/1f1f5-1f1f2.png
new file mode 100644
index 000000000..2ca605541
Binary files /dev/null and b/images/emoji/1f1f5-1f1f2.png differ
diff --git a/images/emoji/1f1f5-1f1f3.png b/images/emoji/1f1f5-1f1f3.png
new file mode 100644
index 000000000..9a6327847
Binary files /dev/null and b/images/emoji/1f1f5-1f1f3.png differ
diff --git a/images/emoji/1f1f5-1f1f7.png b/images/emoji/1f1f5-1f1f7.png
new file mode 100644
index 000000000..d0209cddb
Binary files /dev/null and b/images/emoji/1f1f5-1f1f7.png differ
diff --git a/images/emoji/1f1f5-1f1f8.png b/images/emoji/1f1f5-1f1f8.png
new file mode 100644
index 000000000..7ccab0977
Binary files /dev/null and b/images/emoji/1f1f5-1f1f8.png differ
diff --git a/images/emoji/1f1f5-1f1f9.png b/images/emoji/1f1f5-1f1f9.png
new file mode 100644
index 000000000..cc93f27c6
Binary files /dev/null and b/images/emoji/1f1f5-1f1f9.png differ
diff --git a/images/emoji/1f1f5-1f1fc.png b/images/emoji/1f1f5-1f1fc.png
new file mode 100644
index 000000000..154b2f12d
Binary files /dev/null and b/images/emoji/1f1f5-1f1fc.png differ
diff --git a/images/emoji/1f1f5-1f1fe.png b/images/emoji/1f1f5-1f1fe.png
new file mode 100644
index 000000000..662ad2f6f
Binary files /dev/null and b/images/emoji/1f1f5-1f1fe.png differ
diff --git a/images/emoji/1f1f5.png b/images/emoji/1f1f5.png
new file mode 100644
index 000000000..bcb3298f9
Binary files /dev/null and b/images/emoji/1f1f5.png differ
diff --git a/images/emoji/1f1f6-1f1e6.png b/images/emoji/1f1f6-1f1e6.png
new file mode 100644
index 000000000..a01d8b05c
Binary files /dev/null and b/images/emoji/1f1f6-1f1e6.png differ
diff --git a/images/emoji/1f1f6.png b/images/emoji/1f1f6.png
new file mode 100644
index 000000000..6c92a9dfb
Binary files /dev/null and b/images/emoji/1f1f6.png differ
diff --git a/images/emoji/1f1f7-1f1ea.png b/images/emoji/1f1f7-1f1ea.png
new file mode 100644
index 000000000..57f2bbe9d
Binary files /dev/null and b/images/emoji/1f1f7-1f1ea.png differ
diff --git a/images/emoji/1f1f7-1f1f4.png b/images/emoji/1f1f7-1f1f4.png
new file mode 100644
index 000000000..3e48c4477
Binary files /dev/null and b/images/emoji/1f1f7-1f1f4.png differ
diff --git a/images/emoji/1f1f7-1f1f8.png b/images/emoji/1f1f7-1f1f8.png
new file mode 100644
index 000000000..9df6c9a52
Binary files /dev/null and b/images/emoji/1f1f7-1f1f8.png differ
diff --git a/images/emoji/1f1f7-1f1fa.png b/images/emoji/1f1f7-1f1fa.png
new file mode 100644
index 000000000..e50c9db90
Binary files /dev/null and b/images/emoji/1f1f7-1f1fa.png differ
diff --git a/images/emoji/1f1f7-1f1fc.png b/images/emoji/1f1f7-1f1fc.png
new file mode 100644
index 000000000..c238c874e
Binary files /dev/null and b/images/emoji/1f1f7-1f1fc.png differ
diff --git a/images/emoji/1f1f7.png b/images/emoji/1f1f7.png
new file mode 100644
index 000000000..627892c91
Binary files /dev/null and b/images/emoji/1f1f7.png differ
diff --git a/images/emoji/1f1f8-1f1e6.png b/images/emoji/1f1f8-1f1e6.png
new file mode 100644
index 000000000..4941be7d1
Binary files /dev/null and b/images/emoji/1f1f8-1f1e6.png differ
diff --git a/images/emoji/1f1f8-1f1e7.png b/images/emoji/1f1f8-1f1e7.png
new file mode 100644
index 000000000..7d8f1ac61
Binary files /dev/null and b/images/emoji/1f1f8-1f1e7.png differ
diff --git a/images/emoji/1f1f8-1f1e8.png b/images/emoji/1f1f8-1f1e8.png
new file mode 100644
index 000000000..6ae4d9076
Binary files /dev/null and b/images/emoji/1f1f8-1f1e8.png differ
diff --git a/images/emoji/1f1f8-1f1e9.png b/images/emoji/1f1f8-1f1e9.png
new file mode 100644
index 000000000..963be1b36
Binary files /dev/null and b/images/emoji/1f1f8-1f1e9.png differ
diff --git a/images/emoji/1f1f8-1f1ea.png b/images/emoji/1f1f8-1f1ea.png
new file mode 100644
index 000000000..fc0d0e0ce
Binary files /dev/null and b/images/emoji/1f1f8-1f1ea.png differ
diff --git a/images/emoji/1f1f8-1f1ec.png b/images/emoji/1f1f8-1f1ec.png
new file mode 100644
index 000000000..de3c7737c
Binary files /dev/null and b/images/emoji/1f1f8-1f1ec.png differ
diff --git a/images/emoji/1f1f8-1f1ed.png b/images/emoji/1f1f8-1f1ed.png
new file mode 100644
index 000000000..40cd9e44e
Binary files /dev/null and b/images/emoji/1f1f8-1f1ed.png differ
diff --git a/images/emoji/1f1f8-1f1ee.png b/images/emoji/1f1f8-1f1ee.png
new file mode 100644
index 000000000..e308999db
Binary files /dev/null and b/images/emoji/1f1f8-1f1ee.png differ
diff --git a/images/emoji/1f1f8-1f1ef.png b/images/emoji/1f1f8-1f1ef.png
new file mode 100644
index 000000000..5884e6482
Binary files /dev/null and b/images/emoji/1f1f8-1f1ef.png differ
diff --git a/images/emoji/1f1f8-1f1f0.png b/images/emoji/1f1f8-1f1f0.png
new file mode 100644
index 000000000..4259d0e14
Binary files /dev/null and b/images/emoji/1f1f8-1f1f0.png differ
diff --git a/images/emoji/1f1f8-1f1f1.png b/images/emoji/1f1f8-1f1f1.png
new file mode 100644
index 000000000..d2cc68830
Binary files /dev/null and b/images/emoji/1f1f8-1f1f1.png differ
diff --git a/images/emoji/1f1f8-1f1f2.png b/images/emoji/1f1f8-1f1f2.png
new file mode 100644
index 000000000..b96ba87d0
Binary files /dev/null and b/images/emoji/1f1f8-1f1f2.png differ
diff --git a/images/emoji/1f1f8-1f1f3.png b/images/emoji/1f1f8-1f1f3.png
new file mode 100644
index 000000000..5368bbe93
Binary files /dev/null and b/images/emoji/1f1f8-1f1f3.png differ
diff --git a/images/emoji/1f1f8-1f1f4.png b/images/emoji/1f1f8-1f1f4.png
new file mode 100644
index 000000000..68a059736
Binary files /dev/null and b/images/emoji/1f1f8-1f1f4.png differ
diff --git a/images/emoji/1f1f8-1f1f7.png b/images/emoji/1f1f8-1f1f7.png
new file mode 100644
index 000000000..d32513270
Binary files /dev/null and b/images/emoji/1f1f8-1f1f7.png differ
diff --git a/images/emoji/1f1f8-1f1f8.png b/images/emoji/1f1f8-1f1f8.png
new file mode 100644
index 000000000..122977e79
Binary files /dev/null and b/images/emoji/1f1f8-1f1f8.png differ
diff --git a/images/emoji/1f1f8-1f1f9.png b/images/emoji/1f1f8-1f1f9.png
new file mode 100644
index 000000000..f83a863d6
Binary files /dev/null and b/images/emoji/1f1f8-1f1f9.png differ
diff --git a/images/emoji/1f1f8-1f1fb.png b/images/emoji/1f1f8-1f1fb.png
new file mode 100644
index 000000000..efb83e2f2
Binary files /dev/null and b/images/emoji/1f1f8-1f1fb.png differ
diff --git a/images/emoji/1f1f8-1f1fd.png b/images/emoji/1f1f8-1f1fd.png
new file mode 100644
index 000000000..94b760fbe
Binary files /dev/null and b/images/emoji/1f1f8-1f1fd.png differ
diff --git a/images/emoji/1f1f8-1f1fe.png b/images/emoji/1f1f8-1f1fe.png
new file mode 100644
index 000000000..09a8ee8f7
Binary files /dev/null and b/images/emoji/1f1f8-1f1fe.png differ
diff --git a/images/emoji/1f1f8-1f1ff.png b/images/emoji/1f1f8-1f1ff.png
new file mode 100644
index 000000000..f74e82ea1
Binary files /dev/null and b/images/emoji/1f1f8-1f1ff.png differ
diff --git a/images/emoji/1f1f8.png b/images/emoji/1f1f8.png
new file mode 100644
index 000000000..9d0dbf93a
Binary files /dev/null and b/images/emoji/1f1f8.png differ
diff --git a/images/emoji/1f1f9-1f1e6.png b/images/emoji/1f1f9-1f1e6.png
new file mode 100644
index 000000000..b44283e90
Binary files /dev/null and b/images/emoji/1f1f9-1f1e6.png differ
diff --git a/images/emoji/1f1f9-1f1e8.png b/images/emoji/1f1f9-1f1e8.png
new file mode 100644
index 000000000..156b33d1b
Binary files /dev/null and b/images/emoji/1f1f9-1f1e8.png differ
diff --git a/images/emoji/1f1f9-1f1e9.png b/images/emoji/1f1f9-1f1e9.png
new file mode 100644
index 000000000..ebe7f5928
Binary files /dev/null and b/images/emoji/1f1f9-1f1e9.png differ
diff --git a/images/emoji/1f1f9-1f1eb.png b/images/emoji/1f1f9-1f1eb.png
new file mode 100644
index 000000000..a1a3ad68e
Binary files /dev/null and b/images/emoji/1f1f9-1f1eb.png differ
diff --git a/images/emoji/1f1f9-1f1ec.png b/images/emoji/1f1f9-1f1ec.png
new file mode 100644
index 000000000..826b73c9a
Binary files /dev/null and b/images/emoji/1f1f9-1f1ec.png differ
diff --git a/images/emoji/1f1f9-1f1ed.png b/images/emoji/1f1f9-1f1ed.png
new file mode 100644
index 000000000..93ff542c5
Binary files /dev/null and b/images/emoji/1f1f9-1f1ed.png differ
diff --git a/images/emoji/1f1f9-1f1ef.png b/images/emoji/1f1f9-1f1ef.png
new file mode 100644
index 000000000..7a8a0b619
Binary files /dev/null and b/images/emoji/1f1f9-1f1ef.png differ
diff --git a/images/emoji/1f1f9-1f1f0.png b/images/emoji/1f1f9-1f1f0.png
new file mode 100644
index 000000000..2fa5a21b1
Binary files /dev/null and b/images/emoji/1f1f9-1f1f0.png differ
diff --git a/images/emoji/1f1f9-1f1f1.png b/images/emoji/1f1f9-1f1f1.png
new file mode 100644
index 000000000..5b120eccc
Binary files /dev/null and b/images/emoji/1f1f9-1f1f1.png differ
diff --git a/images/emoji/1f1f9-1f1f2.png b/images/emoji/1f1f9-1f1f2.png
new file mode 100644
index 000000000..c3c4f5323
Binary files /dev/null and b/images/emoji/1f1f9-1f1f2.png differ
diff --git a/images/emoji/1f1f9-1f1f3.png b/images/emoji/1f1f9-1f1f3.png
new file mode 100644
index 000000000..58ef16122
Binary files /dev/null and b/images/emoji/1f1f9-1f1f3.png differ
diff --git a/images/emoji/1f1f9-1f1f4.png b/images/emoji/1f1f9-1f1f4.png
new file mode 100644
index 000000000..1ffa7bb9d
Binary files /dev/null and b/images/emoji/1f1f9-1f1f4.png differ
diff --git a/images/emoji/1f1f9-1f1f7.png b/images/emoji/1f1f9-1f1f7.png
new file mode 100644
index 000000000..325251fae
Binary files /dev/null and b/images/emoji/1f1f9-1f1f7.png differ
diff --git a/images/emoji/1f1f9-1f1f9.png b/images/emoji/1f1f9-1f1f9.png
new file mode 100644
index 000000000..ed3bb39a3
Binary files /dev/null and b/images/emoji/1f1f9-1f1f9.png differ
diff --git a/images/emoji/1f1f9-1f1fb.png b/images/emoji/1f1f9-1f1fb.png
new file mode 100644
index 000000000..e82c65c7b
Binary files /dev/null and b/images/emoji/1f1f9-1f1fb.png differ
diff --git a/images/emoji/1f1f9-1f1fc.png b/images/emoji/1f1f9-1f1fc.png
new file mode 100644
index 000000000..3a8f00b59
Binary files /dev/null and b/images/emoji/1f1f9-1f1fc.png differ
diff --git a/images/emoji/1f1f9-1f1ff.png b/images/emoji/1f1f9-1f1ff.png
new file mode 100644
index 000000000..2a020853d
Binary files /dev/null and b/images/emoji/1f1f9-1f1ff.png differ
diff --git a/images/emoji/1f1f9.png b/images/emoji/1f1f9.png
new file mode 100644
index 000000000..2d882f66b
Binary files /dev/null and b/images/emoji/1f1f9.png differ
diff --git a/images/emoji/1f1fa-1f1e6.png b/images/emoji/1f1fa-1f1e6.png
new file mode 100644
index 000000000..cd84d1bbd
Binary files /dev/null and b/images/emoji/1f1fa-1f1e6.png differ
diff --git a/images/emoji/1f1fa-1f1ec.png b/images/emoji/1f1fa-1f1ec.png
new file mode 100644
index 000000000..dc97690eb
Binary files /dev/null and b/images/emoji/1f1fa-1f1ec.png differ
diff --git a/images/emoji/1f1fa-1f1f2.png b/images/emoji/1f1fa-1f1f2.png
new file mode 100644
index 000000000..4a7ee3cdf
Binary files /dev/null and b/images/emoji/1f1fa-1f1f2.png differ
diff --git a/images/emoji/1f1fa-1f1f8.png b/images/emoji/1f1fa-1f1f8.png
new file mode 100644
index 000000000..9f7303058
Binary files /dev/null and b/images/emoji/1f1fa-1f1f8.png differ
diff --git a/images/emoji/1f1fa-1f1fe.png b/images/emoji/1f1fa-1f1fe.png
new file mode 100644
index 000000000..b8002a697
Binary files /dev/null and b/images/emoji/1f1fa-1f1fe.png differ
diff --git a/images/emoji/1f1fa-1f1ff.png b/images/emoji/1f1fa-1f1ff.png
new file mode 100644
index 000000000..d56ca9bc4
Binary files /dev/null and b/images/emoji/1f1fa-1f1ff.png differ
diff --git a/images/emoji/1f1fa.png b/images/emoji/1f1fa.png
new file mode 100644
index 000000000..ae0cabeb1
Binary files /dev/null and b/images/emoji/1f1fa.png differ
diff --git a/images/emoji/1f1fb-1f1e6.png b/images/emoji/1f1fb-1f1e6.png
new file mode 100644
index 000000000..7f0676fc8
Binary files /dev/null and b/images/emoji/1f1fb-1f1e6.png differ
diff --git a/images/emoji/1f1fb-1f1e8.png b/images/emoji/1f1fb-1f1e8.png
new file mode 100644
index 000000000..43703c62a
Binary files /dev/null and b/images/emoji/1f1fb-1f1e8.png differ
diff --git a/images/emoji/1f1fb-1f1ea.png b/images/emoji/1f1fb-1f1ea.png
new file mode 100644
index 000000000..1b6279682
Binary files /dev/null and b/images/emoji/1f1fb-1f1ea.png differ
diff --git a/images/emoji/1f1fb-1f1ec.png b/images/emoji/1f1fb-1f1ec.png
new file mode 100644
index 000000000..536f780f1
Binary files /dev/null and b/images/emoji/1f1fb-1f1ec.png differ
diff --git a/images/emoji/1f1fb-1f1ee.png b/images/emoji/1f1fb-1f1ee.png
new file mode 100644
index 000000000..1b4219cb9
Binary files /dev/null and b/images/emoji/1f1fb-1f1ee.png differ
diff --git a/images/emoji/1f1fb-1f1f3.png b/images/emoji/1f1fb-1f1f3.png
new file mode 100644
index 000000000..427036046
Binary files /dev/null and b/images/emoji/1f1fb-1f1f3.png differ
diff --git a/images/emoji/1f1fb-1f1fa.png b/images/emoji/1f1fb-1f1fa.png
new file mode 100644
index 000000000..706eba440
Binary files /dev/null and b/images/emoji/1f1fb-1f1fa.png differ
diff --git a/images/emoji/1f1fb.png b/images/emoji/1f1fb.png
new file mode 100644
index 000000000..e01e179b4
Binary files /dev/null and b/images/emoji/1f1fb.png differ
diff --git a/images/emoji/1f1fc-1f1eb.png b/images/emoji/1f1fc-1f1eb.png
new file mode 100644
index 000000000..70c761036
Binary files /dev/null and b/images/emoji/1f1fc-1f1eb.png differ
diff --git a/images/emoji/1f1fc-1f1f8.png b/images/emoji/1f1fc-1f1f8.png
new file mode 100644
index 000000000..a1ea07031
Binary files /dev/null and b/images/emoji/1f1fc-1f1f8.png differ
diff --git a/images/emoji/1f1fc.png b/images/emoji/1f1fc.png
new file mode 100644
index 000000000..e8f614ac8
Binary files /dev/null and b/images/emoji/1f1fc.png differ
diff --git a/images/emoji/1f1fd-1f1f0.png b/images/emoji/1f1fd-1f1f0.png
new file mode 100644
index 000000000..e587a4466
Binary files /dev/null and b/images/emoji/1f1fd-1f1f0.png differ
diff --git a/images/emoji/1f1fd.png b/images/emoji/1f1fd.png
new file mode 100644
index 000000000..e3bedba0b
Binary files /dev/null and b/images/emoji/1f1fd.png differ
diff --git a/images/emoji/1f1fe-1f1ea.png b/images/emoji/1f1fe-1f1ea.png
new file mode 100644
index 000000000..eadfebd5f
Binary files /dev/null and b/images/emoji/1f1fe-1f1ea.png differ
diff --git a/images/emoji/1f1fe-1f1f9.png b/images/emoji/1f1fe-1f1f9.png
new file mode 100644
index 000000000..e55fd8d85
Binary files /dev/null and b/images/emoji/1f1fe-1f1f9.png differ
diff --git a/images/emoji/1f1fe.png b/images/emoji/1f1fe.png
new file mode 100644
index 000000000..9bfa7f2db
Binary files /dev/null and b/images/emoji/1f1fe.png differ
diff --git a/images/emoji/1f1ff-1f1e6.png b/images/emoji/1f1ff-1f1e6.png
new file mode 100644
index 000000000..f397ef507
Binary files /dev/null and b/images/emoji/1f1ff-1f1e6.png differ
diff --git a/images/emoji/1f1ff-1f1f2.png b/images/emoji/1f1ff-1f1f2.png
new file mode 100644
index 000000000..2494a31f6
Binary files /dev/null and b/images/emoji/1f1ff-1f1f2.png differ
diff --git a/images/emoji/1f1ff-1f1fc.png b/images/emoji/1f1ff-1f1fc.png
new file mode 100644
index 000000000..e09b9652b
Binary files /dev/null and b/images/emoji/1f1ff-1f1fc.png differ
diff --git a/images/emoji/1f1ff.png b/images/emoji/1f1ff.png
new file mode 100644
index 000000000..5bf03f100
Binary files /dev/null and b/images/emoji/1f1ff.png differ
diff --git a/images/emoji/1f201.png b/images/emoji/1f201.png
new file mode 100644
index 000000000..6450eb44d
Binary files /dev/null and b/images/emoji/1f201.png differ
diff --git a/images/emoji/1f202.png b/images/emoji/1f202.png
new file mode 100644
index 000000000..900f96332
Binary files /dev/null and b/images/emoji/1f202.png differ
diff --git a/images/emoji/1f21a.png b/images/emoji/1f21a.png
new file mode 100644
index 000000000..d3a19b420
Binary files /dev/null and b/images/emoji/1f21a.png differ
diff --git a/images/emoji/1f22f.png b/images/emoji/1f22f.png
new file mode 100644
index 000000000..078e23e4f
Binary files /dev/null and b/images/emoji/1f22f.png differ
diff --git a/images/emoji/1f232.png b/images/emoji/1f232.png
new file mode 100644
index 000000000..4c704e034
Binary files /dev/null and b/images/emoji/1f232.png differ
diff --git a/images/emoji/1f233.png b/images/emoji/1f233.png
new file mode 100644
index 000000000..47966c1ea
Binary files /dev/null and b/images/emoji/1f233.png differ
diff --git a/images/emoji/1f234.png b/images/emoji/1f234.png
new file mode 100644
index 000000000..8375ad9d9
Binary files /dev/null and b/images/emoji/1f234.png differ
diff --git a/images/emoji/1f235.png b/images/emoji/1f235.png
new file mode 100644
index 000000000..f9dea8b88
Binary files /dev/null and b/images/emoji/1f235.png differ
diff --git a/images/emoji/1f236.png b/images/emoji/1f236.png
new file mode 100644
index 000000000..a4510de41
Binary files /dev/null and b/images/emoji/1f236.png differ
diff --git a/images/emoji/1f237.png b/images/emoji/1f237.png
new file mode 100644
index 000000000..c41bd36a2
Binary files /dev/null and b/images/emoji/1f237.png differ
diff --git a/images/emoji/1f238.png b/images/emoji/1f238.png
new file mode 100644
index 000000000..6b7af0ee2
Binary files /dev/null and b/images/emoji/1f238.png differ
diff --git a/images/emoji/1f239.png b/images/emoji/1f239.png
new file mode 100644
index 000000000..c4f837fe6
Binary files /dev/null and b/images/emoji/1f239.png differ
diff --git a/images/emoji/1f23a.png b/images/emoji/1f23a.png
new file mode 100644
index 000000000..d21cb30ea
Binary files /dev/null and b/images/emoji/1f23a.png differ
diff --git a/images/emoji/1f250.png b/images/emoji/1f250.png
new file mode 100644
index 000000000..0c0d589ca
Binary files /dev/null and b/images/emoji/1f250.png differ
diff --git a/images/emoji/1f251.png b/images/emoji/1f251.png
new file mode 100644
index 000000000..8afd7ce99
Binary files /dev/null and b/images/emoji/1f251.png differ
diff --git a/images/emoji/1f300.png b/images/emoji/1f300.png
new file mode 100644
index 000000000..ff00b1afe
Binary files /dev/null and b/images/emoji/1f300.png differ
diff --git a/images/emoji/1f301.png b/images/emoji/1f301.png
new file mode 100644
index 000000000..57702d8d3
Binary files /dev/null and b/images/emoji/1f301.png differ
diff --git a/images/emoji/1f302.png b/images/emoji/1f302.png
new file mode 100644
index 000000000..ecefba9e4
Binary files /dev/null and b/images/emoji/1f302.png differ
diff --git a/images/emoji/1f303.png b/images/emoji/1f303.png
new file mode 100644
index 000000000..ca2018f45
Binary files /dev/null and b/images/emoji/1f303.png differ
diff --git a/images/emoji/1f304.png b/images/emoji/1f304.png
new file mode 100644
index 000000000..39c57c86a
Binary files /dev/null and b/images/emoji/1f304.png differ
diff --git a/images/emoji/1f305.png b/images/emoji/1f305.png
new file mode 100644
index 000000000..4ad36003c
Binary files /dev/null and b/images/emoji/1f305.png differ
diff --git a/images/emoji/1f306.png b/images/emoji/1f306.png
new file mode 100644
index 000000000..80cdff7cf
Binary files /dev/null and b/images/emoji/1f306.png differ
diff --git a/images/emoji/1f307.png b/images/emoji/1f307.png
new file mode 100644
index 000000000..7cded0ba5
Binary files /dev/null and b/images/emoji/1f307.png differ
diff --git a/images/emoji/1f308.png b/images/emoji/1f308.png
new file mode 100644
index 000000000..154735d71
Binary files /dev/null and b/images/emoji/1f308.png differ
diff --git a/images/emoji/1f309.png b/images/emoji/1f309.png
new file mode 100644
index 000000000..1d444e0be
Binary files /dev/null and b/images/emoji/1f309.png differ
diff --git a/images/emoji/1f30a.png b/images/emoji/1f30a.png
new file mode 100644
index 000000000..45ff1e877
Binary files /dev/null and b/images/emoji/1f30a.png differ
diff --git a/images/emoji/1f30b.png b/images/emoji/1f30b.png
new file mode 100644
index 000000000..adb522980
Binary files /dev/null and b/images/emoji/1f30b.png differ
diff --git a/images/emoji/1f30c.png b/images/emoji/1f30c.png
new file mode 100644
index 000000000..b2b8ac59c
Binary files /dev/null and b/images/emoji/1f30c.png differ
diff --git a/images/emoji/1f30d.png b/images/emoji/1f30d.png
new file mode 100644
index 000000000..66c3348c2
Binary files /dev/null and b/images/emoji/1f30d.png differ
diff --git a/images/emoji/1f30e.png b/images/emoji/1f30e.png
new file mode 100644
index 000000000..538c3cddd
Binary files /dev/null and b/images/emoji/1f30e.png differ
diff --git a/images/emoji/1f30f.png b/images/emoji/1f30f.png
new file mode 100644
index 000000000..d8df97fec
Binary files /dev/null and b/images/emoji/1f30f.png differ
diff --git a/images/emoji/1f310.png b/images/emoji/1f310.png
new file mode 100644
index 000000000..82450c1a4
Binary files /dev/null and b/images/emoji/1f310.png differ
diff --git a/images/emoji/1f311.png b/images/emoji/1f311.png
new file mode 100644
index 000000000..ecff72caa
Binary files /dev/null and b/images/emoji/1f311.png differ
diff --git a/images/emoji/1f312.png b/images/emoji/1f312.png
new file mode 100644
index 000000000..921224a34
Binary files /dev/null and b/images/emoji/1f312.png differ
diff --git a/images/emoji/1f313.png b/images/emoji/1f313.png
new file mode 100644
index 000000000..5dccaf72a
Binary files /dev/null and b/images/emoji/1f313.png differ
diff --git a/images/emoji/1f314.png b/images/emoji/1f314.png
new file mode 100644
index 000000000..3a8081563
Binary files /dev/null and b/images/emoji/1f314.png differ
diff --git a/images/emoji/1f315.png b/images/emoji/1f315.png
new file mode 100644
index 000000000..c9a2d6aa7
Binary files /dev/null and b/images/emoji/1f315.png differ
diff --git a/images/emoji/1f316.png b/images/emoji/1f316.png
new file mode 100644
index 000000000..741bd5931
Binary files /dev/null and b/images/emoji/1f316.png differ
diff --git a/images/emoji/1f317.png b/images/emoji/1f317.png
new file mode 100644
index 000000000..0842a0dd4
Binary files /dev/null and b/images/emoji/1f317.png differ
diff --git a/images/emoji/1f318.png b/images/emoji/1f318.png
new file mode 100644
index 000000000..cf68706b8
Binary files /dev/null and b/images/emoji/1f318.png differ
diff --git a/images/emoji/1f319.png b/images/emoji/1f319.png
new file mode 100644
index 000000000..765420ece
Binary files /dev/null and b/images/emoji/1f319.png differ
diff --git a/images/emoji/1f31a.png b/images/emoji/1f31a.png
new file mode 100644
index 000000000..150dd1240
Binary files /dev/null and b/images/emoji/1f31a.png differ
diff --git a/images/emoji/1f31b.png b/images/emoji/1f31b.png
new file mode 100644
index 000000000..cd8a3d7ac
Binary files /dev/null and b/images/emoji/1f31b.png differ
diff --git a/images/emoji/1f31c.png b/images/emoji/1f31c.png
new file mode 100644
index 000000000..94099343c
Binary files /dev/null and b/images/emoji/1f31c.png differ
diff --git a/images/emoji/1f31d.png b/images/emoji/1f31d.png
new file mode 100644
index 000000000..a5c25bbaf
Binary files /dev/null and b/images/emoji/1f31d.png differ
diff --git a/images/emoji/1f31e.png b/images/emoji/1f31e.png
new file mode 100644
index 000000000..14a4ea971
Binary files /dev/null and b/images/emoji/1f31e.png differ
diff --git a/images/emoji/1f31f.png b/images/emoji/1f31f.png
new file mode 100644
index 000000000..2f5cba592
Binary files /dev/null and b/images/emoji/1f31f.png differ
diff --git a/images/emoji/1f320.png b/images/emoji/1f320.png
new file mode 100644
index 000000000..aa45384d1
Binary files /dev/null and b/images/emoji/1f320.png differ
diff --git a/images/emoji/1f321.png b/images/emoji/1f321.png
new file mode 100644
index 000000000..b11473924
Binary files /dev/null and b/images/emoji/1f321.png differ
diff --git a/images/emoji/1f324.png b/images/emoji/1f324.png
new file mode 100644
index 000000000..cead0bfa5
Binary files /dev/null and b/images/emoji/1f324.png differ
diff --git a/images/emoji/1f325.png b/images/emoji/1f325.png
new file mode 100644
index 000000000..0a4cc1002
Binary files /dev/null and b/images/emoji/1f325.png differ
diff --git a/images/emoji/1f326.png b/images/emoji/1f326.png
new file mode 100644
index 000000000..491f9ca48
Binary files /dev/null and b/images/emoji/1f326.png differ
diff --git a/images/emoji/1f327.png b/images/emoji/1f327.png
new file mode 100644
index 000000000..385685e05
Binary files /dev/null and b/images/emoji/1f327.png differ
diff --git a/images/emoji/1f328.png b/images/emoji/1f328.png
new file mode 100644
index 000000000..9720384eb
Binary files /dev/null and b/images/emoji/1f328.png differ
diff --git a/images/emoji/1f329.png b/images/emoji/1f329.png
new file mode 100644
index 000000000..0831e88aa
Binary files /dev/null and b/images/emoji/1f329.png differ
diff --git a/images/emoji/1f32a.png b/images/emoji/1f32a.png
new file mode 100644
index 000000000..4821c89da
Binary files /dev/null and b/images/emoji/1f32a.png differ
diff --git a/images/emoji/1f32b.png b/images/emoji/1f32b.png
new file mode 100644
index 000000000..4e73c2de2
Binary files /dev/null and b/images/emoji/1f32b.png differ
diff --git a/images/emoji/1f32c.png b/images/emoji/1f32c.png
new file mode 100644
index 000000000..df81b652e
Binary files /dev/null and b/images/emoji/1f32c.png differ
diff --git a/images/emoji/1f32d.png b/images/emoji/1f32d.png
new file mode 100644
index 000000000..3c3354d94
Binary files /dev/null and b/images/emoji/1f32d.png differ
diff --git a/images/emoji/1f32e.png b/images/emoji/1f32e.png
new file mode 100644
index 000000000..10e847a46
Binary files /dev/null and b/images/emoji/1f32e.png differ
diff --git a/images/emoji/1f32f.png b/images/emoji/1f32f.png
new file mode 100644
index 000000000..02bd5601d
Binary files /dev/null and b/images/emoji/1f32f.png differ
diff --git a/images/emoji/1f330.png b/images/emoji/1f330.png
new file mode 100644
index 000000000..f8a01e281
Binary files /dev/null and b/images/emoji/1f330.png differ
diff --git a/images/emoji/1f331.png b/images/emoji/1f331.png
new file mode 100644
index 000000000..ae0948bcf
Binary files /dev/null and b/images/emoji/1f331.png differ
diff --git a/images/emoji/1f332.png b/images/emoji/1f332.png
new file mode 100644
index 000000000..f679d8dd7
Binary files /dev/null and b/images/emoji/1f332.png differ
diff --git a/images/emoji/1f333.png b/images/emoji/1f333.png
new file mode 100644
index 000000000..7cd2bc708
Binary files /dev/null and b/images/emoji/1f333.png differ
diff --git a/images/emoji/1f334.png b/images/emoji/1f334.png
new file mode 100644
index 000000000..aaaa6aec3
Binary files /dev/null and b/images/emoji/1f334.png differ
diff --git a/images/emoji/1f335.png b/images/emoji/1f335.png
new file mode 100644
index 000000000..9b48ccf3d
Binary files /dev/null and b/images/emoji/1f335.png differ
diff --git a/images/emoji/1f336.png b/images/emoji/1f336.png
new file mode 100644
index 000000000..266675bd5
Binary files /dev/null and b/images/emoji/1f336.png differ
diff --git a/images/emoji/1f337.png b/images/emoji/1f337.png
new file mode 100644
index 000000000..f799d75c1
Binary files /dev/null and b/images/emoji/1f337.png differ
diff --git a/images/emoji/1f338.png b/images/emoji/1f338.png
new file mode 100644
index 000000000..282f3e7bc
Binary files /dev/null and b/images/emoji/1f338.png differ
diff --git a/images/emoji/1f339.png b/images/emoji/1f339.png
new file mode 100644
index 000000000..52c286d31
Binary files /dev/null and b/images/emoji/1f339.png differ
diff --git a/images/emoji/1f33a.png b/images/emoji/1f33a.png
new file mode 100644
index 000000000..39dd35242
Binary files /dev/null and b/images/emoji/1f33a.png differ
diff --git a/images/emoji/1f33b.png b/images/emoji/1f33b.png
new file mode 100644
index 000000000..08cc07761
Binary files /dev/null and b/images/emoji/1f33b.png differ
diff --git a/images/emoji/1f33c.png b/images/emoji/1f33c.png
new file mode 100644
index 000000000..4083026c1
Binary files /dev/null and b/images/emoji/1f33c.png differ
diff --git a/images/emoji/1f33d.png b/images/emoji/1f33d.png
new file mode 100644
index 000000000..36e201279
Binary files /dev/null and b/images/emoji/1f33d.png differ
diff --git a/images/emoji/1f33e.png b/images/emoji/1f33e.png
new file mode 100644
index 000000000..3564d9d64
Binary files /dev/null and b/images/emoji/1f33e.png differ
diff --git a/images/emoji/1f33f.png b/images/emoji/1f33f.png
new file mode 100644
index 000000000..d984d1562
Binary files /dev/null and b/images/emoji/1f33f.png differ
diff --git a/images/emoji/1f340.png b/images/emoji/1f340.png
new file mode 100644
index 000000000..fdedfcc2b
Binary files /dev/null and b/images/emoji/1f340.png differ
diff --git a/images/emoji/1f341.png b/images/emoji/1f341.png
new file mode 100644
index 000000000..c49acea67
Binary files /dev/null and b/images/emoji/1f341.png differ
diff --git a/images/emoji/1f342.png b/images/emoji/1f342.png
new file mode 100644
index 000000000..0d60e7bdf
Binary files /dev/null and b/images/emoji/1f342.png differ
diff --git a/images/emoji/1f343.png b/images/emoji/1f343.png
new file mode 100644
index 000000000..1e43e1af8
Binary files /dev/null and b/images/emoji/1f343.png differ
diff --git a/images/emoji/1f344.png b/images/emoji/1f344.png
new file mode 100644
index 000000000..dd85742ba
Binary files /dev/null and b/images/emoji/1f344.png differ
diff --git a/images/emoji/1f345.png b/images/emoji/1f345.png
new file mode 100644
index 000000000..497da8f6b
Binary files /dev/null and b/images/emoji/1f345.png differ
diff --git a/images/emoji/1f346.png b/images/emoji/1f346.png
new file mode 100644
index 000000000..fafd7c1a1
Binary files /dev/null and b/images/emoji/1f346.png differ
diff --git a/images/emoji/1f347.png b/images/emoji/1f347.png
new file mode 100644
index 000000000..30d222188
Binary files /dev/null and b/images/emoji/1f347.png differ
diff --git a/images/emoji/1f348.png b/images/emoji/1f348.png
new file mode 100644
index 000000000..c01232d41
Binary files /dev/null and b/images/emoji/1f348.png differ
diff --git a/images/emoji/1f349.png b/images/emoji/1f349.png
new file mode 100644
index 000000000..0761488b4
Binary files /dev/null and b/images/emoji/1f349.png differ
diff --git a/images/emoji/1f34a.png b/images/emoji/1f34a.png
new file mode 100644
index 000000000..ab14e5378
Binary files /dev/null and b/images/emoji/1f34a.png differ
diff --git a/images/emoji/1f34b.png b/images/emoji/1f34b.png
new file mode 100644
index 000000000..9a7d95ca2
Binary files /dev/null and b/images/emoji/1f34b.png differ
diff --git a/images/emoji/1f34c.png b/images/emoji/1f34c.png
new file mode 100644
index 000000000..f49872795
Binary files /dev/null and b/images/emoji/1f34c.png differ
diff --git a/images/emoji/1f34d.png b/images/emoji/1f34d.png
new file mode 100644
index 000000000..d30d73307
Binary files /dev/null and b/images/emoji/1f34d.png differ
diff --git a/images/emoji/1f34e.png b/images/emoji/1f34e.png
new file mode 100644
index 000000000..da650c60f
Binary files /dev/null and b/images/emoji/1f34e.png differ
diff --git a/images/emoji/1f34f.png b/images/emoji/1f34f.png
new file mode 100644
index 000000000..5fd51bd39
Binary files /dev/null and b/images/emoji/1f34f.png differ
diff --git a/images/emoji/1f350.png b/images/emoji/1f350.png
new file mode 100644
index 000000000..3869f718b
Binary files /dev/null and b/images/emoji/1f350.png differ
diff --git a/images/emoji/1f351.png b/images/emoji/1f351.png
new file mode 100644
index 000000000..9ab57cbb7
Binary files /dev/null and b/images/emoji/1f351.png differ
diff --git a/images/emoji/1f352.png b/images/emoji/1f352.png
new file mode 100644
index 000000000..9b10cbaac
Binary files /dev/null and b/images/emoji/1f352.png differ
diff --git a/images/emoji/1f353.png b/images/emoji/1f353.png
new file mode 100644
index 000000000..7bb86f0b2
Binary files /dev/null and b/images/emoji/1f353.png differ
diff --git a/images/emoji/1f354.png b/images/emoji/1f354.png
new file mode 100644
index 000000000..4b13f3b8d
Binary files /dev/null and b/images/emoji/1f354.png differ
diff --git a/images/emoji/1f355.png b/images/emoji/1f355.png
new file mode 100644
index 000000000..240d5c469
Binary files /dev/null and b/images/emoji/1f355.png differ
diff --git a/images/emoji/1f356.png b/images/emoji/1f356.png
new file mode 100644
index 000000000..b20a59d16
Binary files /dev/null and b/images/emoji/1f356.png differ
diff --git a/images/emoji/1f357.png b/images/emoji/1f357.png
new file mode 100644
index 000000000..eea4a53a2
Binary files /dev/null and b/images/emoji/1f357.png differ
diff --git a/images/emoji/1f358.png b/images/emoji/1f358.png
new file mode 100644
index 000000000..7fbd08e4f
Binary files /dev/null and b/images/emoji/1f358.png differ
diff --git a/images/emoji/1f359.png b/images/emoji/1f359.png
new file mode 100644
index 000000000..d3d8ee25c
Binary files /dev/null and b/images/emoji/1f359.png differ
diff --git a/images/emoji/1f35a.png b/images/emoji/1f35a.png
new file mode 100644
index 000000000..6e3ac7956
Binary files /dev/null and b/images/emoji/1f35a.png differ
diff --git a/images/emoji/1f35b.png b/images/emoji/1f35b.png
new file mode 100644
index 000000000..69657ca81
Binary files /dev/null and b/images/emoji/1f35b.png differ
diff --git a/images/emoji/1f35c.png b/images/emoji/1f35c.png
new file mode 100644
index 000000000..c1cb7cd73
Binary files /dev/null and b/images/emoji/1f35c.png differ
diff --git a/images/emoji/1f35d.png b/images/emoji/1f35d.png
new file mode 100644
index 000000000..4f0b7ed07
Binary files /dev/null and b/images/emoji/1f35d.png differ
diff --git a/images/emoji/1f35e.png b/images/emoji/1f35e.png
new file mode 100644
index 000000000..6676510aa
Binary files /dev/null and b/images/emoji/1f35e.png differ
diff --git a/images/emoji/1f35f.png b/images/emoji/1f35f.png
new file mode 100644
index 000000000..3a0899d5a
Binary files /dev/null and b/images/emoji/1f35f.png differ
diff --git a/images/emoji/1f360.png b/images/emoji/1f360.png
new file mode 100644
index 000000000..92a425f2e
Binary files /dev/null and b/images/emoji/1f360.png differ
diff --git a/images/emoji/1f361.png b/images/emoji/1f361.png
new file mode 100644
index 000000000..f73f37b01
Binary files /dev/null and b/images/emoji/1f361.png differ
diff --git a/images/emoji/1f362.png b/images/emoji/1f362.png
new file mode 100644
index 000000000..d38a849fe
Binary files /dev/null and b/images/emoji/1f362.png differ
diff --git a/images/emoji/1f363.png b/images/emoji/1f363.png
new file mode 100644
index 000000000..f171fd2f7
Binary files /dev/null and b/images/emoji/1f363.png differ
diff --git a/images/emoji/1f364.png b/images/emoji/1f364.png
new file mode 100644
index 000000000..752ba7f13
Binary files /dev/null and b/images/emoji/1f364.png differ
diff --git a/images/emoji/1f365.png b/images/emoji/1f365.png
new file mode 100644
index 000000000..157bded65
Binary files /dev/null and b/images/emoji/1f365.png differ
diff --git a/images/emoji/1f366.png b/images/emoji/1f366.png
new file mode 100644
index 000000000..f1f21a3b8
Binary files /dev/null and b/images/emoji/1f366.png differ
diff --git a/images/emoji/1f367.png b/images/emoji/1f367.png
new file mode 100644
index 000000000..36dfb53ca
Binary files /dev/null and b/images/emoji/1f367.png differ
diff --git a/images/emoji/1f368.png b/images/emoji/1f368.png
new file mode 100644
index 000000000..720ae7428
Binary files /dev/null and b/images/emoji/1f368.png differ
diff --git a/images/emoji/1f369.png b/images/emoji/1f369.png
new file mode 100644
index 000000000..0ca4cd0bd
Binary files /dev/null and b/images/emoji/1f369.png differ
diff --git a/images/emoji/1f36a.png b/images/emoji/1f36a.png
new file mode 100644
index 000000000..1b6bcb155
Binary files /dev/null and b/images/emoji/1f36a.png differ
diff --git a/images/emoji/1f36b.png b/images/emoji/1f36b.png
new file mode 100644
index 000000000..318bbd40e
Binary files /dev/null and b/images/emoji/1f36b.png differ
diff --git a/images/emoji/1f36c.png b/images/emoji/1f36c.png
new file mode 100644
index 000000000..8c67ace3a
Binary files /dev/null and b/images/emoji/1f36c.png differ
diff --git a/images/emoji/1f36d.png b/images/emoji/1f36d.png
new file mode 100644
index 000000000..ad76d7bf9
Binary files /dev/null and b/images/emoji/1f36d.png differ
diff --git a/images/emoji/1f36e.png b/images/emoji/1f36e.png
new file mode 100644
index 000000000..fa3df67b8
Binary files /dev/null and b/images/emoji/1f36e.png differ
diff --git a/images/emoji/1f36f.png b/images/emoji/1f36f.png
new file mode 100644
index 000000000..9d8f59295
Binary files /dev/null and b/images/emoji/1f36f.png differ
diff --git a/images/emoji/1f370.png b/images/emoji/1f370.png
new file mode 100644
index 000000000..4368177be
Binary files /dev/null and b/images/emoji/1f370.png differ
diff --git a/images/emoji/1f371.png b/images/emoji/1f371.png
new file mode 100644
index 000000000..92cd17233
Binary files /dev/null and b/images/emoji/1f371.png differ
diff --git a/images/emoji/1f372.png b/images/emoji/1f372.png
new file mode 100644
index 000000000..6b3f010c1
Binary files /dev/null and b/images/emoji/1f372.png differ
diff --git a/images/emoji/1f373.png b/images/emoji/1f373.png
new file mode 100644
index 000000000..918c98057
Binary files /dev/null and b/images/emoji/1f373.png differ
diff --git a/images/emoji/1f374.png b/images/emoji/1f374.png
new file mode 100644
index 000000000..09f1feaea
Binary files /dev/null and b/images/emoji/1f374.png differ
diff --git a/images/emoji/1f375.png b/images/emoji/1f375.png
new file mode 100644
index 000000000..b53b98f0c
Binary files /dev/null and b/images/emoji/1f375.png differ
diff --git a/images/emoji/1f376.png b/images/emoji/1f376.png
new file mode 100644
index 000000000..2933f5672
Binary files /dev/null and b/images/emoji/1f376.png differ
diff --git a/images/emoji/1f377.png b/images/emoji/1f377.png
new file mode 100644
index 000000000..3cc986891
Binary files /dev/null and b/images/emoji/1f377.png differ
diff --git a/images/emoji/1f378.png b/images/emoji/1f378.png
new file mode 100644
index 000000000..2e50c57e9
Binary files /dev/null and b/images/emoji/1f378.png differ
diff --git a/images/emoji/1f379.png b/images/emoji/1f379.png
new file mode 100644
index 000000000..cd714f81b
Binary files /dev/null and b/images/emoji/1f379.png differ
diff --git a/images/emoji/1f37a.png b/images/emoji/1f37a.png
new file mode 100644
index 000000000..894da40a7
Binary files /dev/null and b/images/emoji/1f37a.png differ
diff --git a/images/emoji/1f37b.png b/images/emoji/1f37b.png
new file mode 100644
index 000000000..b55deb66b
Binary files /dev/null and b/images/emoji/1f37b.png differ
diff --git a/images/emoji/1f37c.png b/images/emoji/1f37c.png
new file mode 100644
index 000000000..2bd105241
Binary files /dev/null and b/images/emoji/1f37c.png differ
diff --git a/images/emoji/1f37d.png b/images/emoji/1f37d.png
new file mode 100644
index 000000000..7411755f7
Binary files /dev/null and b/images/emoji/1f37d.png differ
diff --git a/images/emoji/1f37e.png b/images/emoji/1f37e.png
new file mode 100644
index 000000000..285a79a93
Binary files /dev/null and b/images/emoji/1f37e.png differ
diff --git a/images/emoji/1f37f.png b/images/emoji/1f37f.png
new file mode 100644
index 000000000..573ab05af
Binary files /dev/null and b/images/emoji/1f37f.png differ
diff --git a/images/emoji/1f380.png b/images/emoji/1f380.png
new file mode 100644
index 000000000..0f253c3d8
Binary files /dev/null and b/images/emoji/1f380.png differ
diff --git a/images/emoji/1f381.png b/images/emoji/1f381.png
new file mode 100644
index 000000000..844e21645
Binary files /dev/null and b/images/emoji/1f381.png differ
diff --git a/images/emoji/1f382.png b/images/emoji/1f382.png
new file mode 100644
index 000000000..317e9a419
Binary files /dev/null and b/images/emoji/1f382.png differ
diff --git a/images/emoji/1f383.png b/images/emoji/1f383.png
new file mode 100644
index 000000000..44c3fc0ae
Binary files /dev/null and b/images/emoji/1f383.png differ
diff --git a/images/emoji/1f384.png b/images/emoji/1f384.png
new file mode 100644
index 000000000..4197d37a5
Binary files /dev/null and b/images/emoji/1f384.png differ
diff --git a/images/emoji/1f385-1f3fb.png b/images/emoji/1f385-1f3fb.png
new file mode 100644
index 000000000..2052920ab
Binary files /dev/null and b/images/emoji/1f385-1f3fb.png differ
diff --git a/images/emoji/1f385-1f3fc.png b/images/emoji/1f385-1f3fc.png
new file mode 100644
index 000000000..ec9375e14
Binary files /dev/null and b/images/emoji/1f385-1f3fc.png differ
diff --git a/images/emoji/1f385-1f3fd.png b/images/emoji/1f385-1f3fd.png
new file mode 100644
index 000000000..d1d16bceb
Binary files /dev/null and b/images/emoji/1f385-1f3fd.png differ
diff --git a/images/emoji/1f385-1f3fe.png b/images/emoji/1f385-1f3fe.png
new file mode 100644
index 000000000..1088f1c07
Binary files /dev/null and b/images/emoji/1f385-1f3fe.png differ
diff --git a/images/emoji/1f385-1f3ff.png b/images/emoji/1f385-1f3ff.png
new file mode 100644
index 000000000..c92daf749
Binary files /dev/null and b/images/emoji/1f385-1f3ff.png differ
diff --git a/images/emoji/1f385.png b/images/emoji/1f385.png
new file mode 100644
index 000000000..8bf8757a3
Binary files /dev/null and b/images/emoji/1f385.png differ
diff --git a/images/emoji/1f386.png b/images/emoji/1f386.png
new file mode 100644
index 000000000..e0a6c6a7c
Binary files /dev/null and b/images/emoji/1f386.png differ
diff --git a/images/emoji/1f387.png b/images/emoji/1f387.png
new file mode 100644
index 000000000..30339cd6e
Binary files /dev/null and b/images/emoji/1f387.png differ
diff --git a/images/emoji/1f388.png b/images/emoji/1f388.png
new file mode 100644
index 000000000..07916fe6d
Binary files /dev/null and b/images/emoji/1f388.png differ
diff --git a/images/emoji/1f389.png b/images/emoji/1f389.png
new file mode 100644
index 000000000..0244d60f2
Binary files /dev/null and b/images/emoji/1f389.png differ
diff --git a/images/emoji/1f38a.png b/images/emoji/1f38a.png
new file mode 100644
index 000000000..ba4fd9b12
Binary files /dev/null and b/images/emoji/1f38a.png differ
diff --git a/images/emoji/1f38b.png b/images/emoji/1f38b.png
new file mode 100644
index 000000000..46fcb3a1a
Binary files /dev/null and b/images/emoji/1f38b.png differ
diff --git a/images/emoji/1f38c.png b/images/emoji/1f38c.png
new file mode 100644
index 000000000..273bd0f0f
Binary files /dev/null and b/images/emoji/1f38c.png differ
diff --git a/images/emoji/1f38d.png b/images/emoji/1f38d.png
new file mode 100644
index 000000000..769f5ffae
Binary files /dev/null and b/images/emoji/1f38d.png differ
diff --git a/images/emoji/1f38e.png b/images/emoji/1f38e.png
new file mode 100644
index 000000000..109556151
Binary files /dev/null and b/images/emoji/1f38e.png differ
diff --git a/images/emoji/1f38f.png b/images/emoji/1f38f.png
new file mode 100644
index 000000000..5443bab90
Binary files /dev/null and b/images/emoji/1f38f.png differ
diff --git a/images/emoji/1f390.png b/images/emoji/1f390.png
new file mode 100644
index 000000000..3c9ef3a95
Binary files /dev/null and b/images/emoji/1f390.png differ
diff --git a/images/emoji/1f391.png b/images/emoji/1f391.png
new file mode 100644
index 000000000..9bdc9d8d7
Binary files /dev/null and b/images/emoji/1f391.png differ
diff --git a/images/emoji/1f392.png b/images/emoji/1f392.png
new file mode 100644
index 000000000..9997c86e7
Binary files /dev/null and b/images/emoji/1f392.png differ
diff --git a/images/emoji/1f393.png b/images/emoji/1f393.png
new file mode 100644
index 000000000..8b17ddd9d
Binary files /dev/null and b/images/emoji/1f393.png differ
diff --git a/images/emoji/1f396.png b/images/emoji/1f396.png
new file mode 100644
index 000000000..ecd3fb035
Binary files /dev/null and b/images/emoji/1f396.png differ
diff --git a/images/emoji/1f397.png b/images/emoji/1f397.png
new file mode 100644
index 000000000..3988bbd09
Binary files /dev/null and b/images/emoji/1f397.png differ
diff --git a/images/emoji/1f399.png b/images/emoji/1f399.png
new file mode 100644
index 000000000..cd9167654
Binary files /dev/null and b/images/emoji/1f399.png differ
diff --git a/images/emoji/1f39a.png b/images/emoji/1f39a.png
new file mode 100644
index 000000000..720a3b341
Binary files /dev/null and b/images/emoji/1f39a.png differ
diff --git a/images/emoji/1f39b.png b/images/emoji/1f39b.png
new file mode 100644
index 000000000..6635ac93b
Binary files /dev/null and b/images/emoji/1f39b.png differ
diff --git a/images/emoji/1f39e.png b/images/emoji/1f39e.png
new file mode 100644
index 000000000..30143aedb
Binary files /dev/null and b/images/emoji/1f39e.png differ
diff --git a/images/emoji/1f39f.png b/images/emoji/1f39f.png
new file mode 100644
index 000000000..e510f4a7a
Binary files /dev/null and b/images/emoji/1f39f.png differ
diff --git a/images/emoji/1f3a0.png b/images/emoji/1f3a0.png
new file mode 100644
index 000000000..a17074edf
Binary files /dev/null and b/images/emoji/1f3a0.png differ
diff --git a/images/emoji/1f3a1.png b/images/emoji/1f3a1.png
new file mode 100644
index 000000000..55c8ff047
Binary files /dev/null and b/images/emoji/1f3a1.png differ
diff --git a/images/emoji/1f3a2.png b/images/emoji/1f3a2.png
new file mode 100644
index 000000000..7d187be0c
Binary files /dev/null and b/images/emoji/1f3a2.png differ
diff --git a/images/emoji/1f3a3.png b/images/emoji/1f3a3.png
new file mode 100644
index 000000000..dfcdf07eb
Binary files /dev/null and b/images/emoji/1f3a3.png differ
diff --git a/images/emoji/1f3a4.png b/images/emoji/1f3a4.png
new file mode 100644
index 000000000..d4e6b0def
Binary files /dev/null and b/images/emoji/1f3a4.png differ
diff --git a/images/emoji/1f3a5.png b/images/emoji/1f3a5.png
new file mode 100644
index 000000000..4e73b1301
Binary files /dev/null and b/images/emoji/1f3a5.png differ
diff --git a/images/emoji/1f3a6.png b/images/emoji/1f3a6.png
new file mode 100644
index 000000000..65f27b386
Binary files /dev/null and b/images/emoji/1f3a6.png differ
diff --git a/images/emoji/1f3a7.png b/images/emoji/1f3a7.png
new file mode 100644
index 000000000..e9fd34041
Binary files /dev/null and b/images/emoji/1f3a7.png differ
diff --git a/images/emoji/1f3a8.png b/images/emoji/1f3a8.png
new file mode 100644
index 000000000..bd6afe9ff
Binary files /dev/null and b/images/emoji/1f3a8.png differ
diff --git a/images/emoji/1f3a9.png b/images/emoji/1f3a9.png
new file mode 100644
index 000000000..131b657b1
Binary files /dev/null and b/images/emoji/1f3a9.png differ
diff --git a/images/emoji/1f3aa.png b/images/emoji/1f3aa.png
new file mode 100644
index 000000000..b0379775b
Binary files /dev/null and b/images/emoji/1f3aa.png differ
diff --git a/images/emoji/1f3ab.png b/images/emoji/1f3ab.png
new file mode 100644
index 000000000..605936bb6
Binary files /dev/null and b/images/emoji/1f3ab.png differ
diff --git a/images/emoji/1f3ac.png b/images/emoji/1f3ac.png
new file mode 100644
index 000000000..813908831
Binary files /dev/null and b/images/emoji/1f3ac.png differ
diff --git a/images/emoji/1f3ad.png b/images/emoji/1f3ad.png
new file mode 100644
index 000000000..685441fda
Binary files /dev/null and b/images/emoji/1f3ad.png differ
diff --git a/images/emoji/1f3ae.png b/images/emoji/1f3ae.png
new file mode 100644
index 000000000..316a9106a
Binary files /dev/null and b/images/emoji/1f3ae.png differ
diff --git a/images/emoji/1f3af.png b/images/emoji/1f3af.png
new file mode 100644
index 000000000..f6704aeb8
Binary files /dev/null and b/images/emoji/1f3af.png differ
diff --git a/images/emoji/1f3b0.png b/images/emoji/1f3b0.png
new file mode 100644
index 000000000..ee71b6c26
Binary files /dev/null and b/images/emoji/1f3b0.png differ
diff --git a/images/emoji/1f3b1.png b/images/emoji/1f3b1.png
new file mode 100644
index 000000000..38ca662ed
Binary files /dev/null and b/images/emoji/1f3b1.png differ
diff --git a/images/emoji/1f3b2.png b/images/emoji/1f3b2.png
new file mode 100644
index 000000000..ad3626fe5
Binary files /dev/null and b/images/emoji/1f3b2.png differ
diff --git a/images/emoji/1f3b3.png b/images/emoji/1f3b3.png
new file mode 100644
index 000000000..63add89e5
Binary files /dev/null and b/images/emoji/1f3b3.png differ
diff --git a/images/emoji/1f3b4.png b/images/emoji/1f3b4.png
new file mode 100644
index 000000000..6766b044d
Binary files /dev/null and b/images/emoji/1f3b4.png differ
diff --git a/images/emoji/1f3b5.png b/images/emoji/1f3b5.png
new file mode 100644
index 000000000..06691ef61
Binary files /dev/null and b/images/emoji/1f3b5.png differ
diff --git a/images/emoji/1f3b6.png b/images/emoji/1f3b6.png
new file mode 100644
index 000000000..57d499aa1
Binary files /dev/null and b/images/emoji/1f3b6.png differ
diff --git a/images/emoji/1f3b7.png b/images/emoji/1f3b7.png
new file mode 100644
index 000000000..a392faec2
Binary files /dev/null and b/images/emoji/1f3b7.png differ
diff --git a/images/emoji/1f3b8.png b/images/emoji/1f3b8.png
new file mode 100644
index 000000000..43d752f1e
Binary files /dev/null and b/images/emoji/1f3b8.png differ
diff --git a/images/emoji/1f3b9.png b/images/emoji/1f3b9.png
new file mode 100644
index 000000000..442b74568
Binary files /dev/null and b/images/emoji/1f3b9.png differ
diff --git a/images/emoji/1f3ba.png b/images/emoji/1f3ba.png
new file mode 100644
index 000000000..87674cf78
Binary files /dev/null and b/images/emoji/1f3ba.png differ
diff --git a/images/emoji/1f3bb.png b/images/emoji/1f3bb.png
new file mode 100644
index 000000000..e1e76cce2
Binary files /dev/null and b/images/emoji/1f3bb.png differ
diff --git a/images/emoji/1f3bc.png b/images/emoji/1f3bc.png
new file mode 100644
index 000000000..47dc05a8e
Binary files /dev/null and b/images/emoji/1f3bc.png differ
diff --git a/images/emoji/1f3bd.png b/images/emoji/1f3bd.png
new file mode 100644
index 000000000..6d83c06b8
Binary files /dev/null and b/images/emoji/1f3bd.png differ
diff --git a/images/emoji/1f3be.png b/images/emoji/1f3be.png
new file mode 100644
index 000000000..7e68ba8f3
Binary files /dev/null and b/images/emoji/1f3be.png differ
diff --git a/images/emoji/1f3bf.png b/images/emoji/1f3bf.png
new file mode 100644
index 000000000..4a2d2c123
Binary files /dev/null and b/images/emoji/1f3bf.png differ
diff --git a/images/emoji/1f3c0.png b/images/emoji/1f3c0.png
new file mode 100644
index 000000000..64c76b79c
Binary files /dev/null and b/images/emoji/1f3c0.png differ
diff --git a/images/emoji/1f3c1.png b/images/emoji/1f3c1.png
new file mode 100644
index 000000000..5a71eecb8
Binary files /dev/null and b/images/emoji/1f3c1.png differ
diff --git a/images/emoji/1f3c2.png b/images/emoji/1f3c2.png
new file mode 100644
index 000000000..6361c0f2c
Binary files /dev/null and b/images/emoji/1f3c2.png differ
diff --git a/images/emoji/1f3c3-1f3fb.png b/images/emoji/1f3c3-1f3fb.png
new file mode 100644
index 000000000..9355239a5
Binary files /dev/null and b/images/emoji/1f3c3-1f3fb.png differ
diff --git a/images/emoji/1f3c3-1f3fc.png b/images/emoji/1f3c3-1f3fc.png
new file mode 100644
index 000000000..6112fd5c3
Binary files /dev/null and b/images/emoji/1f3c3-1f3fc.png differ
diff --git a/images/emoji/1f3c3-1f3fd.png b/images/emoji/1f3c3-1f3fd.png
new file mode 100644
index 000000000..625ec708f
Binary files /dev/null and b/images/emoji/1f3c3-1f3fd.png differ
diff --git a/images/emoji/1f3c3-1f3fe.png b/images/emoji/1f3c3-1f3fe.png
new file mode 100644
index 000000000..242f1b563
Binary files /dev/null and b/images/emoji/1f3c3-1f3fe.png differ
diff --git a/images/emoji/1f3c3-1f3ff.png b/images/emoji/1f3c3-1f3ff.png
new file mode 100644
index 000000000..2976c6f01
Binary files /dev/null and b/images/emoji/1f3c3-1f3ff.png differ
diff --git a/images/emoji/1f3c3.png b/images/emoji/1f3c3.png
new file mode 100644
index 000000000..e91491597
Binary files /dev/null and b/images/emoji/1f3c3.png differ
diff --git a/images/emoji/1f3c4-1f3fb.png b/images/emoji/1f3c4-1f3fb.png
new file mode 100644
index 000000000..b5faaa524
Binary files /dev/null and b/images/emoji/1f3c4-1f3fb.png differ
diff --git a/images/emoji/1f3c4-1f3fc.png b/images/emoji/1f3c4-1f3fc.png
new file mode 100644
index 000000000..6d92e412f
Binary files /dev/null and b/images/emoji/1f3c4-1f3fc.png differ
diff --git a/images/emoji/1f3c4-1f3fd.png b/images/emoji/1f3c4-1f3fd.png
new file mode 100644
index 000000000..f05ef5949
Binary files /dev/null and b/images/emoji/1f3c4-1f3fd.png differ
diff --git a/images/emoji/1f3c4-1f3fe.png b/images/emoji/1f3c4-1f3fe.png
new file mode 100644
index 000000000..35e143d19
Binary files /dev/null and b/images/emoji/1f3c4-1f3fe.png differ
diff --git a/images/emoji/1f3c4-1f3ff.png b/images/emoji/1f3c4-1f3ff.png
new file mode 100644
index 000000000..38917658e
Binary files /dev/null and b/images/emoji/1f3c4-1f3ff.png differ
diff --git a/images/emoji/1f3c4.png b/images/emoji/1f3c4.png
new file mode 100644
index 000000000..3ab017adf
Binary files /dev/null and b/images/emoji/1f3c4.png differ
diff --git a/images/emoji/1f3c5.png b/images/emoji/1f3c5.png
new file mode 100644
index 000000000..09718d001
Binary files /dev/null and b/images/emoji/1f3c5.png differ
diff --git a/images/emoji/1f3c6.png b/images/emoji/1f3c6.png
new file mode 100644
index 000000000..ac2895c18
Binary files /dev/null and b/images/emoji/1f3c6.png differ
diff --git a/images/emoji/1f3c7-1f3fb.png b/images/emoji/1f3c7-1f3fb.png
new file mode 100644
index 000000000..e9bf4092e
Binary files /dev/null and b/images/emoji/1f3c7-1f3fb.png differ
diff --git a/images/emoji/1f3c7-1f3fc.png b/images/emoji/1f3c7-1f3fc.png
new file mode 100644
index 000000000..031bbc3d8
Binary files /dev/null and b/images/emoji/1f3c7-1f3fc.png differ
diff --git a/images/emoji/1f3c7-1f3fd.png b/images/emoji/1f3c7-1f3fd.png
new file mode 100644
index 000000000..b40ef891f
Binary files /dev/null and b/images/emoji/1f3c7-1f3fd.png differ
diff --git a/images/emoji/1f3c7-1f3fe.png b/images/emoji/1f3c7-1f3fe.png
new file mode 100644
index 000000000..e286cb850
Binary files /dev/null and b/images/emoji/1f3c7-1f3fe.png differ
diff --git a/images/emoji/1f3c7-1f3ff.png b/images/emoji/1f3c7-1f3ff.png
new file mode 100644
index 000000000..453c51c60
Binary files /dev/null and b/images/emoji/1f3c7-1f3ff.png differ
diff --git a/images/emoji/1f3c7.png b/images/emoji/1f3c7.png
new file mode 100644
index 000000000..addf9edac
Binary files /dev/null and b/images/emoji/1f3c7.png differ
diff --git a/images/emoji/1f3c8.png b/images/emoji/1f3c8.png
new file mode 100644
index 000000000..909ddf95d
Binary files /dev/null and b/images/emoji/1f3c8.png differ
diff --git a/images/emoji/1f3c9.png b/images/emoji/1f3c9.png
new file mode 100644
index 000000000..659e134f7
Binary files /dev/null and b/images/emoji/1f3c9.png differ
diff --git a/images/emoji/1f3ca-1f3fb.png b/images/emoji/1f3ca-1f3fb.png
new file mode 100644
index 000000000..38441c9ca
Binary files /dev/null and b/images/emoji/1f3ca-1f3fb.png differ
diff --git a/images/emoji/1f3ca-1f3fc.png b/images/emoji/1f3ca-1f3fc.png
new file mode 100644
index 000000000..b0d431124
Binary files /dev/null and b/images/emoji/1f3ca-1f3fc.png differ
diff --git a/images/emoji/1f3ca-1f3fd.png b/images/emoji/1f3ca-1f3fd.png
new file mode 100644
index 000000000..211e77e2a
Binary files /dev/null and b/images/emoji/1f3ca-1f3fd.png differ
diff --git a/images/emoji/1f3ca-1f3fe.png b/images/emoji/1f3ca-1f3fe.png
new file mode 100644
index 000000000..f34c34db9
Binary files /dev/null and b/images/emoji/1f3ca-1f3fe.png differ
diff --git a/images/emoji/1f3ca-1f3ff.png b/images/emoji/1f3ca-1f3ff.png
new file mode 100644
index 000000000..3e9231ff8
Binary files /dev/null and b/images/emoji/1f3ca-1f3ff.png differ
diff --git a/images/emoji/1f3ca.png b/images/emoji/1f3ca.png
new file mode 100644
index 000000000..55b4d72f9
Binary files /dev/null and b/images/emoji/1f3ca.png differ
diff --git a/images/emoji/1f3cb-1f3fb.png b/images/emoji/1f3cb-1f3fb.png
new file mode 100644
index 000000000..febaad123
Binary files /dev/null and b/images/emoji/1f3cb-1f3fb.png differ
diff --git a/images/emoji/1f3cb-1f3fc.png b/images/emoji/1f3cb-1f3fc.png
new file mode 100644
index 000000000..27ae794a1
Binary files /dev/null and b/images/emoji/1f3cb-1f3fc.png differ
diff --git a/images/emoji/1f3cb-1f3fd.png b/images/emoji/1f3cb-1f3fd.png
new file mode 100644
index 000000000..45c4c22c7
Binary files /dev/null and b/images/emoji/1f3cb-1f3fd.png differ
diff --git a/images/emoji/1f3cb-1f3fe.png b/images/emoji/1f3cb-1f3fe.png
new file mode 100644
index 000000000..67dd21d24
Binary files /dev/null and b/images/emoji/1f3cb-1f3fe.png differ
diff --git a/images/emoji/1f3cb-1f3ff.png b/images/emoji/1f3cb-1f3ff.png
new file mode 100644
index 000000000..fa0152038
Binary files /dev/null and b/images/emoji/1f3cb-1f3ff.png differ
diff --git a/images/emoji/1f3cb.png b/images/emoji/1f3cb.png
new file mode 100644
index 000000000..afdeaa476
Binary files /dev/null and b/images/emoji/1f3cb.png differ
diff --git a/images/emoji/1f3cc.png b/images/emoji/1f3cc.png
new file mode 100644
index 000000000..39c552de8
Binary files /dev/null and b/images/emoji/1f3cc.png differ
diff --git a/images/emoji/1f3cd.png b/images/emoji/1f3cd.png
new file mode 100644
index 000000000..3d1d567e8
Binary files /dev/null and b/images/emoji/1f3cd.png differ
diff --git a/images/emoji/1f3ce.png b/images/emoji/1f3ce.png
new file mode 100644
index 000000000..fe3f045f4
Binary files /dev/null and b/images/emoji/1f3ce.png differ
diff --git a/images/emoji/1f3cf.png b/images/emoji/1f3cf.png
new file mode 100644
index 000000000..d602294a2
Binary files /dev/null and b/images/emoji/1f3cf.png differ
diff --git a/images/emoji/1f3d0.png b/images/emoji/1f3d0.png
new file mode 100644
index 000000000..ce89e6d74
Binary files /dev/null and b/images/emoji/1f3d0.png differ
diff --git a/images/emoji/1f3d1.png b/images/emoji/1f3d1.png
new file mode 100644
index 000000000..839637716
Binary files /dev/null and b/images/emoji/1f3d1.png differ
diff --git a/images/emoji/1f3d2.png b/images/emoji/1f3d2.png
new file mode 100644
index 000000000..be94e9cbf
Binary files /dev/null and b/images/emoji/1f3d2.png differ
diff --git a/images/emoji/1f3d3.png b/images/emoji/1f3d3.png
new file mode 100644
index 000000000..ff3c51727
Binary files /dev/null and b/images/emoji/1f3d3.png differ
diff --git a/images/emoji/1f3d4.png b/images/emoji/1f3d4.png
new file mode 100644
index 000000000..f63a205dc
Binary files /dev/null and b/images/emoji/1f3d4.png differ
diff --git a/images/emoji/1f3d5.png b/images/emoji/1f3d5.png
new file mode 100644
index 000000000..7da5a756e
Binary files /dev/null and b/images/emoji/1f3d5.png differ
diff --git a/images/emoji/1f3d6.png b/images/emoji/1f3d6.png
new file mode 100644
index 000000000..69108c8ea
Binary files /dev/null and b/images/emoji/1f3d6.png differ
diff --git a/images/emoji/1f3d7.png b/images/emoji/1f3d7.png
new file mode 100644
index 000000000..8206a20f6
Binary files /dev/null and b/images/emoji/1f3d7.png differ
diff --git a/images/emoji/1f3d8.png b/images/emoji/1f3d8.png
new file mode 100644
index 000000000..6ab4a2a26
Binary files /dev/null and b/images/emoji/1f3d8.png differ
diff --git a/images/emoji/1f3d9.png b/images/emoji/1f3d9.png
new file mode 100644
index 000000000..d7b9844a0
Binary files /dev/null and b/images/emoji/1f3d9.png differ
diff --git a/images/emoji/1f3da.png b/images/emoji/1f3da.png
new file mode 100644
index 000000000..c55e81de9
Binary files /dev/null and b/images/emoji/1f3da.png differ
diff --git a/images/emoji/1f3db.png b/images/emoji/1f3db.png
new file mode 100644
index 000000000..de7b559da
Binary files /dev/null and b/images/emoji/1f3db.png differ
diff --git a/images/emoji/1f3dc.png b/images/emoji/1f3dc.png
new file mode 100644
index 000000000..e9966ff8c
Binary files /dev/null and b/images/emoji/1f3dc.png differ
diff --git a/images/emoji/1f3dd.png b/images/emoji/1f3dd.png
new file mode 100644
index 000000000..7fd834389
Binary files /dev/null and b/images/emoji/1f3dd.png differ
diff --git a/images/emoji/1f3de.png b/images/emoji/1f3de.png
new file mode 100644
index 000000000..63ec70163
Binary files /dev/null and b/images/emoji/1f3de.png differ
diff --git a/images/emoji/1f3df.png b/images/emoji/1f3df.png
new file mode 100644
index 000000000..1fee9a34b
Binary files /dev/null and b/images/emoji/1f3df.png differ
diff --git a/images/emoji/1f3e0.png b/images/emoji/1f3e0.png
new file mode 100644
index 000000000..01c98a0ba
Binary files /dev/null and b/images/emoji/1f3e0.png differ
diff --git a/images/emoji/1f3e1.png b/images/emoji/1f3e1.png
new file mode 100644
index 000000000..1a276d153
Binary files /dev/null and b/images/emoji/1f3e1.png differ
diff --git a/images/emoji/1f3e2.png b/images/emoji/1f3e2.png
new file mode 100644
index 000000000..7eee927d1
Binary files /dev/null and b/images/emoji/1f3e2.png differ
diff --git a/images/emoji/1f3e3.png b/images/emoji/1f3e3.png
new file mode 100644
index 000000000..a23848f9a
Binary files /dev/null and b/images/emoji/1f3e3.png differ
diff --git a/images/emoji/1f3e4.png b/images/emoji/1f3e4.png
new file mode 100644
index 000000000..3745aff8d
Binary files /dev/null and b/images/emoji/1f3e4.png differ
diff --git a/images/emoji/1f3e5.png b/images/emoji/1f3e5.png
new file mode 100644
index 000000000..1cbce4ae7
Binary files /dev/null and b/images/emoji/1f3e5.png differ
diff --git a/images/emoji/1f3e6.png b/images/emoji/1f3e6.png
new file mode 100644
index 000000000..dffdcef36
Binary files /dev/null and b/images/emoji/1f3e6.png differ
diff --git a/images/emoji/1f3e7.png b/images/emoji/1f3e7.png
new file mode 100644
index 000000000..4d935307b
Binary files /dev/null and b/images/emoji/1f3e7.png differ
diff --git a/images/emoji/1f3e8.png b/images/emoji/1f3e8.png
new file mode 100644
index 000000000..ea8f4c497
Binary files /dev/null and b/images/emoji/1f3e8.png differ
diff --git a/images/emoji/1f3e9.png b/images/emoji/1f3e9.png
new file mode 100644
index 000000000..5e136be6f
Binary files /dev/null and b/images/emoji/1f3e9.png differ
diff --git a/images/emoji/1f3ea.png b/images/emoji/1f3ea.png
new file mode 100644
index 000000000..26b53b566
Binary files /dev/null and b/images/emoji/1f3ea.png differ
diff --git a/images/emoji/1f3eb.png b/images/emoji/1f3eb.png
new file mode 100644
index 000000000..269759534
Binary files /dev/null and b/images/emoji/1f3eb.png differ
diff --git a/images/emoji/1f3ec.png b/images/emoji/1f3ec.png
new file mode 100644
index 000000000..58867c7a6
Binary files /dev/null and b/images/emoji/1f3ec.png differ
diff --git a/images/emoji/1f3ed.png b/images/emoji/1f3ed.png
new file mode 100644
index 000000000..e1d2ddf4a
Binary files /dev/null and b/images/emoji/1f3ed.png differ
diff --git a/images/emoji/1f3ee.png b/images/emoji/1f3ee.png
new file mode 100644
index 000000000..97cf5dbe1
Binary files /dev/null and b/images/emoji/1f3ee.png differ
diff --git a/images/emoji/1f3ef.png b/images/emoji/1f3ef.png
new file mode 100644
index 000000000..64b4e33a1
Binary files /dev/null and b/images/emoji/1f3ef.png differ
diff --git a/images/emoji/1f3f0.png b/images/emoji/1f3f0.png
new file mode 100644
index 000000000..888d11332
Binary files /dev/null and b/images/emoji/1f3f0.png differ
diff --git a/images/emoji/1f3f3.png b/images/emoji/1f3f3.png
new file mode 100644
index 000000000..86d6e96d5
Binary files /dev/null and b/images/emoji/1f3f3.png differ
diff --git a/images/emoji/1f3f4.png b/images/emoji/1f3f4.png
new file mode 100644
index 000000000..0e28d05d5
Binary files /dev/null and b/images/emoji/1f3f4.png differ
diff --git a/images/emoji/1f3f5.png b/images/emoji/1f3f5.png
new file mode 100644
index 000000000..8030e494b
Binary files /dev/null and b/images/emoji/1f3f5.png differ
diff --git a/images/emoji/1f3f7.png b/images/emoji/1f3f7.png
new file mode 100644
index 000000000..d41c9b4f1
Binary files /dev/null and b/images/emoji/1f3f7.png differ
diff --git a/images/emoji/1f3f8.png b/images/emoji/1f3f8.png
new file mode 100644
index 000000000..e0af4d99b
Binary files /dev/null and b/images/emoji/1f3f8.png differ
diff --git a/images/emoji/1f3f9.png b/images/emoji/1f3f9.png
new file mode 100644
index 000000000..6a538bf47
Binary files /dev/null and b/images/emoji/1f3f9.png differ
diff --git a/images/emoji/1f3fa.png b/images/emoji/1f3fa.png
new file mode 100644
index 000000000..96de50560
Binary files /dev/null and b/images/emoji/1f3fa.png differ
diff --git a/images/emoji/1f400.png b/images/emoji/1f400.png
new file mode 100644
index 000000000..86219144f
Binary files /dev/null and b/images/emoji/1f400.png differ
diff --git a/images/emoji/1f401.png b/images/emoji/1f401.png
new file mode 100644
index 000000000..20fb041f0
Binary files /dev/null and b/images/emoji/1f401.png differ
diff --git a/images/emoji/1f402.png b/images/emoji/1f402.png
new file mode 100644
index 000000000..badf5708f
Binary files /dev/null and b/images/emoji/1f402.png differ
diff --git a/images/emoji/1f403.png b/images/emoji/1f403.png
new file mode 100644
index 000000000..80446615c
Binary files /dev/null and b/images/emoji/1f403.png differ
diff --git a/images/emoji/1f404.png b/images/emoji/1f404.png
new file mode 100644
index 000000000..4d0ca534f
Binary files /dev/null and b/images/emoji/1f404.png differ
diff --git a/images/emoji/1f405.png b/images/emoji/1f405.png
new file mode 100644
index 000000000..871a8b74d
Binary files /dev/null and b/images/emoji/1f405.png differ
diff --git a/images/emoji/1f406.png b/images/emoji/1f406.png
new file mode 100644
index 000000000..8aac3d494
Binary files /dev/null and b/images/emoji/1f406.png differ
diff --git a/images/emoji/1f407.png b/images/emoji/1f407.png
new file mode 100644
index 000000000..2c8a29c64
Binary files /dev/null and b/images/emoji/1f407.png differ
diff --git a/images/emoji/1f408.png b/images/emoji/1f408.png
new file mode 100644
index 000000000..46abe8cbc
Binary files /dev/null and b/images/emoji/1f408.png differ
diff --git a/images/emoji/1f409.png b/images/emoji/1f409.png
new file mode 100644
index 000000000..e298d2f6c
Binary files /dev/null and b/images/emoji/1f409.png differ
diff --git a/images/emoji/1f40a.png b/images/emoji/1f40a.png
new file mode 100644
index 000000000..3005c46f1
Binary files /dev/null and b/images/emoji/1f40a.png differ
diff --git a/images/emoji/1f40b.png b/images/emoji/1f40b.png
new file mode 100644
index 000000000..0df9d3c73
Binary files /dev/null and b/images/emoji/1f40b.png differ
diff --git a/images/emoji/1f40c.png b/images/emoji/1f40c.png
new file mode 100644
index 000000000..f4ea071e2
Binary files /dev/null and b/images/emoji/1f40c.png differ
diff --git a/images/emoji/1f40d.png b/images/emoji/1f40d.png
new file mode 100644
index 000000000..f041d3b2e
Binary files /dev/null and b/images/emoji/1f40d.png differ
diff --git a/images/emoji/1f40e.png b/images/emoji/1f40e.png
new file mode 100644
index 000000000..0b4d8903c
Binary files /dev/null and b/images/emoji/1f40e.png differ
diff --git a/images/emoji/1f40f.png b/images/emoji/1f40f.png
new file mode 100644
index 000000000..52a44464c
Binary files /dev/null and b/images/emoji/1f40f.png differ
diff --git a/images/emoji/1f410.png b/images/emoji/1f410.png
new file mode 100644
index 000000000..f9d9e38a1
Binary files /dev/null and b/images/emoji/1f410.png differ
diff --git a/images/emoji/1f411.png b/images/emoji/1f411.png
new file mode 100644
index 000000000..eea1f2f8d
Binary files /dev/null and b/images/emoji/1f411.png differ
diff --git a/images/emoji/1f412.png b/images/emoji/1f412.png
new file mode 100644
index 000000000..65042c09f
Binary files /dev/null and b/images/emoji/1f412.png differ
diff --git a/images/emoji/1f413.png b/images/emoji/1f413.png
new file mode 100644
index 000000000..bbf2bbff9
Binary files /dev/null and b/images/emoji/1f413.png differ
diff --git a/images/emoji/1f414.png b/images/emoji/1f414.png
new file mode 100644
index 000000000..9a6992e55
Binary files /dev/null and b/images/emoji/1f414.png differ
diff --git a/images/emoji/1f415.png b/images/emoji/1f415.png
new file mode 100644
index 000000000..976143dbd
Binary files /dev/null and b/images/emoji/1f415.png differ
diff --git a/images/emoji/1f416.png b/images/emoji/1f416.png
new file mode 100644
index 000000000..5f31c1a2d
Binary files /dev/null and b/images/emoji/1f416.png differ
diff --git a/images/emoji/1f417.png b/images/emoji/1f417.png
new file mode 100644
index 000000000..3073bf026
Binary files /dev/null and b/images/emoji/1f417.png differ
diff --git a/images/emoji/1f418.png b/images/emoji/1f418.png
new file mode 100644
index 000000000..b8a6d1405
Binary files /dev/null and b/images/emoji/1f418.png differ
diff --git a/images/emoji/1f419.png b/images/emoji/1f419.png
new file mode 100644
index 000000000..72c84074a
Binary files /dev/null and b/images/emoji/1f419.png differ
diff --git a/images/emoji/1f41a.png b/images/emoji/1f41a.png
new file mode 100644
index 000000000..55721629f
Binary files /dev/null and b/images/emoji/1f41a.png differ
diff --git a/images/emoji/1f41b.png b/images/emoji/1f41b.png
new file mode 100644
index 000000000..c9a00cf3e
Binary files /dev/null and b/images/emoji/1f41b.png differ
diff --git a/images/emoji/1f41c.png b/images/emoji/1f41c.png
new file mode 100644
index 000000000..994127ed6
Binary files /dev/null and b/images/emoji/1f41c.png differ
diff --git a/images/emoji/1f41d.png b/images/emoji/1f41d.png
new file mode 100644
index 000000000..6bf6f67e1
Binary files /dev/null and b/images/emoji/1f41d.png differ
diff --git a/images/emoji/1f41e.png b/images/emoji/1f41e.png
new file mode 100644
index 000000000..3d93174d7
Binary files /dev/null and b/images/emoji/1f41e.png differ
diff --git a/images/emoji/1f41f.png b/images/emoji/1f41f.png
new file mode 100644
index 000000000..c2d2faaac
Binary files /dev/null and b/images/emoji/1f41f.png differ
diff --git a/images/emoji/1f420.png b/images/emoji/1f420.png
new file mode 100644
index 000000000..252105235
Binary files /dev/null and b/images/emoji/1f420.png differ
diff --git a/images/emoji/1f421.png b/images/emoji/1f421.png
new file mode 100644
index 000000000..2939344a5
Binary files /dev/null and b/images/emoji/1f421.png differ
diff --git a/images/emoji/1f422.png b/images/emoji/1f422.png
new file mode 100644
index 000000000..46f59337b
Binary files /dev/null and b/images/emoji/1f422.png differ
diff --git a/images/emoji/1f423.png b/images/emoji/1f423.png
new file mode 100644
index 000000000..56515ad34
Binary files /dev/null and b/images/emoji/1f423.png differ
diff --git a/images/emoji/1f424.png b/images/emoji/1f424.png
new file mode 100644
index 000000000..dccd96576
Binary files /dev/null and b/images/emoji/1f424.png differ
diff --git a/images/emoji/1f425.png b/images/emoji/1f425.png
new file mode 100644
index 000000000..31dfb511e
Binary files /dev/null and b/images/emoji/1f425.png differ
diff --git a/images/emoji/1f426.png b/images/emoji/1f426.png
new file mode 100644
index 000000000..e201c22be
Binary files /dev/null and b/images/emoji/1f426.png differ
diff --git a/images/emoji/1f427.png b/images/emoji/1f427.png
new file mode 100644
index 000000000..c0064fb97
Binary files /dev/null and b/images/emoji/1f427.png differ
diff --git a/images/emoji/1f428.png b/images/emoji/1f428.png
new file mode 100644
index 000000000..c846cd223
Binary files /dev/null and b/images/emoji/1f428.png differ
diff --git a/images/emoji/1f429.png b/images/emoji/1f429.png
new file mode 100644
index 000000000..8ec39e396
Binary files /dev/null and b/images/emoji/1f429.png differ
diff --git a/images/emoji/1f42a.png b/images/emoji/1f42a.png
new file mode 100644
index 000000000..5271637c7
Binary files /dev/null and b/images/emoji/1f42a.png differ
diff --git a/images/emoji/1f42b.png b/images/emoji/1f42b.png
new file mode 100644
index 000000000..b421d07a8
Binary files /dev/null and b/images/emoji/1f42b.png differ
diff --git a/images/emoji/1f42c.png b/images/emoji/1f42c.png
new file mode 100644
index 000000000..c2a914f59
Binary files /dev/null and b/images/emoji/1f42c.png differ
diff --git a/images/emoji/1f42d.png b/images/emoji/1f42d.png
new file mode 100644
index 000000000..a52c8414f
Binary files /dev/null and b/images/emoji/1f42d.png differ
diff --git a/images/emoji/1f42e.png b/images/emoji/1f42e.png
new file mode 100644
index 000000000..602495bd9
Binary files /dev/null and b/images/emoji/1f42e.png differ
diff --git a/images/emoji/1f42f.png b/images/emoji/1f42f.png
new file mode 100644
index 000000000..a4d3ef086
Binary files /dev/null and b/images/emoji/1f42f.png differ
diff --git a/images/emoji/1f430.png b/images/emoji/1f430.png
new file mode 100644
index 000000000..20c67d11b
Binary files /dev/null and b/images/emoji/1f430.png differ
diff --git a/images/emoji/1f431.png b/images/emoji/1f431.png
new file mode 100644
index 000000000..10e20b530
Binary files /dev/null and b/images/emoji/1f431.png differ
diff --git a/images/emoji/1f432.png b/images/emoji/1f432.png
new file mode 100644
index 000000000..3c2720446
Binary files /dev/null and b/images/emoji/1f432.png differ
diff --git a/images/emoji/1f433.png b/images/emoji/1f433.png
new file mode 100644
index 000000000..c2f52b443
Binary files /dev/null and b/images/emoji/1f433.png differ
diff --git a/images/emoji/1f434.png b/images/emoji/1f434.png
new file mode 100644
index 000000000..f4f45047c
Binary files /dev/null and b/images/emoji/1f434.png differ
diff --git a/images/emoji/1f435.png b/images/emoji/1f435.png
new file mode 100644
index 000000000..fe49a5467
Binary files /dev/null and b/images/emoji/1f435.png differ
diff --git a/images/emoji/1f436.png b/images/emoji/1f436.png
new file mode 100644
index 000000000..4a5b7b859
Binary files /dev/null and b/images/emoji/1f436.png differ
diff --git a/images/emoji/1f437.png b/images/emoji/1f437.png
new file mode 100644
index 000000000..afe05ca16
Binary files /dev/null and b/images/emoji/1f437.png differ
diff --git a/images/emoji/1f438.png b/images/emoji/1f438.png
new file mode 100644
index 000000000..8825d1ad5
Binary files /dev/null and b/images/emoji/1f438.png differ
diff --git a/images/emoji/1f439.png b/images/emoji/1f439.png
new file mode 100644
index 000000000..376c36b0a
Binary files /dev/null and b/images/emoji/1f439.png differ
diff --git a/images/emoji/1f43a.png b/images/emoji/1f43a.png
new file mode 100644
index 000000000..ba7220f2d
Binary files /dev/null and b/images/emoji/1f43a.png differ
diff --git a/images/emoji/1f43b.png b/images/emoji/1f43b.png
new file mode 100644
index 000000000..272d56bbb
Binary files /dev/null and b/images/emoji/1f43b.png differ
diff --git a/images/emoji/1f43c.png b/images/emoji/1f43c.png
new file mode 100644
index 000000000..978382775
Binary files /dev/null and b/images/emoji/1f43c.png differ
diff --git a/images/emoji/1f43d.png b/images/emoji/1f43d.png
new file mode 100644
index 000000000..3610ae4a9
Binary files /dev/null and b/images/emoji/1f43d.png differ
diff --git a/images/emoji/1f43e.png b/images/emoji/1f43e.png
new file mode 100644
index 000000000..5fe568cee
Binary files /dev/null and b/images/emoji/1f43e.png differ
diff --git a/images/emoji/1f43f.png b/images/emoji/1f43f.png
new file mode 100644
index 000000000..a9ab60f51
Binary files /dev/null and b/images/emoji/1f43f.png differ
diff --git a/images/emoji/1f440.png b/images/emoji/1f440.png
new file mode 100644
index 000000000..2102ada7e
Binary files /dev/null and b/images/emoji/1f440.png differ
diff --git a/images/emoji/1f441-1f5e8.png b/images/emoji/1f441-1f5e8.png
new file mode 100644
index 000000000..21bd22bbc
Binary files /dev/null and b/images/emoji/1f441-1f5e8.png differ
diff --git a/images/emoji/1f441.png b/images/emoji/1f441.png
new file mode 100644
index 000000000..9d989cdd3
Binary files /dev/null and b/images/emoji/1f441.png differ
diff --git a/images/emoji/1f442-1f3fb.png b/images/emoji/1f442-1f3fb.png
new file mode 100644
index 000000000..d09e1e419
Binary files /dev/null and b/images/emoji/1f442-1f3fb.png differ
diff --git a/images/emoji/1f442-1f3fc.png b/images/emoji/1f442-1f3fc.png
new file mode 100644
index 000000000..300d60a99
Binary files /dev/null and b/images/emoji/1f442-1f3fc.png differ
diff --git a/images/emoji/1f442-1f3fd.png b/images/emoji/1f442-1f3fd.png
new file mode 100644
index 000000000..2a56eebe4
Binary files /dev/null and b/images/emoji/1f442-1f3fd.png differ
diff --git a/images/emoji/1f442-1f3fe.png b/images/emoji/1f442-1f3fe.png
new file mode 100644
index 000000000..bd270f776
Binary files /dev/null and b/images/emoji/1f442-1f3fe.png differ
diff --git a/images/emoji/1f442-1f3ff.png b/images/emoji/1f442-1f3ff.png
new file mode 100644
index 000000000..b96bb441d
Binary files /dev/null and b/images/emoji/1f442-1f3ff.png differ
diff --git a/images/emoji/1f442.png b/images/emoji/1f442.png
new file mode 100644
index 000000000..f84f9ff15
Binary files /dev/null and b/images/emoji/1f442.png differ
diff --git a/images/emoji/1f443-1f3fb.png b/images/emoji/1f443-1f3fb.png
new file mode 100644
index 000000000..8008d1750
Binary files /dev/null and b/images/emoji/1f443-1f3fb.png differ
diff --git a/images/emoji/1f443-1f3fc.png b/images/emoji/1f443-1f3fc.png
new file mode 100644
index 000000000..ac17f26e8
Binary files /dev/null and b/images/emoji/1f443-1f3fc.png differ
diff --git a/images/emoji/1f443-1f3fd.png b/images/emoji/1f443-1f3fd.png
new file mode 100644
index 000000000..d8b6cbe0f
Binary files /dev/null and b/images/emoji/1f443-1f3fd.png differ
diff --git a/images/emoji/1f443-1f3fe.png b/images/emoji/1f443-1f3fe.png
new file mode 100644
index 000000000..004b2631e
Binary files /dev/null and b/images/emoji/1f443-1f3fe.png differ
diff --git a/images/emoji/1f443-1f3ff.png b/images/emoji/1f443-1f3ff.png
new file mode 100644
index 000000000..7b33821f6
Binary files /dev/null and b/images/emoji/1f443-1f3ff.png differ
diff --git a/images/emoji/1f443.png b/images/emoji/1f443.png
new file mode 100644
index 000000000..2f04ac5f9
Binary files /dev/null and b/images/emoji/1f443.png differ
diff --git a/images/emoji/1f444.png b/images/emoji/1f444.png
new file mode 100644
index 000000000..35f3cc200
Binary files /dev/null and b/images/emoji/1f444.png differ
diff --git a/images/emoji/1f445.png b/images/emoji/1f445.png
new file mode 100644
index 000000000..70ce9c122
Binary files /dev/null and b/images/emoji/1f445.png differ
diff --git a/images/emoji/1f446-1f3fb.png b/images/emoji/1f446-1f3fb.png
new file mode 100644
index 000000000..a12a7e784
Binary files /dev/null and b/images/emoji/1f446-1f3fb.png differ
diff --git a/images/emoji/1f446-1f3fc.png b/images/emoji/1f446-1f3fc.png
new file mode 100644
index 000000000..cdff40cea
Binary files /dev/null and b/images/emoji/1f446-1f3fc.png differ
diff --git a/images/emoji/1f446-1f3fd.png b/images/emoji/1f446-1f3fd.png
new file mode 100644
index 000000000..a07ce9e5a
Binary files /dev/null and b/images/emoji/1f446-1f3fd.png differ
diff --git a/images/emoji/1f446-1f3fe.png b/images/emoji/1f446-1f3fe.png
new file mode 100644
index 000000000..4f86c88ba
Binary files /dev/null and b/images/emoji/1f446-1f3fe.png differ
diff --git a/images/emoji/1f446-1f3ff.png b/images/emoji/1f446-1f3ff.png
new file mode 100644
index 000000000..ed1b26c35
Binary files /dev/null and b/images/emoji/1f446-1f3ff.png differ
diff --git a/images/emoji/1f446.png b/images/emoji/1f446.png
new file mode 100644
index 000000000..bc496dfea
Binary files /dev/null and b/images/emoji/1f446.png differ
diff --git a/images/emoji/1f447-1f3fb.png b/images/emoji/1f447-1f3fb.png
new file mode 100644
index 000000000..140f157d8
Binary files /dev/null and b/images/emoji/1f447-1f3fb.png differ
diff --git a/images/emoji/1f447-1f3fc.png b/images/emoji/1f447-1f3fc.png
new file mode 100644
index 000000000..d518544f7
Binary files /dev/null and b/images/emoji/1f447-1f3fc.png differ
diff --git a/images/emoji/1f447-1f3fd.png b/images/emoji/1f447-1f3fd.png
new file mode 100644
index 000000000..018b688b8
Binary files /dev/null and b/images/emoji/1f447-1f3fd.png differ
diff --git a/images/emoji/1f447-1f3fe.png b/images/emoji/1f447-1f3fe.png
new file mode 100644
index 000000000..98845bf6f
Binary files /dev/null and b/images/emoji/1f447-1f3fe.png differ
diff --git a/images/emoji/1f447-1f3ff.png b/images/emoji/1f447-1f3ff.png
new file mode 100644
index 000000000..9a9b039a9
Binary files /dev/null and b/images/emoji/1f447-1f3ff.png differ
diff --git a/images/emoji/1f447.png b/images/emoji/1f447.png
new file mode 100644
index 000000000..00d3d13ab
Binary files /dev/null and b/images/emoji/1f447.png differ
diff --git a/images/emoji/1f448-1f3fb.png b/images/emoji/1f448-1f3fb.png
new file mode 100644
index 000000000..88e2c3060
Binary files /dev/null and b/images/emoji/1f448-1f3fb.png differ
diff --git a/images/emoji/1f448-1f3fc.png b/images/emoji/1f448-1f3fc.png
new file mode 100644
index 000000000..d3c89d87c
Binary files /dev/null and b/images/emoji/1f448-1f3fc.png differ
diff --git a/images/emoji/1f448-1f3fd.png b/images/emoji/1f448-1f3fd.png
new file mode 100644
index 000000000..b23b91673
Binary files /dev/null and b/images/emoji/1f448-1f3fd.png differ
diff --git a/images/emoji/1f448-1f3fe.png b/images/emoji/1f448-1f3fe.png
new file mode 100644
index 000000000..3093f325c
Binary files /dev/null and b/images/emoji/1f448-1f3fe.png differ
diff --git a/images/emoji/1f448-1f3ff.png b/images/emoji/1f448-1f3ff.png
new file mode 100644
index 000000000..2b4cbfa12
Binary files /dev/null and b/images/emoji/1f448-1f3ff.png differ
diff --git a/images/emoji/1f448.png b/images/emoji/1f448.png
new file mode 100644
index 000000000..599fa2e3c
Binary files /dev/null and b/images/emoji/1f448.png differ
diff --git a/images/emoji/1f449-1f3fb.png b/images/emoji/1f449-1f3fb.png
new file mode 100644
index 000000000..4a28c6bbc
Binary files /dev/null and b/images/emoji/1f449-1f3fb.png differ
diff --git a/images/emoji/1f449-1f3fc.png b/images/emoji/1f449-1f3fc.png
new file mode 100644
index 000000000..7cb132317
Binary files /dev/null and b/images/emoji/1f449-1f3fc.png differ
diff --git a/images/emoji/1f449-1f3fd.png b/images/emoji/1f449-1f3fd.png
new file mode 100644
index 000000000..5514807d7
Binary files /dev/null and b/images/emoji/1f449-1f3fd.png differ
diff --git a/images/emoji/1f449-1f3fe.png b/images/emoji/1f449-1f3fe.png
new file mode 100644
index 000000000..b8541d644
Binary files /dev/null and b/images/emoji/1f449-1f3fe.png differ
diff --git a/images/emoji/1f449-1f3ff.png b/images/emoji/1f449-1f3ff.png
new file mode 100644
index 000000000..1b7aab07b
Binary files /dev/null and b/images/emoji/1f449-1f3ff.png differ
diff --git a/images/emoji/1f449.png b/images/emoji/1f449.png
new file mode 100644
index 000000000..93a3cd34a
Binary files /dev/null and b/images/emoji/1f449.png differ
diff --git a/images/emoji/1f44a-1f3fb.png b/images/emoji/1f44a-1f3fb.png
new file mode 100644
index 000000000..93c7d17fb
Binary files /dev/null and b/images/emoji/1f44a-1f3fb.png differ
diff --git a/images/emoji/1f44a-1f3fc.png b/images/emoji/1f44a-1f3fc.png
new file mode 100644
index 000000000..c0a1af6e1
Binary files /dev/null and b/images/emoji/1f44a-1f3fc.png differ
diff --git a/images/emoji/1f44a-1f3fd.png b/images/emoji/1f44a-1f3fd.png
new file mode 100644
index 000000000..1458b0212
Binary files /dev/null and b/images/emoji/1f44a-1f3fd.png differ
diff --git a/images/emoji/1f44a-1f3fe.png b/images/emoji/1f44a-1f3fe.png
new file mode 100644
index 000000000..c1466bfcd
Binary files /dev/null and b/images/emoji/1f44a-1f3fe.png differ
diff --git a/images/emoji/1f44a-1f3ff.png b/images/emoji/1f44a-1f3ff.png
new file mode 100644
index 000000000..00b4ddb89
Binary files /dev/null and b/images/emoji/1f44a-1f3ff.png differ
diff --git a/images/emoji/1f44a.png b/images/emoji/1f44a.png
new file mode 100644
index 000000000..b14ca5f52
Binary files /dev/null and b/images/emoji/1f44a.png differ
diff --git a/images/emoji/1f44b-1f3fb.png b/images/emoji/1f44b-1f3fb.png
new file mode 100644
index 000000000..beea09dda
Binary files /dev/null and b/images/emoji/1f44b-1f3fb.png differ
diff --git a/images/emoji/1f44b-1f3fc.png b/images/emoji/1f44b-1f3fc.png
new file mode 100644
index 000000000..a7679d5fe
Binary files /dev/null and b/images/emoji/1f44b-1f3fc.png differ
diff --git a/images/emoji/1f44b-1f3fd.png b/images/emoji/1f44b-1f3fd.png
new file mode 100644
index 000000000..6283b670f
Binary files /dev/null and b/images/emoji/1f44b-1f3fd.png differ
diff --git a/images/emoji/1f44b-1f3fe.png b/images/emoji/1f44b-1f3fe.png
new file mode 100644
index 000000000..b771b52c3
Binary files /dev/null and b/images/emoji/1f44b-1f3fe.png differ
diff --git a/images/emoji/1f44b-1f3ff.png b/images/emoji/1f44b-1f3ff.png
new file mode 100644
index 000000000..6bbedc9b5
Binary files /dev/null and b/images/emoji/1f44b-1f3ff.png differ
diff --git a/images/emoji/1f44b.png b/images/emoji/1f44b.png
new file mode 100644
index 000000000..02ae68b85
Binary files /dev/null and b/images/emoji/1f44b.png differ
diff --git a/images/emoji/1f44c-1f3fb.png b/images/emoji/1f44c-1f3fb.png
new file mode 100644
index 000000000..cecf7b2ab
Binary files /dev/null and b/images/emoji/1f44c-1f3fb.png differ
diff --git a/images/emoji/1f44c-1f3fc.png b/images/emoji/1f44c-1f3fc.png
new file mode 100644
index 000000000..c19239bcd
Binary files /dev/null and b/images/emoji/1f44c-1f3fc.png differ
diff --git a/images/emoji/1f44c-1f3fd.png b/images/emoji/1f44c-1f3fd.png
new file mode 100644
index 000000000..94b65b03e
Binary files /dev/null and b/images/emoji/1f44c-1f3fd.png differ
diff --git a/images/emoji/1f44c-1f3fe.png b/images/emoji/1f44c-1f3fe.png
new file mode 100644
index 000000000..03d26f08e
Binary files /dev/null and b/images/emoji/1f44c-1f3fe.png differ
diff --git a/images/emoji/1f44c-1f3ff.png b/images/emoji/1f44c-1f3ff.png
new file mode 100644
index 000000000..d4b240863
Binary files /dev/null and b/images/emoji/1f44c-1f3ff.png differ
diff --git a/images/emoji/1f44c.png b/images/emoji/1f44c.png
new file mode 100644
index 000000000..028d69b0d
Binary files /dev/null and b/images/emoji/1f44c.png differ
diff --git a/images/emoji/1f44d-1f3fb.png b/images/emoji/1f44d-1f3fb.png
new file mode 100644
index 000000000..39684cd5c
Binary files /dev/null and b/images/emoji/1f44d-1f3fb.png differ
diff --git a/images/emoji/1f44d-1f3fc.png b/images/emoji/1f44d-1f3fc.png
new file mode 100644
index 000000000..a9b597235
Binary files /dev/null and b/images/emoji/1f44d-1f3fc.png differ
diff --git a/images/emoji/1f44d-1f3fd.png b/images/emoji/1f44d-1f3fd.png
new file mode 100644
index 000000000..c5e291670
Binary files /dev/null and b/images/emoji/1f44d-1f3fd.png differ
diff --git a/images/emoji/1f44d-1f3fe.png b/images/emoji/1f44d-1f3fe.png
new file mode 100644
index 000000000..5bf4857a8
Binary files /dev/null and b/images/emoji/1f44d-1f3fe.png differ
diff --git a/images/emoji/1f44d-1f3ff.png b/images/emoji/1f44d-1f3ff.png
new file mode 100644
index 000000000..d829f787c
Binary files /dev/null and b/images/emoji/1f44d-1f3ff.png differ
diff --git a/images/emoji/1f44d.png b/images/emoji/1f44d.png
new file mode 100644
index 000000000..f9e6f13a3
Binary files /dev/null and b/images/emoji/1f44d.png differ
diff --git a/images/emoji/1f44e-1f3fb.png b/images/emoji/1f44e-1f3fb.png
new file mode 100644
index 000000000..a1631af8e
Binary files /dev/null and b/images/emoji/1f44e-1f3fb.png differ
diff --git a/images/emoji/1f44e-1f3fc.png b/images/emoji/1f44e-1f3fc.png
new file mode 100644
index 000000000..85fff82d5
Binary files /dev/null and b/images/emoji/1f44e-1f3fc.png differ
diff --git a/images/emoji/1f44e-1f3fd.png b/images/emoji/1f44e-1f3fd.png
new file mode 100644
index 000000000..eeba3be80
Binary files /dev/null and b/images/emoji/1f44e-1f3fd.png differ
diff --git a/images/emoji/1f44e-1f3fe.png b/images/emoji/1f44e-1f3fe.png
new file mode 100644
index 000000000..1addafdae
Binary files /dev/null and b/images/emoji/1f44e-1f3fe.png differ
diff --git a/images/emoji/1f44e-1f3ff.png b/images/emoji/1f44e-1f3ff.png
new file mode 100644
index 000000000..37ec07b57
Binary files /dev/null and b/images/emoji/1f44e-1f3ff.png differ
diff --git a/images/emoji/1f44e.png b/images/emoji/1f44e.png
new file mode 100644
index 000000000..b63da2f20
Binary files /dev/null and b/images/emoji/1f44e.png differ
diff --git a/images/emoji/1f44f-1f3fb.png b/images/emoji/1f44f-1f3fb.png
new file mode 100644
index 000000000..770aa9ca0
Binary files /dev/null and b/images/emoji/1f44f-1f3fb.png differ
diff --git a/images/emoji/1f44f-1f3fc.png b/images/emoji/1f44f-1f3fc.png
new file mode 100644
index 000000000..37c6b559a
Binary files /dev/null and b/images/emoji/1f44f-1f3fc.png differ
diff --git a/images/emoji/1f44f-1f3fd.png b/images/emoji/1f44f-1f3fd.png
new file mode 100644
index 000000000..e95bf2fc7
Binary files /dev/null and b/images/emoji/1f44f-1f3fd.png differ
diff --git a/images/emoji/1f44f-1f3fe.png b/images/emoji/1f44f-1f3fe.png
new file mode 100644
index 000000000..b6e9a9160
Binary files /dev/null and b/images/emoji/1f44f-1f3fe.png differ
diff --git a/images/emoji/1f44f-1f3ff.png b/images/emoji/1f44f-1f3ff.png
new file mode 100644
index 000000000..59cccdb73
Binary files /dev/null and b/images/emoji/1f44f-1f3ff.png differ
diff --git a/images/emoji/1f44f.png b/images/emoji/1f44f.png
new file mode 100644
index 000000000..b0ffe9289
Binary files /dev/null and b/images/emoji/1f44f.png differ
diff --git a/images/emoji/1f450-1f3fb.png b/images/emoji/1f450-1f3fb.png
new file mode 100644
index 000000000..352d2614f
Binary files /dev/null and b/images/emoji/1f450-1f3fb.png differ
diff --git a/images/emoji/1f450-1f3fc.png b/images/emoji/1f450-1f3fc.png
new file mode 100644
index 000000000..70824a50c
Binary files /dev/null and b/images/emoji/1f450-1f3fc.png differ
diff --git a/images/emoji/1f450-1f3fd.png b/images/emoji/1f450-1f3fd.png
new file mode 100644
index 000000000..d7d136bd3
Binary files /dev/null and b/images/emoji/1f450-1f3fd.png differ
diff --git a/images/emoji/1f450-1f3fe.png b/images/emoji/1f450-1f3fe.png
new file mode 100644
index 000000000..df4eaa711
Binary files /dev/null and b/images/emoji/1f450-1f3fe.png differ
diff --git a/images/emoji/1f450-1f3ff.png b/images/emoji/1f450-1f3ff.png
new file mode 100644
index 000000000..7dc04eaeb
Binary files /dev/null and b/images/emoji/1f450-1f3ff.png differ
diff --git a/images/emoji/1f450.png b/images/emoji/1f450.png
new file mode 100644
index 000000000..1cf75c910
Binary files /dev/null and b/images/emoji/1f450.png differ
diff --git a/images/emoji/1f451.png b/images/emoji/1f451.png
new file mode 100644
index 000000000..93b82d92f
Binary files /dev/null and b/images/emoji/1f451.png differ
diff --git a/images/emoji/1f452.png b/images/emoji/1f452.png
new file mode 100644
index 000000000..b837b6a2e
Binary files /dev/null and b/images/emoji/1f452.png differ
diff --git a/images/emoji/1f453.png b/images/emoji/1f453.png
new file mode 100644
index 000000000..865d8274a
Binary files /dev/null and b/images/emoji/1f453.png differ
diff --git a/images/emoji/1f454.png b/images/emoji/1f454.png
new file mode 100644
index 000000000..1804e7f3f
Binary files /dev/null and b/images/emoji/1f454.png differ
diff --git a/images/emoji/1f455.png b/images/emoji/1f455.png
new file mode 100644
index 000000000..af08dec8b
Binary files /dev/null and b/images/emoji/1f455.png differ
diff --git a/images/emoji/1f456.png b/images/emoji/1f456.png
new file mode 100644
index 000000000..2a6869d67
Binary files /dev/null and b/images/emoji/1f456.png differ
diff --git a/images/emoji/1f457.png b/images/emoji/1f457.png
new file mode 100644
index 000000000..a697ca5c5
Binary files /dev/null and b/images/emoji/1f457.png differ
diff --git a/images/emoji/1f458.png b/images/emoji/1f458.png
new file mode 100644
index 000000000..297a42c7e
Binary files /dev/null and b/images/emoji/1f458.png differ
diff --git a/images/emoji/1f459.png b/images/emoji/1f459.png
new file mode 100644
index 000000000..77a8a0aae
Binary files /dev/null and b/images/emoji/1f459.png differ
diff --git a/images/emoji/1f45a.png b/images/emoji/1f45a.png
new file mode 100644
index 000000000..01410dc81
Binary files /dev/null and b/images/emoji/1f45a.png differ
diff --git a/images/emoji/1f45b.png b/images/emoji/1f45b.png
new file mode 100644
index 000000000..981346193
Binary files /dev/null and b/images/emoji/1f45b.png differ
diff --git a/images/emoji/1f45c.png b/images/emoji/1f45c.png
new file mode 100644
index 000000000..cbf75c5d2
Binary files /dev/null and b/images/emoji/1f45c.png differ
diff --git a/images/emoji/1f45d.png b/images/emoji/1f45d.png
new file mode 100644
index 000000000..8795c6c66
Binary files /dev/null and b/images/emoji/1f45d.png differ
diff --git a/images/emoji/1f45e.png b/images/emoji/1f45e.png
new file mode 100644
index 000000000..16ccafb93
Binary files /dev/null and b/images/emoji/1f45e.png differ
diff --git a/images/emoji/1f45f.png b/images/emoji/1f45f.png
new file mode 100644
index 000000000..423fa07dd
Binary files /dev/null and b/images/emoji/1f45f.png differ
diff --git a/images/emoji/1f460.png b/images/emoji/1f460.png
new file mode 100644
index 000000000..b331cbccc
Binary files /dev/null and b/images/emoji/1f460.png differ
diff --git a/images/emoji/1f461.png b/images/emoji/1f461.png
new file mode 100644
index 000000000..9d9f5122b
Binary files /dev/null and b/images/emoji/1f461.png differ
diff --git a/images/emoji/1f462.png b/images/emoji/1f462.png
new file mode 100644
index 000000000..11f1065ed
Binary files /dev/null and b/images/emoji/1f462.png differ
diff --git a/images/emoji/1f463.png b/images/emoji/1f463.png
new file mode 100644
index 000000000..b2673c5a1
Binary files /dev/null and b/images/emoji/1f463.png differ
diff --git a/images/emoji/1f464.png b/images/emoji/1f464.png
new file mode 100644
index 000000000..123b2cbe1
Binary files /dev/null and b/images/emoji/1f464.png differ
diff --git a/images/emoji/1f465.png b/images/emoji/1f465.png
new file mode 100644
index 000000000..d7656860a
Binary files /dev/null and b/images/emoji/1f465.png differ
diff --git a/images/emoji/1f466-1f3fb.png b/images/emoji/1f466-1f3fb.png
new file mode 100644
index 000000000..2fc436ea5
Binary files /dev/null and b/images/emoji/1f466-1f3fb.png differ
diff --git a/images/emoji/1f466-1f3fc.png b/images/emoji/1f466-1f3fc.png
new file mode 100644
index 000000000..09a5f18d3
Binary files /dev/null and b/images/emoji/1f466-1f3fc.png differ
diff --git a/images/emoji/1f466-1f3fd.png b/images/emoji/1f466-1f3fd.png
new file mode 100644
index 000000000..3cfe675dd
Binary files /dev/null and b/images/emoji/1f466-1f3fd.png differ
diff --git a/images/emoji/1f466-1f3fe.png b/images/emoji/1f466-1f3fe.png
new file mode 100644
index 000000000..780be0ace
Binary files /dev/null and b/images/emoji/1f466-1f3fe.png differ
diff --git a/images/emoji/1f466-1f3ff.png b/images/emoji/1f466-1f3ff.png
new file mode 100644
index 000000000..f32fe22e3
Binary files /dev/null and b/images/emoji/1f466-1f3ff.png differ
diff --git a/images/emoji/1f466.png b/images/emoji/1f466.png
new file mode 100644
index 000000000..8ecfb0a4e
Binary files /dev/null and b/images/emoji/1f466.png differ
diff --git a/images/emoji/1f467-1f3fb.png b/images/emoji/1f467-1f3fb.png
new file mode 100644
index 000000000..2be1f0bee
Binary files /dev/null and b/images/emoji/1f467-1f3fb.png differ
diff --git a/images/emoji/1f467-1f3fc.png b/images/emoji/1f467-1f3fc.png
new file mode 100644
index 000000000..a59ed4a3f
Binary files /dev/null and b/images/emoji/1f467-1f3fc.png differ
diff --git a/images/emoji/1f467-1f3fd.png b/images/emoji/1f467-1f3fd.png
new file mode 100644
index 000000000..517e7f2a7
Binary files /dev/null and b/images/emoji/1f467-1f3fd.png differ
diff --git a/images/emoji/1f467-1f3fe.png b/images/emoji/1f467-1f3fe.png
new file mode 100644
index 000000000..542d96c84
Binary files /dev/null and b/images/emoji/1f467-1f3fe.png differ
diff --git a/images/emoji/1f467-1f3ff.png b/images/emoji/1f467-1f3ff.png
new file mode 100644
index 000000000..66b7c28c2
Binary files /dev/null and b/images/emoji/1f467-1f3ff.png differ
diff --git a/images/emoji/1f467.png b/images/emoji/1f467.png
new file mode 100644
index 000000000..649eea6a5
Binary files /dev/null and b/images/emoji/1f467.png differ
diff --git a/images/emoji/1f468-1f3fb.png b/images/emoji/1f468-1f3fb.png
new file mode 100644
index 000000000..bb86e963a
Binary files /dev/null and b/images/emoji/1f468-1f3fb.png differ
diff --git a/images/emoji/1f468-1f3fc.png b/images/emoji/1f468-1f3fc.png
new file mode 100644
index 000000000..fdeeaff46
Binary files /dev/null and b/images/emoji/1f468-1f3fc.png differ
diff --git a/images/emoji/1f468-1f3fd.png b/images/emoji/1f468-1f3fd.png
new file mode 100644
index 000000000..7ae0b5df9
Binary files /dev/null and b/images/emoji/1f468-1f3fd.png differ
diff --git a/images/emoji/1f468-1f3fe.png b/images/emoji/1f468-1f3fe.png
new file mode 100644
index 000000000..db14cde99
Binary files /dev/null and b/images/emoji/1f468-1f3fe.png differ
diff --git a/images/emoji/1f468-1f3ff.png b/images/emoji/1f468-1f3ff.png
new file mode 100644
index 000000000..7c67a7052
Binary files /dev/null and b/images/emoji/1f468-1f3ff.png differ
diff --git a/images/emoji/1f468-1f468-1f466-1f466.png b/images/emoji/1f468-1f468-1f466-1f466.png
new file mode 100644
index 000000000..0944001a3
Binary files /dev/null and b/images/emoji/1f468-1f468-1f466-1f466.png differ
diff --git a/images/emoji/1f468-1f468-1f466.png b/images/emoji/1f468-1f468-1f466.png
new file mode 100644
index 000000000..7a2e4e2c4
Binary files /dev/null and b/images/emoji/1f468-1f468-1f466.png differ
diff --git a/images/emoji/1f468-1f468-1f467-1f466.png b/images/emoji/1f468-1f468-1f467-1f466.png
new file mode 100644
index 000000000..41e351666
Binary files /dev/null and b/images/emoji/1f468-1f468-1f467-1f466.png differ
diff --git a/images/emoji/1f468-1f468-1f467-1f467.png b/images/emoji/1f468-1f468-1f467-1f467.png
new file mode 100644
index 000000000..8e8ccfe6c
Binary files /dev/null and b/images/emoji/1f468-1f468-1f467-1f467.png differ
diff --git a/images/emoji/1f468-1f468-1f467.png b/images/emoji/1f468-1f468-1f467.png
new file mode 100644
index 000000000..9bca550d0
Binary files /dev/null and b/images/emoji/1f468-1f468-1f467.png differ
diff --git a/images/emoji/1f468-1f469-1f466-1f466.png b/images/emoji/1f468-1f469-1f466-1f466.png
new file mode 100644
index 000000000..579eb59f8
Binary files /dev/null and b/images/emoji/1f468-1f469-1f466-1f466.png differ
diff --git a/images/emoji/1f468-1f469-1f467-1f466.png b/images/emoji/1f468-1f469-1f467-1f466.png
new file mode 100644
index 000000000..c5c7b0942
Binary files /dev/null and b/images/emoji/1f468-1f469-1f467-1f466.png differ
diff --git a/images/emoji/1f468-1f469-1f467-1f467.png b/images/emoji/1f468-1f469-1f467-1f467.png
new file mode 100644
index 000000000..b47f3b1c7
Binary files /dev/null and b/images/emoji/1f468-1f469-1f467-1f467.png differ
diff --git a/images/emoji/1f468-1f469-1f467.png b/images/emoji/1f468-1f469-1f467.png
new file mode 100644
index 000000000..ffa6f4293
Binary files /dev/null and b/images/emoji/1f468-1f469-1f467.png differ
diff --git a/images/emoji/1f468-2764-1f468.png b/images/emoji/1f468-2764-1f468.png
new file mode 100644
index 000000000..8759fa5db
Binary files /dev/null and b/images/emoji/1f468-2764-1f468.png differ
diff --git a/images/emoji/1f468-2764-1f48b-1f468.png b/images/emoji/1f468-2764-1f48b-1f468.png
new file mode 100644
index 000000000..a9a0edae1
Binary files /dev/null and b/images/emoji/1f468-2764-1f48b-1f468.png differ
diff --git a/images/emoji/1f468.png b/images/emoji/1f468.png
new file mode 100644
index 000000000..857a02e51
Binary files /dev/null and b/images/emoji/1f468.png differ
diff --git a/images/emoji/1f469-1f3fb.png b/images/emoji/1f469-1f3fb.png
new file mode 100644
index 000000000..ff089b888
Binary files /dev/null and b/images/emoji/1f469-1f3fb.png differ
diff --git a/images/emoji/1f469-1f3fc.png b/images/emoji/1f469-1f3fc.png
new file mode 100644
index 000000000..0719c3780
Binary files /dev/null and b/images/emoji/1f469-1f3fc.png differ
diff --git a/images/emoji/1f469-1f3fd.png b/images/emoji/1f469-1f3fd.png
new file mode 100644
index 000000000..b4d7f21f4
Binary files /dev/null and b/images/emoji/1f469-1f3fd.png differ
diff --git a/images/emoji/1f469-1f3fe.png b/images/emoji/1f469-1f3fe.png
new file mode 100644
index 000000000..6f21d631f
Binary files /dev/null and b/images/emoji/1f469-1f3fe.png differ
diff --git a/images/emoji/1f469-1f3ff.png b/images/emoji/1f469-1f3ff.png
new file mode 100644
index 000000000..cd47bfdd6
Binary files /dev/null and b/images/emoji/1f469-1f3ff.png differ
diff --git a/images/emoji/1f469-1f469-1f466-1f466.png b/images/emoji/1f469-1f469-1f466-1f466.png
new file mode 100644
index 000000000..e3fc2686e
Binary files /dev/null and b/images/emoji/1f469-1f469-1f466-1f466.png differ
diff --git a/images/emoji/1f469-1f469-1f466.png b/images/emoji/1f469-1f469-1f466.png
new file mode 100644
index 000000000..836feae7c
Binary files /dev/null and b/images/emoji/1f469-1f469-1f466.png differ
diff --git a/images/emoji/1f469-1f469-1f467-1f466.png b/images/emoji/1f469-1f469-1f467-1f466.png
new file mode 100644
index 000000000..284d29ab5
Binary files /dev/null and b/images/emoji/1f469-1f469-1f467-1f466.png differ
diff --git a/images/emoji/1f469-1f469-1f467-1f467.png b/images/emoji/1f469-1f469-1f467-1f467.png
new file mode 100644
index 000000000..d8d3f49b8
Binary files /dev/null and b/images/emoji/1f469-1f469-1f467-1f467.png differ
diff --git a/images/emoji/1f469-1f469-1f467.png b/images/emoji/1f469-1f469-1f467.png
new file mode 100644
index 000000000..d8619fa1f
Binary files /dev/null and b/images/emoji/1f469-1f469-1f467.png differ
diff --git a/images/emoji/1f469-2764-1f469.png b/images/emoji/1f469-2764-1f469.png
new file mode 100644
index 000000000..08fdabcdc
Binary files /dev/null and b/images/emoji/1f469-2764-1f469.png differ
diff --git a/images/emoji/1f469-2764-1f48b-1f469.png b/images/emoji/1f469-2764-1f48b-1f469.png
new file mode 100644
index 000000000..4905a5b3e
Binary files /dev/null and b/images/emoji/1f469-2764-1f48b-1f469.png differ
diff --git a/images/emoji/1f469.png b/images/emoji/1f469.png
new file mode 100644
index 000000000..ece440e7a
Binary files /dev/null and b/images/emoji/1f469.png differ
diff --git a/images/emoji/1f46a.png b/images/emoji/1f46a.png
new file mode 100644
index 000000000..0350719a2
Binary files /dev/null and b/images/emoji/1f46a.png differ
diff --git a/images/emoji/1f46b.png b/images/emoji/1f46b.png
new file mode 100644
index 000000000..73f22f0ad
Binary files /dev/null and b/images/emoji/1f46b.png differ
diff --git a/images/emoji/1f46c.png b/images/emoji/1f46c.png
new file mode 100644
index 000000000..a511fda82
Binary files /dev/null and b/images/emoji/1f46c.png differ
diff --git a/images/emoji/1f46d.png b/images/emoji/1f46d.png
new file mode 100644
index 000000000..8623da423
Binary files /dev/null and b/images/emoji/1f46d.png differ
diff --git a/images/emoji/1f46e-1f3fb.png b/images/emoji/1f46e-1f3fb.png
new file mode 100644
index 000000000..6ccba3879
Binary files /dev/null and b/images/emoji/1f46e-1f3fb.png differ
diff --git a/images/emoji/1f46e-1f3fc.png b/images/emoji/1f46e-1f3fc.png
new file mode 100644
index 000000000..7814ea9f5
Binary files /dev/null and b/images/emoji/1f46e-1f3fc.png differ
diff --git a/images/emoji/1f46e-1f3fd.png b/images/emoji/1f46e-1f3fd.png
new file mode 100644
index 000000000..c29f0709b
Binary files /dev/null and b/images/emoji/1f46e-1f3fd.png differ
diff --git a/images/emoji/1f46e-1f3fe.png b/images/emoji/1f46e-1f3fe.png
new file mode 100644
index 000000000..8a009e55e
Binary files /dev/null and b/images/emoji/1f46e-1f3fe.png differ
diff --git a/images/emoji/1f46e-1f3ff.png b/images/emoji/1f46e-1f3ff.png
new file mode 100644
index 000000000..5bdc53c99
Binary files /dev/null and b/images/emoji/1f46e-1f3ff.png differ
diff --git a/images/emoji/1f46e.png b/images/emoji/1f46e.png
new file mode 100644
index 000000000..bd37a787e
Binary files /dev/null and b/images/emoji/1f46e.png differ
diff --git a/images/emoji/1f46f.png b/images/emoji/1f46f.png
new file mode 100644
index 000000000..7a33d199b
Binary files /dev/null and b/images/emoji/1f46f.png differ
diff --git a/images/emoji/1f470-1f3fb.png b/images/emoji/1f470-1f3fb.png
new file mode 100644
index 000000000..c4fb141ae
Binary files /dev/null and b/images/emoji/1f470-1f3fb.png differ
diff --git a/images/emoji/1f470-1f3fc.png b/images/emoji/1f470-1f3fc.png
new file mode 100644
index 000000000..c248769fc
Binary files /dev/null and b/images/emoji/1f470-1f3fc.png differ
diff --git a/images/emoji/1f470-1f3fd.png b/images/emoji/1f470-1f3fd.png
new file mode 100644
index 000000000..962c0a6ee
Binary files /dev/null and b/images/emoji/1f470-1f3fd.png differ
diff --git a/images/emoji/1f470-1f3fe.png b/images/emoji/1f470-1f3fe.png
new file mode 100644
index 000000000..740ca208c
Binary files /dev/null and b/images/emoji/1f470-1f3fe.png differ
diff --git a/images/emoji/1f470-1f3ff.png b/images/emoji/1f470-1f3ff.png
new file mode 100644
index 000000000..5cc559858
Binary files /dev/null and b/images/emoji/1f470-1f3ff.png differ
diff --git a/images/emoji/1f470.png b/images/emoji/1f470.png
new file mode 100644
index 000000000..eaf4bd978
Binary files /dev/null and b/images/emoji/1f470.png differ
diff --git a/images/emoji/1f471-1f3fb.png b/images/emoji/1f471-1f3fb.png
new file mode 100644
index 000000000..7d18ef244
Binary files /dev/null and b/images/emoji/1f471-1f3fb.png differ
diff --git a/images/emoji/1f471-1f3fc.png b/images/emoji/1f471-1f3fc.png
new file mode 100644
index 000000000..dae130731
Binary files /dev/null and b/images/emoji/1f471-1f3fc.png differ
diff --git a/images/emoji/1f471-1f3fd.png b/images/emoji/1f471-1f3fd.png
new file mode 100644
index 000000000..684677e8e
Binary files /dev/null and b/images/emoji/1f471-1f3fd.png differ
diff --git a/images/emoji/1f471-1f3fe.png b/images/emoji/1f471-1f3fe.png
new file mode 100644
index 000000000..012be0b51
Binary files /dev/null and b/images/emoji/1f471-1f3fe.png differ
diff --git a/images/emoji/1f471-1f3ff.png b/images/emoji/1f471-1f3ff.png
new file mode 100644
index 000000000..d4ecc4cf4
Binary files /dev/null and b/images/emoji/1f471-1f3ff.png differ
diff --git a/images/emoji/1f471.png b/images/emoji/1f471.png
new file mode 100644
index 000000000..ad6f01a7d
Binary files /dev/null and b/images/emoji/1f471.png differ
diff --git a/images/emoji/1f472-1f3fb.png b/images/emoji/1f472-1f3fb.png
new file mode 100644
index 000000000..5b7b3def1
Binary files /dev/null and b/images/emoji/1f472-1f3fb.png differ
diff --git a/images/emoji/1f472-1f3fc.png b/images/emoji/1f472-1f3fc.png
new file mode 100644
index 000000000..c8b9cf87f
Binary files /dev/null and b/images/emoji/1f472-1f3fc.png differ
diff --git a/images/emoji/1f472-1f3fd.png b/images/emoji/1f472-1f3fd.png
new file mode 100644
index 000000000..effdd0c4c
Binary files /dev/null and b/images/emoji/1f472-1f3fd.png differ
diff --git a/images/emoji/1f472-1f3fe.png b/images/emoji/1f472-1f3fe.png
new file mode 100644
index 000000000..f885ff46f
Binary files /dev/null and b/images/emoji/1f472-1f3fe.png differ
diff --git a/images/emoji/1f472-1f3ff.png b/images/emoji/1f472-1f3ff.png
new file mode 100644
index 000000000..a6d55ca13
Binary files /dev/null and b/images/emoji/1f472-1f3ff.png differ
diff --git a/images/emoji/1f472.png b/images/emoji/1f472.png
new file mode 100644
index 000000000..7841e1360
Binary files /dev/null and b/images/emoji/1f472.png differ
diff --git a/images/emoji/1f473-1f3fb.png b/images/emoji/1f473-1f3fb.png
new file mode 100644
index 000000000..1e12ee4b2
Binary files /dev/null and b/images/emoji/1f473-1f3fb.png differ
diff --git a/images/emoji/1f473-1f3fc.png b/images/emoji/1f473-1f3fc.png
new file mode 100644
index 000000000..7fe9f01c6
Binary files /dev/null and b/images/emoji/1f473-1f3fc.png differ
diff --git a/images/emoji/1f473-1f3fd.png b/images/emoji/1f473-1f3fd.png
new file mode 100644
index 000000000..f607afd34
Binary files /dev/null and b/images/emoji/1f473-1f3fd.png differ
diff --git a/images/emoji/1f473-1f3fe.png b/images/emoji/1f473-1f3fe.png
new file mode 100644
index 000000000..c05695888
Binary files /dev/null and b/images/emoji/1f473-1f3fe.png differ
diff --git a/images/emoji/1f473-1f3ff.png b/images/emoji/1f473-1f3ff.png
new file mode 100644
index 000000000..df935551c
Binary files /dev/null and b/images/emoji/1f473-1f3ff.png differ
diff --git a/images/emoji/1f473.png b/images/emoji/1f473.png
new file mode 100644
index 000000000..993fd952c
Binary files /dev/null and b/images/emoji/1f473.png differ
diff --git a/images/emoji/1f474-1f3fb.png b/images/emoji/1f474-1f3fb.png
new file mode 100644
index 000000000..cd7d20789
Binary files /dev/null and b/images/emoji/1f474-1f3fb.png differ
diff --git a/images/emoji/1f474-1f3fc.png b/images/emoji/1f474-1f3fc.png
new file mode 100644
index 000000000..3574be8d4
Binary files /dev/null and b/images/emoji/1f474-1f3fc.png differ
diff --git a/images/emoji/1f474-1f3fd.png b/images/emoji/1f474-1f3fd.png
new file mode 100644
index 000000000..bbd95afe0
Binary files /dev/null and b/images/emoji/1f474-1f3fd.png differ
diff --git a/images/emoji/1f474-1f3fe.png b/images/emoji/1f474-1f3fe.png
new file mode 100644
index 000000000..b350a764b
Binary files /dev/null and b/images/emoji/1f474-1f3fe.png differ
diff --git a/images/emoji/1f474-1f3ff.png b/images/emoji/1f474-1f3ff.png
new file mode 100644
index 000000000..05fe24a17
Binary files /dev/null and b/images/emoji/1f474-1f3ff.png differ
diff --git a/images/emoji/1f474.png b/images/emoji/1f474.png
new file mode 100644
index 000000000..5f214571b
Binary files /dev/null and b/images/emoji/1f474.png differ
diff --git a/images/emoji/1f475-1f3fb.png b/images/emoji/1f475-1f3fb.png
new file mode 100644
index 000000000..b49e82140
Binary files /dev/null and b/images/emoji/1f475-1f3fb.png differ
diff --git a/images/emoji/1f475-1f3fc.png b/images/emoji/1f475-1f3fc.png
new file mode 100644
index 000000000..e86bf5ab3
Binary files /dev/null and b/images/emoji/1f475-1f3fc.png differ
diff --git a/images/emoji/1f475-1f3fd.png b/images/emoji/1f475-1f3fd.png
new file mode 100644
index 000000000..83fc14b08
Binary files /dev/null and b/images/emoji/1f475-1f3fd.png differ
diff --git a/images/emoji/1f475-1f3fe.png b/images/emoji/1f475-1f3fe.png
new file mode 100644
index 000000000..ebbf7930f
Binary files /dev/null and b/images/emoji/1f475-1f3fe.png differ
diff --git a/images/emoji/1f475-1f3ff.png b/images/emoji/1f475-1f3ff.png
new file mode 100644
index 000000000..4009012bb
Binary files /dev/null and b/images/emoji/1f475-1f3ff.png differ
diff --git a/images/emoji/1f475.png b/images/emoji/1f475.png
new file mode 100644
index 000000000..52dc49871
Binary files /dev/null and b/images/emoji/1f475.png differ
diff --git a/images/emoji/1f476-1f3fb.png b/images/emoji/1f476-1f3fb.png
new file mode 100644
index 000000000..8c1cada59
Binary files /dev/null and b/images/emoji/1f476-1f3fb.png differ
diff --git a/images/emoji/1f476-1f3fc.png b/images/emoji/1f476-1f3fc.png
new file mode 100644
index 000000000..4ba95bd75
Binary files /dev/null and b/images/emoji/1f476-1f3fc.png differ
diff --git a/images/emoji/1f476-1f3fd.png b/images/emoji/1f476-1f3fd.png
new file mode 100644
index 000000000..f4734c0dc
Binary files /dev/null and b/images/emoji/1f476-1f3fd.png differ
diff --git a/images/emoji/1f476-1f3fe.png b/images/emoji/1f476-1f3fe.png
new file mode 100644
index 000000000..02d864833
Binary files /dev/null and b/images/emoji/1f476-1f3fe.png differ
diff --git a/images/emoji/1f476-1f3ff.png b/images/emoji/1f476-1f3ff.png
new file mode 100644
index 000000000..0653e1603
Binary files /dev/null and b/images/emoji/1f476-1f3ff.png differ
diff --git a/images/emoji/1f476.png b/images/emoji/1f476.png
new file mode 100644
index 000000000..7b28ba891
Binary files /dev/null and b/images/emoji/1f476.png differ
diff --git a/images/emoji/1f477-1f3fb.png b/images/emoji/1f477-1f3fb.png
new file mode 100644
index 000000000..2f24a2bab
Binary files /dev/null and b/images/emoji/1f477-1f3fb.png differ
diff --git a/images/emoji/1f477-1f3fc.png b/images/emoji/1f477-1f3fc.png
new file mode 100644
index 000000000..93c8fec5a
Binary files /dev/null and b/images/emoji/1f477-1f3fc.png differ
diff --git a/images/emoji/1f477-1f3fd.png b/images/emoji/1f477-1f3fd.png
new file mode 100644
index 000000000..abc1f2af2
Binary files /dev/null and b/images/emoji/1f477-1f3fd.png differ
diff --git a/images/emoji/1f477-1f3fe.png b/images/emoji/1f477-1f3fe.png
new file mode 100644
index 000000000..eed83289a
Binary files /dev/null and b/images/emoji/1f477-1f3fe.png differ
diff --git a/images/emoji/1f477-1f3ff.png b/images/emoji/1f477-1f3ff.png
new file mode 100644
index 000000000..acbb220b8
Binary files /dev/null and b/images/emoji/1f477-1f3ff.png differ
diff --git a/images/emoji/1f477.png b/images/emoji/1f477.png
new file mode 100644
index 000000000..a9970a890
Binary files /dev/null and b/images/emoji/1f477.png differ
diff --git a/images/emoji/1f478-1f3fb.png b/images/emoji/1f478-1f3fb.png
new file mode 100644
index 000000000..7e4d850d1
Binary files /dev/null and b/images/emoji/1f478-1f3fb.png differ
diff --git a/images/emoji/1f478-1f3fc.png b/images/emoji/1f478-1f3fc.png
new file mode 100644
index 000000000..8179de403
Binary files /dev/null and b/images/emoji/1f478-1f3fc.png differ
diff --git a/images/emoji/1f478-1f3fd.png b/images/emoji/1f478-1f3fd.png
new file mode 100644
index 000000000..de04809d1
Binary files /dev/null and b/images/emoji/1f478-1f3fd.png differ
diff --git a/images/emoji/1f478-1f3fe.png b/images/emoji/1f478-1f3fe.png
new file mode 100644
index 000000000..c71e69caa
Binary files /dev/null and b/images/emoji/1f478-1f3fe.png differ
diff --git a/images/emoji/1f478-1f3ff.png b/images/emoji/1f478-1f3ff.png
new file mode 100644
index 000000000..063e26459
Binary files /dev/null and b/images/emoji/1f478-1f3ff.png differ
diff --git a/images/emoji/1f478.png b/images/emoji/1f478.png
new file mode 100644
index 000000000..a9958dfff
Binary files /dev/null and b/images/emoji/1f478.png differ
diff --git a/images/emoji/1f479.png b/images/emoji/1f479.png
new file mode 100644
index 000000000..fe8670fda
Binary files /dev/null and b/images/emoji/1f479.png differ
diff --git a/images/emoji/1f47a.png b/images/emoji/1f47a.png
new file mode 100644
index 000000000..e2ffb0c19
Binary files /dev/null and b/images/emoji/1f47a.png differ
diff --git a/images/emoji/1f47b.png b/images/emoji/1f47b.png
new file mode 100644
index 000000000..d22b1ccba
Binary files /dev/null and b/images/emoji/1f47b.png differ
diff --git a/images/emoji/1f47c-1f3fb.png b/images/emoji/1f47c-1f3fb.png
new file mode 100644
index 000000000..391694dc0
Binary files /dev/null and b/images/emoji/1f47c-1f3fb.png differ
diff --git a/images/emoji/1f47c-1f3fc.png b/images/emoji/1f47c-1f3fc.png
new file mode 100644
index 000000000..700cbe6ed
Binary files /dev/null and b/images/emoji/1f47c-1f3fc.png differ
diff --git a/images/emoji/1f47c-1f3fd.png b/images/emoji/1f47c-1f3fd.png
new file mode 100644
index 000000000..be597437d
Binary files /dev/null and b/images/emoji/1f47c-1f3fd.png differ
diff --git a/images/emoji/1f47c-1f3fe.png b/images/emoji/1f47c-1f3fe.png
new file mode 100644
index 000000000..b06d3c853
Binary files /dev/null and b/images/emoji/1f47c-1f3fe.png differ
diff --git a/images/emoji/1f47c-1f3ff.png b/images/emoji/1f47c-1f3ff.png
new file mode 100644
index 000000000..17bd677e3
Binary files /dev/null and b/images/emoji/1f47c-1f3ff.png differ
diff --git a/images/emoji/1f47c.png b/images/emoji/1f47c.png
new file mode 100644
index 000000000..66ea97a3b
Binary files /dev/null and b/images/emoji/1f47c.png differ
diff --git a/images/emoji/1f47d.png b/images/emoji/1f47d.png
new file mode 100644
index 000000000..3b90e9743
Binary files /dev/null and b/images/emoji/1f47d.png differ
diff --git a/images/emoji/1f47e.png b/images/emoji/1f47e.png
new file mode 100644
index 000000000..2e73f5f32
Binary files /dev/null and b/images/emoji/1f47e.png differ
diff --git a/images/emoji/1f47f.png b/images/emoji/1f47f.png
new file mode 100644
index 000000000..83b68e404
Binary files /dev/null and b/images/emoji/1f47f.png differ
diff --git a/images/emoji/1f480.png b/images/emoji/1f480.png
new file mode 100644
index 000000000..26abb1729
Binary files /dev/null and b/images/emoji/1f480.png differ
diff --git a/images/emoji/1f481-1f3fb.png b/images/emoji/1f481-1f3fb.png
new file mode 100644
index 000000000..3d9e22479
Binary files /dev/null and b/images/emoji/1f481-1f3fb.png differ
diff --git a/images/emoji/1f481-1f3fc.png b/images/emoji/1f481-1f3fc.png
new file mode 100644
index 000000000..7853bc60a
Binary files /dev/null and b/images/emoji/1f481-1f3fc.png differ
diff --git a/images/emoji/1f481-1f3fd.png b/images/emoji/1f481-1f3fd.png
new file mode 100644
index 000000000..307514eab
Binary files /dev/null and b/images/emoji/1f481-1f3fd.png differ
diff --git a/images/emoji/1f481-1f3fe.png b/images/emoji/1f481-1f3fe.png
new file mode 100644
index 000000000..95cc7ff36
Binary files /dev/null and b/images/emoji/1f481-1f3fe.png differ
diff --git a/images/emoji/1f481-1f3ff.png b/images/emoji/1f481-1f3ff.png
new file mode 100644
index 000000000..26f8f22b2
Binary files /dev/null and b/images/emoji/1f481-1f3ff.png differ
diff --git a/images/emoji/1f481.png b/images/emoji/1f481.png
new file mode 100644
index 000000000..328cfb316
Binary files /dev/null and b/images/emoji/1f481.png differ
diff --git a/images/emoji/1f482-1f3fb.png b/images/emoji/1f482-1f3fb.png
new file mode 100644
index 000000000..cea9ba274
Binary files /dev/null and b/images/emoji/1f482-1f3fb.png differ
diff --git a/images/emoji/1f482-1f3fc.png b/images/emoji/1f482-1f3fc.png
new file mode 100644
index 000000000..c8c3c6444
Binary files /dev/null and b/images/emoji/1f482-1f3fc.png differ
diff --git a/images/emoji/1f482-1f3fd.png b/images/emoji/1f482-1f3fd.png
new file mode 100644
index 000000000..29d9fc477
Binary files /dev/null and b/images/emoji/1f482-1f3fd.png differ
diff --git a/images/emoji/1f482-1f3fe.png b/images/emoji/1f482-1f3fe.png
new file mode 100644
index 000000000..85fcf9a3b
Binary files /dev/null and b/images/emoji/1f482-1f3fe.png differ
diff --git a/images/emoji/1f482-1f3ff.png b/images/emoji/1f482-1f3ff.png
new file mode 100644
index 000000000..b140a2d23
Binary files /dev/null and b/images/emoji/1f482-1f3ff.png differ
diff --git a/images/emoji/1f482.png b/images/emoji/1f482.png
new file mode 100644
index 000000000..8d7ab3c47
Binary files /dev/null and b/images/emoji/1f482.png differ
diff --git a/images/emoji/1f483-1f3fb.png b/images/emoji/1f483-1f3fb.png
new file mode 100644
index 000000000..27975615e
Binary files /dev/null and b/images/emoji/1f483-1f3fb.png differ
diff --git a/images/emoji/1f483-1f3fc.png b/images/emoji/1f483-1f3fc.png
new file mode 100644
index 000000000..cb04b1f90
Binary files /dev/null and b/images/emoji/1f483-1f3fc.png differ
diff --git a/images/emoji/1f483-1f3fd.png b/images/emoji/1f483-1f3fd.png
new file mode 100644
index 000000000..98c5bca7b
Binary files /dev/null and b/images/emoji/1f483-1f3fd.png differ
diff --git a/images/emoji/1f483-1f3fe.png b/images/emoji/1f483-1f3fe.png
new file mode 100644
index 000000000..fdb1e00cb
Binary files /dev/null and b/images/emoji/1f483-1f3fe.png differ
diff --git a/images/emoji/1f483-1f3ff.png b/images/emoji/1f483-1f3ff.png
new file mode 100644
index 000000000..0e34e0e23
Binary files /dev/null and b/images/emoji/1f483-1f3ff.png differ
diff --git a/images/emoji/1f483.png b/images/emoji/1f483.png
new file mode 100644
index 000000000..d1cdad8dd
Binary files /dev/null and b/images/emoji/1f483.png differ
diff --git a/images/emoji/1f484.png b/images/emoji/1f484.png
new file mode 100644
index 000000000..61a0c084c
Binary files /dev/null and b/images/emoji/1f484.png differ
diff --git a/images/emoji/1f485-1f3fb.png b/images/emoji/1f485-1f3fb.png
new file mode 100644
index 000000000..f1fbfcf52
Binary files /dev/null and b/images/emoji/1f485-1f3fb.png differ
diff --git a/images/emoji/1f485-1f3fc.png b/images/emoji/1f485-1f3fc.png
new file mode 100644
index 000000000..02b836b2f
Binary files /dev/null and b/images/emoji/1f485-1f3fc.png differ
diff --git a/images/emoji/1f485-1f3fd.png b/images/emoji/1f485-1f3fd.png
new file mode 100644
index 000000000..7432e3cf2
Binary files /dev/null and b/images/emoji/1f485-1f3fd.png differ
diff --git a/images/emoji/1f485-1f3fe.png b/images/emoji/1f485-1f3fe.png
new file mode 100644
index 000000000..e4272692c
Binary files /dev/null and b/images/emoji/1f485-1f3fe.png differ
diff --git a/images/emoji/1f485-1f3ff.png b/images/emoji/1f485-1f3ff.png
new file mode 100644
index 000000000..d29e1c553
Binary files /dev/null and b/images/emoji/1f485-1f3ff.png differ
diff --git a/images/emoji/1f485.png b/images/emoji/1f485.png
new file mode 100644
index 000000000..aa52af705
Binary files /dev/null and b/images/emoji/1f485.png differ
diff --git a/images/emoji/1f486-1f3fb.png b/images/emoji/1f486-1f3fb.png
new file mode 100644
index 000000000..f9dea75f3
Binary files /dev/null and b/images/emoji/1f486-1f3fb.png differ
diff --git a/images/emoji/1f486-1f3fc.png b/images/emoji/1f486-1f3fc.png
new file mode 100644
index 000000000..0bb244a27
Binary files /dev/null and b/images/emoji/1f486-1f3fc.png differ
diff --git a/images/emoji/1f486-1f3fd.png b/images/emoji/1f486-1f3fd.png
new file mode 100644
index 000000000..06941c86b
Binary files /dev/null and b/images/emoji/1f486-1f3fd.png differ
diff --git a/images/emoji/1f486-1f3fe.png b/images/emoji/1f486-1f3fe.png
new file mode 100644
index 000000000..671d52310
Binary files /dev/null and b/images/emoji/1f486-1f3fe.png differ
diff --git a/images/emoji/1f486-1f3ff.png b/images/emoji/1f486-1f3ff.png
new file mode 100644
index 000000000..6a388c0d0
Binary files /dev/null and b/images/emoji/1f486-1f3ff.png differ
diff --git a/images/emoji/1f486.png b/images/emoji/1f486.png
new file mode 100644
index 000000000..9ed04ff13
Binary files /dev/null and b/images/emoji/1f486.png differ
diff --git a/images/emoji/1f487-1f3fb.png b/images/emoji/1f487-1f3fb.png
new file mode 100644
index 000000000..c743b74ab
Binary files /dev/null and b/images/emoji/1f487-1f3fb.png differ
diff --git a/images/emoji/1f487-1f3fc.png b/images/emoji/1f487-1f3fc.png
new file mode 100644
index 000000000..dbbddcb34
Binary files /dev/null and b/images/emoji/1f487-1f3fc.png differ
diff --git a/images/emoji/1f487-1f3fd.png b/images/emoji/1f487-1f3fd.png
new file mode 100644
index 000000000..d5ad19563
Binary files /dev/null and b/images/emoji/1f487-1f3fd.png differ
diff --git a/images/emoji/1f487-1f3fe.png b/images/emoji/1f487-1f3fe.png
new file mode 100644
index 000000000..244fd3af0
Binary files /dev/null and b/images/emoji/1f487-1f3fe.png differ
diff --git a/images/emoji/1f487-1f3ff.png b/images/emoji/1f487-1f3ff.png
new file mode 100644
index 000000000..20a94a886
Binary files /dev/null and b/images/emoji/1f487-1f3ff.png differ
diff --git a/images/emoji/1f487.png b/images/emoji/1f487.png
new file mode 100644
index 000000000..91266b129
Binary files /dev/null and b/images/emoji/1f487.png differ
diff --git a/images/emoji/1f488.png b/images/emoji/1f488.png
new file mode 100644
index 000000000..896f4d716
Binary files /dev/null and b/images/emoji/1f488.png differ
diff --git a/images/emoji/1f489.png b/images/emoji/1f489.png
new file mode 100644
index 000000000..71c1a9528
Binary files /dev/null and b/images/emoji/1f489.png differ
diff --git a/images/emoji/1f48a.png b/images/emoji/1f48a.png
new file mode 100644
index 000000000..1d4530e77
Binary files /dev/null and b/images/emoji/1f48a.png differ
diff --git a/images/emoji/1f48b.png b/images/emoji/1f48b.png
new file mode 100644
index 000000000..85e6dcfc4
Binary files /dev/null and b/images/emoji/1f48b.png differ
diff --git a/images/emoji/1f48c.png b/images/emoji/1f48c.png
new file mode 100644
index 000000000..3c3c767e7
Binary files /dev/null and b/images/emoji/1f48c.png differ
diff --git a/images/emoji/1f48d.png b/images/emoji/1f48d.png
new file mode 100644
index 000000000..87d227adb
Binary files /dev/null and b/images/emoji/1f48d.png differ
diff --git a/images/emoji/1f48e.png b/images/emoji/1f48e.png
new file mode 100644
index 000000000..db122d26a
Binary files /dev/null and b/images/emoji/1f48e.png differ
diff --git a/images/emoji/1f48f.png b/images/emoji/1f48f.png
new file mode 100644
index 000000000..9aa519da9
Binary files /dev/null and b/images/emoji/1f48f.png differ
diff --git a/images/emoji/1f490.png b/images/emoji/1f490.png
new file mode 100644
index 000000000..11455af6d
Binary files /dev/null and b/images/emoji/1f490.png differ
diff --git a/images/emoji/1f491.png b/images/emoji/1f491.png
new file mode 100644
index 000000000..62111601b
Binary files /dev/null and b/images/emoji/1f491.png differ
diff --git a/images/emoji/1f492.png b/images/emoji/1f492.png
new file mode 100644
index 000000000..d0d8aa0bf
Binary files /dev/null and b/images/emoji/1f492.png differ
diff --git a/images/emoji/1f493.png b/images/emoji/1f493.png
new file mode 100644
index 000000000..0bcf2d1d5
Binary files /dev/null and b/images/emoji/1f493.png differ
diff --git a/images/emoji/1f494.png b/images/emoji/1f494.png
new file mode 100644
index 000000000..718e26ee1
Binary files /dev/null and b/images/emoji/1f494.png differ
diff --git a/images/emoji/1f495.png b/images/emoji/1f495.png
new file mode 100644
index 000000000..4d8c33860
Binary files /dev/null and b/images/emoji/1f495.png differ
diff --git a/images/emoji/1f496.png b/images/emoji/1f496.png
new file mode 100644
index 000000000..670926945
Binary files /dev/null and b/images/emoji/1f496.png differ
diff --git a/images/emoji/1f497.png b/images/emoji/1f497.png
new file mode 100644
index 000000000..d6e694e97
Binary files /dev/null and b/images/emoji/1f497.png differ
diff --git a/images/emoji/1f498.png b/images/emoji/1f498.png
new file mode 100644
index 000000000..2df0078dd
Binary files /dev/null and b/images/emoji/1f498.png differ
diff --git a/images/emoji/1f499.png b/images/emoji/1f499.png
new file mode 100644
index 000000000..bdf1287e5
Binary files /dev/null and b/images/emoji/1f499.png differ
diff --git a/images/emoji/1f49a.png b/images/emoji/1f49a.png
new file mode 100644
index 000000000..c52d60a58
Binary files /dev/null and b/images/emoji/1f49a.png differ
diff --git a/images/emoji/1f49b.png b/images/emoji/1f49b.png
new file mode 100644
index 000000000..7901a9d01
Binary files /dev/null and b/images/emoji/1f49b.png differ
diff --git a/images/emoji/1f49c.png b/images/emoji/1f49c.png
new file mode 100644
index 000000000..95c53a9ad
Binary files /dev/null and b/images/emoji/1f49c.png differ
diff --git a/images/emoji/1f49d.png b/images/emoji/1f49d.png
new file mode 100644
index 000000000..902ceafe4
Binary files /dev/null and b/images/emoji/1f49d.png differ
diff --git a/images/emoji/1f49e.png b/images/emoji/1f49e.png
new file mode 100644
index 000000000..7b9d1948f
Binary files /dev/null and b/images/emoji/1f49e.png differ
diff --git a/images/emoji/1f49f.png b/images/emoji/1f49f.png
new file mode 100644
index 000000000..5443f60bc
Binary files /dev/null and b/images/emoji/1f49f.png differ
diff --git a/images/emoji/1f4a0.png b/images/emoji/1f4a0.png
new file mode 100644
index 000000000..2a22a26d1
Binary files /dev/null and b/images/emoji/1f4a0.png differ
diff --git a/images/emoji/1f4a1.png b/images/emoji/1f4a1.png
new file mode 100644
index 000000000..38e32e02d
Binary files /dev/null and b/images/emoji/1f4a1.png differ
diff --git a/images/emoji/1f4a2.png b/images/emoji/1f4a2.png
new file mode 100644
index 000000000..d63c2e000
Binary files /dev/null and b/images/emoji/1f4a2.png differ
diff --git a/images/emoji/1f4a3.png b/images/emoji/1f4a3.png
new file mode 100644
index 000000000..c7f8f81c9
Binary files /dev/null and b/images/emoji/1f4a3.png differ
diff --git a/images/emoji/1f4a4.png b/images/emoji/1f4a4.png
new file mode 100644
index 000000000..9bc72b446
Binary files /dev/null and b/images/emoji/1f4a4.png differ
diff --git a/images/emoji/1f4a5.png b/images/emoji/1f4a5.png
new file mode 100644
index 000000000..9b0f027b1
Binary files /dev/null and b/images/emoji/1f4a5.png differ
diff --git a/images/emoji/1f4a6.png b/images/emoji/1f4a6.png
new file mode 100644
index 000000000..4106117eb
Binary files /dev/null and b/images/emoji/1f4a6.png differ
diff --git a/images/emoji/1f4a7.png b/images/emoji/1f4a7.png
new file mode 100644
index 000000000..71241ec30
Binary files /dev/null and b/images/emoji/1f4a7.png differ
diff --git a/images/emoji/1f4a8.png b/images/emoji/1f4a8.png
new file mode 100644
index 000000000..064b8525c
Binary files /dev/null and b/images/emoji/1f4a8.png differ
diff --git a/images/emoji/1f4a9.png b/images/emoji/1f4a9.png
new file mode 100644
index 000000000..10b15e72d
Binary files /dev/null and b/images/emoji/1f4a9.png differ
diff --git a/images/emoji/1f4aa-1f3fb.png b/images/emoji/1f4aa-1f3fb.png
new file mode 100644
index 000000000..1522942ce
Binary files /dev/null and b/images/emoji/1f4aa-1f3fb.png differ
diff --git a/images/emoji/1f4aa-1f3fc.png b/images/emoji/1f4aa-1f3fc.png
new file mode 100644
index 000000000..569c6e832
Binary files /dev/null and b/images/emoji/1f4aa-1f3fc.png differ
diff --git a/images/emoji/1f4aa-1f3fd.png b/images/emoji/1f4aa-1f3fd.png
new file mode 100644
index 000000000..0a76b00fa
Binary files /dev/null and b/images/emoji/1f4aa-1f3fd.png differ
diff --git a/images/emoji/1f4aa-1f3fe.png b/images/emoji/1f4aa-1f3fe.png
new file mode 100644
index 000000000..f0cf31328
Binary files /dev/null and b/images/emoji/1f4aa-1f3fe.png differ
diff --git a/images/emoji/1f4aa-1f3ff.png b/images/emoji/1f4aa-1f3ff.png
new file mode 100644
index 000000000..4fda92460
Binary files /dev/null and b/images/emoji/1f4aa-1f3ff.png differ
diff --git a/images/emoji/1f4aa.png b/images/emoji/1f4aa.png
new file mode 100644
index 000000000..7e67c1880
Binary files /dev/null and b/images/emoji/1f4aa.png differ
diff --git a/images/emoji/1f4ab.png b/images/emoji/1f4ab.png
new file mode 100644
index 000000000..85f52efad
Binary files /dev/null and b/images/emoji/1f4ab.png differ
diff --git a/images/emoji/1f4ac.png b/images/emoji/1f4ac.png
new file mode 100644
index 000000000..a34ef7417
Binary files /dev/null and b/images/emoji/1f4ac.png differ
diff --git a/images/emoji/1f4ad.png b/images/emoji/1f4ad.png
new file mode 100644
index 000000000..72fe8fa70
Binary files /dev/null and b/images/emoji/1f4ad.png differ
diff --git a/images/emoji/1f4ae.png b/images/emoji/1f4ae.png
new file mode 100644
index 000000000..d6af8b600
Binary files /dev/null and b/images/emoji/1f4ae.png differ
diff --git a/images/emoji/1f4af.png b/images/emoji/1f4af.png
new file mode 100644
index 000000000..6903ff030
Binary files /dev/null and b/images/emoji/1f4af.png differ
diff --git a/images/emoji/1f4b0.png b/images/emoji/1f4b0.png
new file mode 100644
index 000000000..b9296be09
Binary files /dev/null and b/images/emoji/1f4b0.png differ
diff --git a/images/emoji/1f4b1.png b/images/emoji/1f4b1.png
new file mode 100644
index 000000000..4d46c6050
Binary files /dev/null and b/images/emoji/1f4b1.png differ
diff --git a/images/emoji/1f4b2.png b/images/emoji/1f4b2.png
new file mode 100644
index 000000000..ef2c2e205
Binary files /dev/null and b/images/emoji/1f4b2.png differ
diff --git a/images/emoji/1f4b3.png b/images/emoji/1f4b3.png
new file mode 100644
index 000000000..372777d5c
Binary files /dev/null and b/images/emoji/1f4b3.png differ
diff --git a/images/emoji/1f4b4.png b/images/emoji/1f4b4.png
new file mode 100644
index 000000000..63ee4799d
Binary files /dev/null and b/images/emoji/1f4b4.png differ
diff --git a/images/emoji/1f4b5.png b/images/emoji/1f4b5.png
new file mode 100644
index 000000000..a9904c282
Binary files /dev/null and b/images/emoji/1f4b5.png differ
diff --git a/images/emoji/1f4b6.png b/images/emoji/1f4b6.png
new file mode 100644
index 000000000..a49020820
Binary files /dev/null and b/images/emoji/1f4b6.png differ
diff --git a/images/emoji/1f4b7.png b/images/emoji/1f4b7.png
new file mode 100644
index 000000000..a0d4c4099
Binary files /dev/null and b/images/emoji/1f4b7.png differ
diff --git a/images/emoji/1f4b8.png b/images/emoji/1f4b8.png
new file mode 100644
index 000000000..f022b04b3
Binary files /dev/null and b/images/emoji/1f4b8.png differ
diff --git a/images/emoji/1f4b9.png b/images/emoji/1f4b9.png
new file mode 100644
index 000000000..9773f03be
Binary files /dev/null and b/images/emoji/1f4b9.png differ
diff --git a/images/emoji/1f4ba.png b/images/emoji/1f4ba.png
new file mode 100644
index 000000000..a6d72d95a
Binary files /dev/null and b/images/emoji/1f4ba.png differ
diff --git a/images/emoji/1f4bb.png b/images/emoji/1f4bb.png
new file mode 100644
index 000000000..c1fee27e3
Binary files /dev/null and b/images/emoji/1f4bb.png differ
diff --git a/images/emoji/1f4bc.png b/images/emoji/1f4bc.png
new file mode 100644
index 000000000..b9912ba21
Binary files /dev/null and b/images/emoji/1f4bc.png differ
diff --git a/images/emoji/1f4bd.png b/images/emoji/1f4bd.png
new file mode 100644
index 000000000..9fa94cfbe
Binary files /dev/null and b/images/emoji/1f4bd.png differ
diff --git a/images/emoji/1f4be.png b/images/emoji/1f4be.png
new file mode 100644
index 000000000..072a76d3c
Binary files /dev/null and b/images/emoji/1f4be.png differ
diff --git a/images/emoji/1f4bf.png b/images/emoji/1f4bf.png
new file mode 100644
index 000000000..e6b01449c
Binary files /dev/null and b/images/emoji/1f4bf.png differ
diff --git a/images/emoji/1f4c0.png b/images/emoji/1f4c0.png
new file mode 100644
index 000000000..045a6f7a0
Binary files /dev/null and b/images/emoji/1f4c0.png differ
diff --git a/images/emoji/1f4c1.png b/images/emoji/1f4c1.png
new file mode 100644
index 000000000..addedaf08
Binary files /dev/null and b/images/emoji/1f4c1.png differ
diff --git a/images/emoji/1f4c2.png b/images/emoji/1f4c2.png
new file mode 100644
index 000000000..3993b0922
Binary files /dev/null and b/images/emoji/1f4c2.png differ
diff --git a/images/emoji/1f4c3.png b/images/emoji/1f4c3.png
new file mode 100644
index 000000000..06355319c
Binary files /dev/null and b/images/emoji/1f4c3.png differ
diff --git a/images/emoji/1f4c4.png b/images/emoji/1f4c4.png
new file mode 100644
index 000000000..ba4ed757e
Binary files /dev/null and b/images/emoji/1f4c4.png differ
diff --git a/images/emoji/1f4c5.png b/images/emoji/1f4c5.png
new file mode 100644
index 000000000..f05b3da97
Binary files /dev/null and b/images/emoji/1f4c5.png differ
diff --git a/images/emoji/1f4c6.png b/images/emoji/1f4c6.png
new file mode 100644
index 000000000..47353b744
Binary files /dev/null and b/images/emoji/1f4c6.png differ
diff --git a/images/emoji/1f4c7.png b/images/emoji/1f4c7.png
new file mode 100644
index 000000000..151e11cb3
Binary files /dev/null and b/images/emoji/1f4c7.png differ
diff --git a/images/emoji/1f4c8.png b/images/emoji/1f4c8.png
new file mode 100644
index 000000000..f13cfcf99
Binary files /dev/null and b/images/emoji/1f4c8.png differ
diff --git a/images/emoji/1f4c9.png b/images/emoji/1f4c9.png
new file mode 100644
index 000000000..5222ec72d
Binary files /dev/null and b/images/emoji/1f4c9.png differ
diff --git a/images/emoji/1f4ca.png b/images/emoji/1f4ca.png
new file mode 100644
index 000000000..53c894550
Binary files /dev/null and b/images/emoji/1f4ca.png differ
diff --git a/images/emoji/1f4cb.png b/images/emoji/1f4cb.png
new file mode 100644
index 000000000..ffd5b315d
Binary files /dev/null and b/images/emoji/1f4cb.png differ
diff --git a/images/emoji/1f4cc.png b/images/emoji/1f4cc.png
new file mode 100644
index 000000000..57e07d7f4
Binary files /dev/null and b/images/emoji/1f4cc.png differ
diff --git a/images/emoji/1f4cd.png b/images/emoji/1f4cd.png
new file mode 100644
index 000000000..28b9d7286
Binary files /dev/null and b/images/emoji/1f4cd.png differ
diff --git a/images/emoji/1f4ce.png b/images/emoji/1f4ce.png
new file mode 100644
index 000000000..8cd8d4f87
Binary files /dev/null and b/images/emoji/1f4ce.png differ
diff --git a/images/emoji/1f4cf.png b/images/emoji/1f4cf.png
new file mode 100644
index 000000000..1017b7433
Binary files /dev/null and b/images/emoji/1f4cf.png differ
diff --git a/images/emoji/1f4d0.png b/images/emoji/1f4d0.png
new file mode 100644
index 000000000..77dee9ee8
Binary files /dev/null and b/images/emoji/1f4d0.png differ
diff --git a/images/emoji/1f4d1.png b/images/emoji/1f4d1.png
new file mode 100644
index 000000000..23a3083ad
Binary files /dev/null and b/images/emoji/1f4d1.png differ
diff --git a/images/emoji/1f4d2.png b/images/emoji/1f4d2.png
new file mode 100644
index 000000000..ef0ea3b1f
Binary files /dev/null and b/images/emoji/1f4d2.png differ
diff --git a/images/emoji/1f4d3.png b/images/emoji/1f4d3.png
new file mode 100644
index 000000000..f6c28b491
Binary files /dev/null and b/images/emoji/1f4d3.png differ
diff --git a/images/emoji/1f4d4.png b/images/emoji/1f4d4.png
new file mode 100644
index 000000000..03f566b6d
Binary files /dev/null and b/images/emoji/1f4d4.png differ
diff --git a/images/emoji/1f4d5.png b/images/emoji/1f4d5.png
new file mode 100644
index 000000000..6395cf215
Binary files /dev/null and b/images/emoji/1f4d5.png differ
diff --git a/images/emoji/1f4d6.png b/images/emoji/1f4d6.png
new file mode 100644
index 000000000..0f4447ed3
Binary files /dev/null and b/images/emoji/1f4d6.png differ
diff --git a/images/emoji/1f4d7.png b/images/emoji/1f4d7.png
new file mode 100644
index 000000000..e5e411cf3
Binary files /dev/null and b/images/emoji/1f4d7.png differ
diff --git a/images/emoji/1f4d8.png b/images/emoji/1f4d8.png
new file mode 100644
index 000000000..d73dfd725
Binary files /dev/null and b/images/emoji/1f4d8.png differ
diff --git a/images/emoji/1f4d9.png b/images/emoji/1f4d9.png
new file mode 100644
index 000000000..ab40e6ae6
Binary files /dev/null and b/images/emoji/1f4d9.png differ
diff --git a/images/emoji/1f4da.png b/images/emoji/1f4da.png
new file mode 100644
index 000000000..59a8bafeb
Binary files /dev/null and b/images/emoji/1f4da.png differ
diff --git a/images/emoji/1f4db.png b/images/emoji/1f4db.png
new file mode 100644
index 000000000..ec5ee213e
Binary files /dev/null and b/images/emoji/1f4db.png differ
diff --git a/images/emoji/1f4dc.png b/images/emoji/1f4dc.png
new file mode 100644
index 000000000..50ee5dcd4
Binary files /dev/null and b/images/emoji/1f4dc.png differ
diff --git a/images/emoji/1f4dd.png b/images/emoji/1f4dd.png
new file mode 100644
index 000000000..9e44f60f4
Binary files /dev/null and b/images/emoji/1f4dd.png differ
diff --git a/images/emoji/1f4de.png b/images/emoji/1f4de.png
new file mode 100644
index 000000000..69388316c
Binary files /dev/null and b/images/emoji/1f4de.png differ
diff --git a/images/emoji/1f4df.png b/images/emoji/1f4df.png
new file mode 100644
index 000000000..b24b99306
Binary files /dev/null and b/images/emoji/1f4df.png differ
diff --git a/images/emoji/1f4e0.png b/images/emoji/1f4e0.png
new file mode 100644
index 000000000..6f929e294
Binary files /dev/null and b/images/emoji/1f4e0.png differ
diff --git a/images/emoji/1f4e1.png b/images/emoji/1f4e1.png
new file mode 100644
index 000000000..db0372795
Binary files /dev/null and b/images/emoji/1f4e1.png differ
diff --git a/images/emoji/1f4e2.png b/images/emoji/1f4e2.png
new file mode 100644
index 000000000..5fd76a95b
Binary files /dev/null and b/images/emoji/1f4e2.png differ
diff --git a/images/emoji/1f4e3.png b/images/emoji/1f4e3.png
new file mode 100644
index 000000000..4e6735188
Binary files /dev/null and b/images/emoji/1f4e3.png differ
diff --git a/images/emoji/1f4e4.png b/images/emoji/1f4e4.png
new file mode 100644
index 000000000..46493ed5b
Binary files /dev/null and b/images/emoji/1f4e4.png differ
diff --git a/images/emoji/1f4e5.png b/images/emoji/1f4e5.png
new file mode 100644
index 000000000..41a6be2b0
Binary files /dev/null and b/images/emoji/1f4e5.png differ
diff --git a/images/emoji/1f4e6.png b/images/emoji/1f4e6.png
new file mode 100644
index 000000000..85431756a
Binary files /dev/null and b/images/emoji/1f4e6.png differ
diff --git a/images/emoji/1f4e7.png b/images/emoji/1f4e7.png
new file mode 100644
index 000000000..d22e654a2
Binary files /dev/null and b/images/emoji/1f4e7.png differ
diff --git a/images/emoji/1f4e8.png b/images/emoji/1f4e8.png
new file mode 100644
index 000000000..fd22e8818
Binary files /dev/null and b/images/emoji/1f4e8.png differ
diff --git a/images/emoji/1f4e9.png b/images/emoji/1f4e9.png
new file mode 100644
index 000000000..7448a6b76
Binary files /dev/null and b/images/emoji/1f4e9.png differ
diff --git a/images/emoji/1f4ea.png b/images/emoji/1f4ea.png
new file mode 100644
index 000000000..ddc705db0
Binary files /dev/null and b/images/emoji/1f4ea.png differ
diff --git a/images/emoji/1f4eb.png b/images/emoji/1f4eb.png
new file mode 100644
index 000000000..ef5174e40
Binary files /dev/null and b/images/emoji/1f4eb.png differ
diff --git a/images/emoji/1f4ec.png b/images/emoji/1f4ec.png
new file mode 100644
index 000000000..5460616a5
Binary files /dev/null and b/images/emoji/1f4ec.png differ
diff --git a/images/emoji/1f4ed.png b/images/emoji/1f4ed.png
new file mode 100644
index 000000000..f9aeee6b1
Binary files /dev/null and b/images/emoji/1f4ed.png differ
diff --git a/images/emoji/1f4ee.png b/images/emoji/1f4ee.png
new file mode 100644
index 000000000..07c9c4ab3
Binary files /dev/null and b/images/emoji/1f4ee.png differ
diff --git a/images/emoji/1f4ef.png b/images/emoji/1f4ef.png
new file mode 100644
index 000000000..c173b8dbd
Binary files /dev/null and b/images/emoji/1f4ef.png differ
diff --git a/images/emoji/1f4f0.png b/images/emoji/1f4f0.png
new file mode 100644
index 000000000..2aa8f060b
Binary files /dev/null and b/images/emoji/1f4f0.png differ
diff --git a/images/emoji/1f4f1.png b/images/emoji/1f4f1.png
new file mode 100644
index 000000000..fd377acf8
Binary files /dev/null and b/images/emoji/1f4f1.png differ
diff --git a/images/emoji/1f4f2.png b/images/emoji/1f4f2.png
new file mode 100644
index 000000000..e2f308f8e
Binary files /dev/null and b/images/emoji/1f4f2.png differ
diff --git a/images/emoji/1f4f3.png b/images/emoji/1f4f3.png
new file mode 100644
index 000000000..cc46510e4
Binary files /dev/null and b/images/emoji/1f4f3.png differ
diff --git a/images/emoji/1f4f4.png b/images/emoji/1f4f4.png
new file mode 100644
index 000000000..8b661ec1c
Binary files /dev/null and b/images/emoji/1f4f4.png differ
diff --git a/images/emoji/1f4f5.png b/images/emoji/1f4f5.png
new file mode 100644
index 000000000..7b1ae6ea5
Binary files /dev/null and b/images/emoji/1f4f5.png differ
diff --git a/images/emoji/1f4f6.png b/images/emoji/1f4f6.png
new file mode 100644
index 000000000..ee2b5a4b5
Binary files /dev/null and b/images/emoji/1f4f6.png differ
diff --git a/images/emoji/1f4f7.png b/images/emoji/1f4f7.png
new file mode 100644
index 000000000..0a3429f72
Binary files /dev/null and b/images/emoji/1f4f7.png differ
diff --git a/images/emoji/1f4f8.png b/images/emoji/1f4f8.png
new file mode 100644
index 000000000..27471da20
Binary files /dev/null and b/images/emoji/1f4f8.png differ
diff --git a/images/emoji/1f4f9.png b/images/emoji/1f4f9.png
new file mode 100644
index 000000000..8008d1414
Binary files /dev/null and b/images/emoji/1f4f9.png differ
diff --git a/images/emoji/1f4fa.png b/images/emoji/1f4fa.png
new file mode 100644
index 000000000..999f1fb5c
Binary files /dev/null and b/images/emoji/1f4fa.png differ
diff --git a/images/emoji/1f4fb.png b/images/emoji/1f4fb.png
new file mode 100644
index 000000000..dec381fa2
Binary files /dev/null and b/images/emoji/1f4fb.png differ
diff --git a/images/emoji/1f4fc.png b/images/emoji/1f4fc.png
new file mode 100644
index 000000000..b9eb78ecd
Binary files /dev/null and b/images/emoji/1f4fc.png differ
diff --git a/images/emoji/1f4fd.png b/images/emoji/1f4fd.png
new file mode 100644
index 000000000..ce9ab0daa
Binary files /dev/null and b/images/emoji/1f4fd.png differ
diff --git a/images/emoji/1f4ff.png b/images/emoji/1f4ff.png
new file mode 100644
index 000000000..a4b6dfcc6
Binary files /dev/null and b/images/emoji/1f4ff.png differ
diff --git a/images/emoji/1f500.png b/images/emoji/1f500.png
new file mode 100644
index 000000000..5904badde
Binary files /dev/null and b/images/emoji/1f500.png differ
diff --git a/images/emoji/1f501.png b/images/emoji/1f501.png
new file mode 100644
index 000000000..540ce4e0f
Binary files /dev/null and b/images/emoji/1f501.png differ
diff --git a/images/emoji/1f502.png b/images/emoji/1f502.png
new file mode 100644
index 000000000..9567e8333
Binary files /dev/null and b/images/emoji/1f502.png differ
diff --git a/images/emoji/1f503.png b/images/emoji/1f503.png
new file mode 100644
index 000000000..26e49c383
Binary files /dev/null and b/images/emoji/1f503.png differ
diff --git a/images/emoji/1f504.png b/images/emoji/1f504.png
new file mode 100644
index 000000000..8d06d8e09
Binary files /dev/null and b/images/emoji/1f504.png differ
diff --git a/images/emoji/1f505.png b/images/emoji/1f505.png
new file mode 100644
index 000000000..543011d39
Binary files /dev/null and b/images/emoji/1f505.png differ
diff --git a/images/emoji/1f506.png b/images/emoji/1f506.png
new file mode 100644
index 000000000..c41f2d5fd
Binary files /dev/null and b/images/emoji/1f506.png differ
diff --git a/images/emoji/1f507.png b/images/emoji/1f507.png
new file mode 100644
index 000000000..7c1788e50
Binary files /dev/null and b/images/emoji/1f507.png differ
diff --git a/images/emoji/1f508.png b/images/emoji/1f508.png
new file mode 100644
index 000000000..7bcffb8fc
Binary files /dev/null and b/images/emoji/1f508.png differ
diff --git a/images/emoji/1f509.png b/images/emoji/1f509.png
new file mode 100644
index 000000000..e75ddca53
Binary files /dev/null and b/images/emoji/1f509.png differ
diff --git a/images/emoji/1f50a.png b/images/emoji/1f50a.png
new file mode 100644
index 000000000..8370033a5
Binary files /dev/null and b/images/emoji/1f50a.png differ
diff --git a/images/emoji/1f50b.png b/images/emoji/1f50b.png
new file mode 100644
index 000000000..f593e2bdb
Binary files /dev/null and b/images/emoji/1f50b.png differ
diff --git a/images/emoji/1f50c.png b/images/emoji/1f50c.png
new file mode 100644
index 000000000..31d1eb215
Binary files /dev/null and b/images/emoji/1f50c.png differ
diff --git a/images/emoji/1f50d.png b/images/emoji/1f50d.png
new file mode 100644
index 000000000..55487156a
Binary files /dev/null and b/images/emoji/1f50d.png differ
diff --git a/images/emoji/1f50e.png b/images/emoji/1f50e.png
new file mode 100644
index 000000000..0f4b1bca8
Binary files /dev/null and b/images/emoji/1f50e.png differ
diff --git a/images/emoji/1f50f.png b/images/emoji/1f50f.png
new file mode 100644
index 000000000..19a07d162
Binary files /dev/null and b/images/emoji/1f50f.png differ
diff --git a/images/emoji/1f510.png b/images/emoji/1f510.png
new file mode 100644
index 000000000..1c1cd5d07
Binary files /dev/null and b/images/emoji/1f510.png differ
diff --git a/images/emoji/1f511.png b/images/emoji/1f511.png
new file mode 100644
index 000000000..319cd1b88
Binary files /dev/null and b/images/emoji/1f511.png differ
diff --git a/images/emoji/1f512.png b/images/emoji/1f512.png
new file mode 100644
index 000000000..5a739c466
Binary files /dev/null and b/images/emoji/1f512.png differ
diff --git a/images/emoji/1f513.png b/images/emoji/1f513.png
new file mode 100644
index 000000000..4a74a6939
Binary files /dev/null and b/images/emoji/1f513.png differ
diff --git a/images/emoji/1f514.png b/images/emoji/1f514.png
new file mode 100644
index 000000000..776f4fdd0
Binary files /dev/null and b/images/emoji/1f514.png differ
diff --git a/images/emoji/1f515.png b/images/emoji/1f515.png
new file mode 100644
index 000000000..15cb38dd1
Binary files /dev/null and b/images/emoji/1f515.png differ
diff --git a/images/emoji/1f516.png b/images/emoji/1f516.png
new file mode 100644
index 000000000..bbb444611
Binary files /dev/null and b/images/emoji/1f516.png differ
diff --git a/images/emoji/1f517.png b/images/emoji/1f517.png
new file mode 100644
index 000000000..ae20f0f8e
Binary files /dev/null and b/images/emoji/1f517.png differ
diff --git a/images/emoji/1f518.png b/images/emoji/1f518.png
new file mode 100644
index 000000000..3a23449d9
Binary files /dev/null and b/images/emoji/1f518.png differ
diff --git a/images/emoji/1f519.png b/images/emoji/1f519.png
new file mode 100644
index 000000000..d32c5d4f1
Binary files /dev/null and b/images/emoji/1f519.png differ
diff --git a/images/emoji/1f51a.png b/images/emoji/1f51a.png
new file mode 100644
index 000000000..ef3ccd5f3
Binary files /dev/null and b/images/emoji/1f51a.png differ
diff --git a/images/emoji/1f51b.png b/images/emoji/1f51b.png
new file mode 100644
index 000000000..a0c371ae2
Binary files /dev/null and b/images/emoji/1f51b.png differ
diff --git a/images/emoji/1f51c.png b/images/emoji/1f51c.png
new file mode 100644
index 000000000..8cdfd8669
Binary files /dev/null and b/images/emoji/1f51c.png differ
diff --git a/images/emoji/1f51d.png b/images/emoji/1f51d.png
new file mode 100644
index 000000000..49dea8c08
Binary files /dev/null and b/images/emoji/1f51d.png differ
diff --git a/images/emoji/1f51e.png b/images/emoji/1f51e.png
new file mode 100644
index 000000000..6dfe6da51
Binary files /dev/null and b/images/emoji/1f51e.png differ
diff --git a/images/emoji/1f51f.png b/images/emoji/1f51f.png
new file mode 100644
index 000000000..782d40049
Binary files /dev/null and b/images/emoji/1f51f.png differ
diff --git a/images/emoji/1f520.png b/images/emoji/1f520.png
new file mode 100644
index 000000000..fe9482d2d
Binary files /dev/null and b/images/emoji/1f520.png differ
diff --git a/images/emoji/1f521.png b/images/emoji/1f521.png
new file mode 100644
index 000000000..0996a8705
Binary files /dev/null and b/images/emoji/1f521.png differ
diff --git a/images/emoji/1f522.png b/images/emoji/1f522.png
new file mode 100644
index 000000000..248dc7e55
Binary files /dev/null and b/images/emoji/1f522.png differ
diff --git a/images/emoji/1f523.png b/images/emoji/1f523.png
new file mode 100644
index 000000000..ac2fc1f35
Binary files /dev/null and b/images/emoji/1f523.png differ
diff --git a/images/emoji/1f524.png b/images/emoji/1f524.png
new file mode 100644
index 000000000..7688de692
Binary files /dev/null and b/images/emoji/1f524.png differ
diff --git a/images/emoji/1f525.png b/images/emoji/1f525.png
new file mode 100644
index 000000000..bd3775a46
Binary files /dev/null and b/images/emoji/1f525.png differ
diff --git a/images/emoji/1f526.png b/images/emoji/1f526.png
new file mode 100644
index 000000000..eee36c250
Binary files /dev/null and b/images/emoji/1f526.png differ
diff --git a/images/emoji/1f527.png b/images/emoji/1f527.png
new file mode 100644
index 000000000..c16b74396
Binary files /dev/null and b/images/emoji/1f527.png differ
diff --git a/images/emoji/1f528.png b/images/emoji/1f528.png
new file mode 100644
index 000000000..00736cce4
Binary files /dev/null and b/images/emoji/1f528.png differ
diff --git a/images/emoji/1f529.png b/images/emoji/1f529.png
new file mode 100644
index 000000000..4b9ae1553
Binary files /dev/null and b/images/emoji/1f529.png differ
diff --git a/images/emoji/1f52a.png b/images/emoji/1f52a.png
new file mode 100644
index 000000000..1acb9f307
Binary files /dev/null and b/images/emoji/1f52a.png differ
diff --git a/images/emoji/1f52b.png b/images/emoji/1f52b.png
new file mode 100644
index 000000000..89c5c244c
Binary files /dev/null and b/images/emoji/1f52b.png differ
diff --git a/images/emoji/1f52c.png b/images/emoji/1f52c.png
new file mode 100644
index 000000000..90f5acf6a
Binary files /dev/null and b/images/emoji/1f52c.png differ
diff --git a/images/emoji/1f52d.png b/images/emoji/1f52d.png
new file mode 100644
index 000000000..d63154614
Binary files /dev/null and b/images/emoji/1f52d.png differ
diff --git a/images/emoji/1f52e.png b/images/emoji/1f52e.png
new file mode 100644
index 000000000..54334c18b
Binary files /dev/null and b/images/emoji/1f52e.png differ
diff --git a/images/emoji/1f52f.png b/images/emoji/1f52f.png
new file mode 100644
index 000000000..2eb170745
Binary files /dev/null and b/images/emoji/1f52f.png differ
diff --git a/images/emoji/1f530.png b/images/emoji/1f530.png
new file mode 100644
index 000000000..bc434fb7c
Binary files /dev/null and b/images/emoji/1f530.png differ
diff --git a/images/emoji/1f531.png b/images/emoji/1f531.png
new file mode 100644
index 000000000..777a1dad1
Binary files /dev/null and b/images/emoji/1f531.png differ
diff --git a/images/emoji/1f532.png b/images/emoji/1f532.png
new file mode 100644
index 000000000..a78fc2f6b
Binary files /dev/null and b/images/emoji/1f532.png differ
diff --git a/images/emoji/1f533.png b/images/emoji/1f533.png
new file mode 100644
index 000000000..934b1cedf
Binary files /dev/null and b/images/emoji/1f533.png differ
diff --git a/images/emoji/1f534.png b/images/emoji/1f534.png
new file mode 100644
index 000000000..4bef930d9
Binary files /dev/null and b/images/emoji/1f534.png differ
diff --git a/images/emoji/1f535.png b/images/emoji/1f535.png
new file mode 100644
index 000000000..84078ef31
Binary files /dev/null and b/images/emoji/1f535.png differ
diff --git a/images/emoji/1f536.png b/images/emoji/1f536.png
new file mode 100644
index 000000000..73ff0ac36
Binary files /dev/null and b/images/emoji/1f536.png differ
diff --git a/images/emoji/1f537.png b/images/emoji/1f537.png
new file mode 100644
index 000000000..416a58bd5
Binary files /dev/null and b/images/emoji/1f537.png differ
diff --git a/images/emoji/1f538.png b/images/emoji/1f538.png
new file mode 100644
index 000000000..e1c6ed9b2
Binary files /dev/null and b/images/emoji/1f538.png differ
diff --git a/images/emoji/1f539.png b/images/emoji/1f539.png
new file mode 100644
index 000000000..b86b5bc4d
Binary files /dev/null and b/images/emoji/1f539.png differ
diff --git a/images/emoji/1f53a.png b/images/emoji/1f53a.png
new file mode 100644
index 000000000..785887c19
Binary files /dev/null and b/images/emoji/1f53a.png differ
diff --git a/images/emoji/1f53b.png b/images/emoji/1f53b.png
new file mode 100644
index 000000000..a83beff19
Binary files /dev/null and b/images/emoji/1f53b.png differ
diff --git a/images/emoji/1f53c.png b/images/emoji/1f53c.png
new file mode 100644
index 000000000..20a13dcd5
Binary files /dev/null and b/images/emoji/1f53c.png differ
diff --git a/images/emoji/1f53d.png b/images/emoji/1f53d.png
new file mode 100644
index 000000000..5870b9a22
Binary files /dev/null and b/images/emoji/1f53d.png differ
diff --git a/images/emoji/1f549.png b/images/emoji/1f549.png
new file mode 100644
index 000000000..a35c63c45
Binary files /dev/null and b/images/emoji/1f549.png differ
diff --git a/images/emoji/1f54a.png b/images/emoji/1f54a.png
new file mode 100644
index 000000000..9580c4917
Binary files /dev/null and b/images/emoji/1f54a.png differ
diff --git a/images/emoji/1f54b.png b/images/emoji/1f54b.png
new file mode 100644
index 000000000..1778c1138
Binary files /dev/null and b/images/emoji/1f54b.png differ
diff --git a/images/emoji/1f54c.png b/images/emoji/1f54c.png
new file mode 100644
index 000000000..ef770b26d
Binary files /dev/null and b/images/emoji/1f54c.png differ
diff --git a/images/emoji/1f54d.png b/images/emoji/1f54d.png
new file mode 100644
index 000000000..ee347904c
Binary files /dev/null and b/images/emoji/1f54d.png differ
diff --git a/images/emoji/1f54e.png b/images/emoji/1f54e.png
new file mode 100644
index 000000000..b42973628
Binary files /dev/null and b/images/emoji/1f54e.png differ
diff --git a/images/emoji/1f550.png b/images/emoji/1f550.png
new file mode 100644
index 000000000..d6e34941f
Binary files /dev/null and b/images/emoji/1f550.png differ
diff --git a/images/emoji/1f551.png b/images/emoji/1f551.png
new file mode 100644
index 000000000..a54253d7d
Binary files /dev/null and b/images/emoji/1f551.png differ
diff --git a/images/emoji/1f552.png b/images/emoji/1f552.png
new file mode 100644
index 000000000..27ec4b1f5
Binary files /dev/null and b/images/emoji/1f552.png differ
diff --git a/images/emoji/1f553.png b/images/emoji/1f553.png
new file mode 100644
index 000000000..60a1ef4cc
Binary files /dev/null and b/images/emoji/1f553.png differ
diff --git a/images/emoji/1f554.png b/images/emoji/1f554.png
new file mode 100644
index 000000000..c9382d1e0
Binary files /dev/null and b/images/emoji/1f554.png differ
diff --git a/images/emoji/1f555.png b/images/emoji/1f555.png
new file mode 100644
index 000000000..8fd5d3f5b
Binary files /dev/null and b/images/emoji/1f555.png differ
diff --git a/images/emoji/1f556.png b/images/emoji/1f556.png
new file mode 100644
index 000000000..8c7084036
Binary files /dev/null and b/images/emoji/1f556.png differ
diff --git a/images/emoji/1f557.png b/images/emoji/1f557.png
new file mode 100644
index 000000000..fcddf722e
Binary files /dev/null and b/images/emoji/1f557.png differ
diff --git a/images/emoji/1f558.png b/images/emoji/1f558.png
new file mode 100644
index 000000000..dfbe01179
Binary files /dev/null and b/images/emoji/1f558.png differ
diff --git a/images/emoji/1f559.png b/images/emoji/1f559.png
new file mode 100644
index 000000000..e62b245cd
Binary files /dev/null and b/images/emoji/1f559.png differ
diff --git a/images/emoji/1f55a.png b/images/emoji/1f55a.png
new file mode 100644
index 000000000..098334527
Binary files /dev/null and b/images/emoji/1f55a.png differ
diff --git a/images/emoji/1f55b.png b/images/emoji/1f55b.png
new file mode 100644
index 000000000..e61caa4b3
Binary files /dev/null and b/images/emoji/1f55b.png differ
diff --git a/images/emoji/1f55c.png b/images/emoji/1f55c.png
new file mode 100644
index 000000000..86b7689b8
Binary files /dev/null and b/images/emoji/1f55c.png differ
diff --git a/images/emoji/1f55d.png b/images/emoji/1f55d.png
new file mode 100644
index 000000000..7a787e018
Binary files /dev/null and b/images/emoji/1f55d.png differ
diff --git a/images/emoji/1f55e.png b/images/emoji/1f55e.png
new file mode 100644
index 000000000..c6860395c
Binary files /dev/null and b/images/emoji/1f55e.png differ
diff --git a/images/emoji/1f55f.png b/images/emoji/1f55f.png
new file mode 100644
index 000000000..3c05b3621
Binary files /dev/null and b/images/emoji/1f55f.png differ
diff --git a/images/emoji/1f560.png b/images/emoji/1f560.png
new file mode 100644
index 000000000..c21fa926d
Binary files /dev/null and b/images/emoji/1f560.png differ
diff --git a/images/emoji/1f561.png b/images/emoji/1f561.png
new file mode 100644
index 000000000..2aec87fef
Binary files /dev/null and b/images/emoji/1f561.png differ
diff --git a/images/emoji/1f562.png b/images/emoji/1f562.png
new file mode 100644
index 000000000..f7a1135e0
Binary files /dev/null and b/images/emoji/1f562.png differ
diff --git a/images/emoji/1f563.png b/images/emoji/1f563.png
new file mode 100644
index 000000000..799b4aebc
Binary files /dev/null and b/images/emoji/1f563.png differ
diff --git a/images/emoji/1f564.png b/images/emoji/1f564.png
new file mode 100644
index 000000000..4a2092ee6
Binary files /dev/null and b/images/emoji/1f564.png differ
diff --git a/images/emoji/1f565.png b/images/emoji/1f565.png
new file mode 100644
index 000000000..0802b3c65
Binary files /dev/null and b/images/emoji/1f565.png differ
diff --git a/images/emoji/1f566.png b/images/emoji/1f566.png
new file mode 100644
index 000000000..d970d03b8
Binary files /dev/null and b/images/emoji/1f566.png differ
diff --git a/images/emoji/1f567.png b/images/emoji/1f567.png
new file mode 100644
index 000000000..f2b1d2617
Binary files /dev/null and b/images/emoji/1f567.png differ
diff --git a/images/emoji/1f56f.png b/images/emoji/1f56f.png
new file mode 100644
index 000000000..0b56444e3
Binary files /dev/null and b/images/emoji/1f56f.png differ
diff --git a/images/emoji/1f570.png b/images/emoji/1f570.png
new file mode 100644
index 000000000..ffdb451e3
Binary files /dev/null and b/images/emoji/1f570.png differ
diff --git a/images/emoji/1f573.png b/images/emoji/1f573.png
new file mode 100644
index 000000000..517d2ae0d
Binary files /dev/null and b/images/emoji/1f573.png differ
diff --git a/images/emoji/1f574.png b/images/emoji/1f574.png
new file mode 100644
index 000000000..3dc315a3d
Binary files /dev/null and b/images/emoji/1f574.png differ
diff --git a/images/emoji/1f575-1f3fb.png b/images/emoji/1f575-1f3fb.png
new file mode 100644
index 000000000..2d1c022ca
Binary files /dev/null and b/images/emoji/1f575-1f3fb.png differ
diff --git a/images/emoji/1f575-1f3fc.png b/images/emoji/1f575-1f3fc.png
new file mode 100644
index 000000000..13e01ad93
Binary files /dev/null and b/images/emoji/1f575-1f3fc.png differ
diff --git a/images/emoji/1f575-1f3fd.png b/images/emoji/1f575-1f3fd.png
new file mode 100644
index 000000000..a814dca2e
Binary files /dev/null and b/images/emoji/1f575-1f3fd.png differ
diff --git a/images/emoji/1f575-1f3fe.png b/images/emoji/1f575-1f3fe.png
new file mode 100644
index 000000000..d8300af49
Binary files /dev/null and b/images/emoji/1f575-1f3fe.png differ
diff --git a/images/emoji/1f575-1f3ff.png b/images/emoji/1f575-1f3ff.png
new file mode 100644
index 000000000..ca1462595
Binary files /dev/null and b/images/emoji/1f575-1f3ff.png differ
diff --git a/images/emoji/1f575.png b/images/emoji/1f575.png
new file mode 100644
index 000000000..a729e9584
Binary files /dev/null and b/images/emoji/1f575.png differ
diff --git a/images/emoji/1f576.png b/images/emoji/1f576.png
new file mode 100644
index 000000000..b1b6db0ac
Binary files /dev/null and b/images/emoji/1f576.png differ
diff --git a/images/emoji/1f577.png b/images/emoji/1f577.png
new file mode 100644
index 000000000..3849fa90b
Binary files /dev/null and b/images/emoji/1f577.png differ
diff --git a/images/emoji/1f578.png b/images/emoji/1f578.png
new file mode 100644
index 000000000..ba448ee7f
Binary files /dev/null and b/images/emoji/1f578.png differ
diff --git a/images/emoji/1f579.png b/images/emoji/1f579.png
new file mode 100644
index 000000000..1ee190543
Binary files /dev/null and b/images/emoji/1f579.png differ
diff --git a/images/emoji/1f57a-1f3fb.png b/images/emoji/1f57a-1f3fb.png
new file mode 100644
index 000000000..e0b9f82d9
Binary files /dev/null and b/images/emoji/1f57a-1f3fb.png differ
diff --git a/images/emoji/1f57a-1f3fc.png b/images/emoji/1f57a-1f3fc.png
new file mode 100644
index 000000000..a5beed56e
Binary files /dev/null and b/images/emoji/1f57a-1f3fc.png differ
diff --git a/images/emoji/1f57a-1f3fd.png b/images/emoji/1f57a-1f3fd.png
new file mode 100644
index 000000000..2fa20180a
Binary files /dev/null and b/images/emoji/1f57a-1f3fd.png differ
diff --git a/images/emoji/1f57a-1f3fe.png b/images/emoji/1f57a-1f3fe.png
new file mode 100644
index 000000000..bd3528c83
Binary files /dev/null and b/images/emoji/1f57a-1f3fe.png differ
diff --git a/images/emoji/1f57a-1f3ff.png b/images/emoji/1f57a-1f3ff.png
new file mode 100644
index 000000000..41fd4f880
Binary files /dev/null and b/images/emoji/1f57a-1f3ff.png differ
diff --git a/images/emoji/1f57a.png b/images/emoji/1f57a.png
new file mode 100644
index 000000000..ccff3bede
Binary files /dev/null and b/images/emoji/1f57a.png differ
diff --git a/images/emoji/1f587.png b/images/emoji/1f587.png
new file mode 100644
index 000000000..76021e8c7
Binary files /dev/null and b/images/emoji/1f587.png differ
diff --git a/images/emoji/1f58a.png b/images/emoji/1f58a.png
new file mode 100644
index 000000000..6ef7a3424
Binary files /dev/null and b/images/emoji/1f58a.png differ
diff --git a/images/emoji/1f58b.png b/images/emoji/1f58b.png
new file mode 100644
index 000000000..3ca4bd2c2
Binary files /dev/null and b/images/emoji/1f58b.png differ
diff --git a/images/emoji/1f58c.png b/images/emoji/1f58c.png
new file mode 100644
index 000000000..28bffbaa3
Binary files /dev/null and b/images/emoji/1f58c.png differ
diff --git a/images/emoji/1f58d.png b/images/emoji/1f58d.png
new file mode 100644
index 000000000..8d7b427aa
Binary files /dev/null and b/images/emoji/1f58d.png differ
diff --git a/images/emoji/1f590-1f3fb.png b/images/emoji/1f590-1f3fb.png
new file mode 100644
index 000000000..a7888e6bd
Binary files /dev/null and b/images/emoji/1f590-1f3fb.png differ
diff --git a/images/emoji/1f590-1f3fc.png b/images/emoji/1f590-1f3fc.png
new file mode 100644
index 000000000..cc10fbc27
Binary files /dev/null and b/images/emoji/1f590-1f3fc.png differ
diff --git a/images/emoji/1f590-1f3fd.png b/images/emoji/1f590-1f3fd.png
new file mode 100644
index 000000000..707236ae8
Binary files /dev/null and b/images/emoji/1f590-1f3fd.png differ
diff --git a/images/emoji/1f590-1f3fe.png b/images/emoji/1f590-1f3fe.png
new file mode 100644
index 000000000..1430df9c6
Binary files /dev/null and b/images/emoji/1f590-1f3fe.png differ
diff --git a/images/emoji/1f590-1f3ff.png b/images/emoji/1f590-1f3ff.png
new file mode 100644
index 000000000..80bec971b
Binary files /dev/null and b/images/emoji/1f590-1f3ff.png differ
diff --git a/images/emoji/1f590.png b/images/emoji/1f590.png
new file mode 100644
index 000000000..fb5ae8ebb
Binary files /dev/null and b/images/emoji/1f590.png differ
diff --git a/images/emoji/1f595-1f3fb.png b/images/emoji/1f595-1f3fb.png
new file mode 100644
index 000000000..61ef12a15
Binary files /dev/null and b/images/emoji/1f595-1f3fb.png differ
diff --git a/images/emoji/1f595-1f3fc.png b/images/emoji/1f595-1f3fc.png
new file mode 100644
index 000000000..c31a69be9
Binary files /dev/null and b/images/emoji/1f595-1f3fc.png differ
diff --git a/images/emoji/1f595-1f3fd.png b/images/emoji/1f595-1f3fd.png
new file mode 100644
index 000000000..73ac216ce
Binary files /dev/null and b/images/emoji/1f595-1f3fd.png differ
diff --git a/images/emoji/1f595-1f3fe.png b/images/emoji/1f595-1f3fe.png
new file mode 100644
index 000000000..80b8ab770
Binary files /dev/null and b/images/emoji/1f595-1f3fe.png differ
diff --git a/images/emoji/1f595-1f3ff.png b/images/emoji/1f595-1f3ff.png
new file mode 100644
index 000000000..a8826b196
Binary files /dev/null and b/images/emoji/1f595-1f3ff.png differ
diff --git a/images/emoji/1f595.png b/images/emoji/1f595.png
new file mode 100644
index 000000000..697f7a25e
Binary files /dev/null and b/images/emoji/1f595.png differ
diff --git a/images/emoji/1f596-1f3fb.png b/images/emoji/1f596-1f3fb.png
new file mode 100644
index 000000000..8aff5d8fa
Binary files /dev/null and b/images/emoji/1f596-1f3fb.png differ
diff --git a/images/emoji/1f596-1f3fc.png b/images/emoji/1f596-1f3fc.png
new file mode 100644
index 000000000..82b7ad519
Binary files /dev/null and b/images/emoji/1f596-1f3fc.png differ
diff --git a/images/emoji/1f596-1f3fd.png b/images/emoji/1f596-1f3fd.png
new file mode 100644
index 000000000..d1400e1dd
Binary files /dev/null and b/images/emoji/1f596-1f3fd.png differ
diff --git a/images/emoji/1f596-1f3fe.png b/images/emoji/1f596-1f3fe.png
new file mode 100644
index 000000000..47e2b2801
Binary files /dev/null and b/images/emoji/1f596-1f3fe.png differ
diff --git a/images/emoji/1f596-1f3ff.png b/images/emoji/1f596-1f3ff.png
new file mode 100644
index 000000000..60b5c6077
Binary files /dev/null and b/images/emoji/1f596-1f3ff.png differ
diff --git a/images/emoji/1f596.png b/images/emoji/1f596.png
new file mode 100644
index 000000000..54728bcaf
Binary files /dev/null and b/images/emoji/1f596.png differ
diff --git a/images/emoji/1f5a4.png b/images/emoji/1f5a4.png
new file mode 100644
index 000000000..b4068c3e6
Binary files /dev/null and b/images/emoji/1f5a4.png differ
diff --git a/images/emoji/1f5a5.png b/images/emoji/1f5a5.png
new file mode 100644
index 000000000..909bd42b5
Binary files /dev/null and b/images/emoji/1f5a5.png differ
diff --git a/images/emoji/1f5a8.png b/images/emoji/1f5a8.png
new file mode 100644
index 000000000..027c830f0
Binary files /dev/null and b/images/emoji/1f5a8.png differ
diff --git a/images/emoji/1f5b1.png b/images/emoji/1f5b1.png
new file mode 100644
index 000000000..e84e96ff6
Binary files /dev/null and b/images/emoji/1f5b1.png differ
diff --git a/images/emoji/1f5b2.png b/images/emoji/1f5b2.png
new file mode 100644
index 000000000..3bea84ad7
Binary files /dev/null and b/images/emoji/1f5b2.png differ
diff --git a/images/emoji/1f5bc.png b/images/emoji/1f5bc.png
new file mode 100644
index 000000000..9fe84607b
Binary files /dev/null and b/images/emoji/1f5bc.png differ
diff --git a/images/emoji/1f5c2.png b/images/emoji/1f5c2.png
new file mode 100644
index 000000000..46a7e403f
Binary files /dev/null and b/images/emoji/1f5c2.png differ
diff --git a/images/emoji/1f5c3.png b/images/emoji/1f5c3.png
new file mode 100644
index 000000000..f2e764ce5
Binary files /dev/null and b/images/emoji/1f5c3.png differ
diff --git a/images/emoji/1f5c4.png b/images/emoji/1f5c4.png
new file mode 100644
index 000000000..fddc65dde
Binary files /dev/null and b/images/emoji/1f5c4.png differ
diff --git a/images/emoji/1f5d1.png b/images/emoji/1f5d1.png
new file mode 100644
index 000000000..2b3c484b4
Binary files /dev/null and b/images/emoji/1f5d1.png differ
diff --git a/images/emoji/1f5d2.png b/images/emoji/1f5d2.png
new file mode 100644
index 000000000..85faa10d8
Binary files /dev/null and b/images/emoji/1f5d2.png differ
diff --git a/images/emoji/1f5d3.png b/images/emoji/1f5d3.png
new file mode 100644
index 000000000..dec8d49bf
Binary files /dev/null and b/images/emoji/1f5d3.png differ
diff --git a/images/emoji/1f5dc.png b/images/emoji/1f5dc.png
new file mode 100644
index 000000000..67c13258d
Binary files /dev/null and b/images/emoji/1f5dc.png differ
diff --git a/images/emoji/1f5dd.png b/images/emoji/1f5dd.png
new file mode 100644
index 000000000..e11d706c6
Binary files /dev/null and b/images/emoji/1f5dd.png differ
diff --git a/images/emoji/1f5de.png b/images/emoji/1f5de.png
new file mode 100644
index 000000000..f64748df2
Binary files /dev/null and b/images/emoji/1f5de.png differ
diff --git a/images/emoji/1f5e1.png b/images/emoji/1f5e1.png
new file mode 100644
index 000000000..66e97b0aa
Binary files /dev/null and b/images/emoji/1f5e1.png differ
diff --git a/images/emoji/1f5e3.png b/images/emoji/1f5e3.png
new file mode 100644
index 000000000..2df93aaae
Binary files /dev/null and b/images/emoji/1f5e3.png differ
diff --git a/images/emoji/1f5e8.png b/images/emoji/1f5e8.png
new file mode 100644
index 000000000..00c05959b
Binary files /dev/null and b/images/emoji/1f5e8.png differ
diff --git a/images/emoji/1f5ef.png b/images/emoji/1f5ef.png
new file mode 100644
index 000000000..f5c97c4d2
Binary files /dev/null and b/images/emoji/1f5ef.png differ
diff --git a/images/emoji/1f5f3.png b/images/emoji/1f5f3.png
new file mode 100644
index 000000000..9b6767aea
Binary files /dev/null and b/images/emoji/1f5f3.png differ
diff --git a/images/emoji/1f5fa.png b/images/emoji/1f5fa.png
new file mode 100644
index 000000000..15efe32c7
Binary files /dev/null and b/images/emoji/1f5fa.png differ
diff --git a/images/emoji/1f5fb.png b/images/emoji/1f5fb.png
new file mode 100644
index 000000000..88a547524
Binary files /dev/null and b/images/emoji/1f5fb.png differ
diff --git a/images/emoji/1f5fc.png b/images/emoji/1f5fc.png
new file mode 100644
index 000000000..37df7fc65
Binary files /dev/null and b/images/emoji/1f5fc.png differ
diff --git a/images/emoji/1f5fd.png b/images/emoji/1f5fd.png
new file mode 100644
index 000000000..05df8289b
Binary files /dev/null and b/images/emoji/1f5fd.png differ
diff --git a/images/emoji/1f5fe.png b/images/emoji/1f5fe.png
new file mode 100644
index 000000000..d86d0a59e
Binary files /dev/null and b/images/emoji/1f5fe.png differ
diff --git a/images/emoji/1f5ff.png b/images/emoji/1f5ff.png
new file mode 100644
index 000000000..e6a7779c4
Binary files /dev/null and b/images/emoji/1f5ff.png differ
diff --git a/images/emoji/1f600.png b/images/emoji/1f600.png
new file mode 100644
index 000000000..3e8e0dab7
Binary files /dev/null and b/images/emoji/1f600.png differ
diff --git a/images/emoji/1f601.png b/images/emoji/1f601.png
new file mode 100644
index 000000000..418d94c81
Binary files /dev/null and b/images/emoji/1f601.png differ
diff --git a/images/emoji/1f602.png b/images/emoji/1f602.png
new file mode 100644
index 000000000..0ba3b1859
Binary files /dev/null and b/images/emoji/1f602.png differ
diff --git a/images/emoji/1f603.png b/images/emoji/1f603.png
new file mode 100644
index 000000000..30957a659
Binary files /dev/null and b/images/emoji/1f603.png differ
diff --git a/images/emoji/1f604.png b/images/emoji/1f604.png
new file mode 100644
index 000000000..aa47ffe97
Binary files /dev/null and b/images/emoji/1f604.png differ
diff --git a/images/emoji/1f605.png b/images/emoji/1f605.png
new file mode 100644
index 000000000..cb18d9c89
Binary files /dev/null and b/images/emoji/1f605.png differ
diff --git a/images/emoji/1f606.png b/images/emoji/1f606.png
new file mode 100644
index 000000000..d94e9505b
Binary files /dev/null and b/images/emoji/1f606.png differ
diff --git a/images/emoji/1f607.png b/images/emoji/1f607.png
new file mode 100644
index 000000000..57f515112
Binary files /dev/null and b/images/emoji/1f607.png differ
diff --git a/images/emoji/1f608.png b/images/emoji/1f608.png
new file mode 100644
index 000000000..cc2c5f1ec
Binary files /dev/null and b/images/emoji/1f608.png differ
diff --git a/images/emoji/1f609.png b/images/emoji/1f609.png
new file mode 100644
index 000000000..7ea7810a3
Binary files /dev/null and b/images/emoji/1f609.png differ
diff --git a/images/emoji/1f60a.png b/images/emoji/1f60a.png
new file mode 100644
index 000000000..aac1a424a
Binary files /dev/null and b/images/emoji/1f60a.png differ
diff --git a/images/emoji/1f60b.png b/images/emoji/1f60b.png
new file mode 100644
index 000000000..2df15753c
Binary files /dev/null and b/images/emoji/1f60b.png differ
diff --git a/images/emoji/1f60c.png b/images/emoji/1f60c.png
new file mode 100644
index 000000000..715ad0bf5
Binary files /dev/null and b/images/emoji/1f60c.png differ
diff --git a/images/emoji/1f60d.png b/images/emoji/1f60d.png
new file mode 100644
index 000000000..73fbee29d
Binary files /dev/null and b/images/emoji/1f60d.png differ
diff --git a/images/emoji/1f60e.png b/images/emoji/1f60e.png
new file mode 100644
index 000000000..200117351
Binary files /dev/null and b/images/emoji/1f60e.png differ
diff --git a/images/emoji/1f60f.png b/images/emoji/1f60f.png
new file mode 100644
index 000000000..878521099
Binary files /dev/null and b/images/emoji/1f60f.png differ
diff --git a/images/emoji/1f610.png b/images/emoji/1f610.png
new file mode 100644
index 000000000..065d193af
Binary files /dev/null and b/images/emoji/1f610.png differ
diff --git a/images/emoji/1f611.png b/images/emoji/1f611.png
new file mode 100644
index 000000000..2954017f6
Binary files /dev/null and b/images/emoji/1f611.png differ
diff --git a/images/emoji/1f612.png b/images/emoji/1f612.png
new file mode 100644
index 000000000..25e3677f2
Binary files /dev/null and b/images/emoji/1f612.png differ
diff --git a/images/emoji/1f613.png b/images/emoji/1f613.png
new file mode 100644
index 000000000..f0dae7b78
Binary files /dev/null and b/images/emoji/1f613.png differ
diff --git a/images/emoji/1f614.png b/images/emoji/1f614.png
new file mode 100644
index 000000000..490fb5669
Binary files /dev/null and b/images/emoji/1f614.png differ
diff --git a/images/emoji/1f615.png b/images/emoji/1f615.png
new file mode 100644
index 000000000..502b6bf0e
Binary files /dev/null and b/images/emoji/1f615.png differ
diff --git a/images/emoji/1f616.png b/images/emoji/1f616.png
new file mode 100644
index 000000000..aa4b29e93
Binary files /dev/null and b/images/emoji/1f616.png differ
diff --git a/images/emoji/1f617.png b/images/emoji/1f617.png
new file mode 100644
index 000000000..39d325fd8
Binary files /dev/null and b/images/emoji/1f617.png differ
diff --git a/images/emoji/1f618.png b/images/emoji/1f618.png
new file mode 100644
index 000000000..0ff808fd6
Binary files /dev/null and b/images/emoji/1f618.png differ
diff --git a/images/emoji/1f619.png b/images/emoji/1f619.png
new file mode 100644
index 000000000..e181f1709
Binary files /dev/null and b/images/emoji/1f619.png differ
diff --git a/images/emoji/1f61a.png b/images/emoji/1f61a.png
new file mode 100644
index 000000000..b684d7d4d
Binary files /dev/null and b/images/emoji/1f61a.png differ
diff --git a/images/emoji/1f61b.png b/images/emoji/1f61b.png
new file mode 100644
index 000000000..25757341f
Binary files /dev/null and b/images/emoji/1f61b.png differ
diff --git a/images/emoji/1f61c.png b/images/emoji/1f61c.png
new file mode 100644
index 000000000..4817eaa3d
Binary files /dev/null and b/images/emoji/1f61c.png differ
diff --git a/images/emoji/1f61d.png b/images/emoji/1f61d.png
new file mode 100644
index 000000000..5c0401e9b
Binary files /dev/null and b/images/emoji/1f61d.png differ
diff --git a/images/emoji/1f61e.png b/images/emoji/1f61e.png
new file mode 100644
index 000000000..efe4e67e2
Binary files /dev/null and b/images/emoji/1f61e.png differ
diff --git a/images/emoji/1f61f.png b/images/emoji/1f61f.png
new file mode 100644
index 000000000..7074afcf5
Binary files /dev/null and b/images/emoji/1f61f.png differ
diff --git a/images/emoji/1f620.png b/images/emoji/1f620.png
new file mode 100644
index 000000000..cfc4a6ecd
Binary files /dev/null and b/images/emoji/1f620.png differ
diff --git a/images/emoji/1f621.png b/images/emoji/1f621.png
new file mode 100644
index 000000000..9d739bd40
Binary files /dev/null and b/images/emoji/1f621.png differ
diff --git a/images/emoji/1f622.png b/images/emoji/1f622.png
new file mode 100644
index 000000000..b7877f8a1
Binary files /dev/null and b/images/emoji/1f622.png differ
diff --git a/images/emoji/1f623.png b/images/emoji/1f623.png
new file mode 100644
index 000000000..646a05fe9
Binary files /dev/null and b/images/emoji/1f623.png differ
diff --git a/images/emoji/1f624.png b/images/emoji/1f624.png
new file mode 100644
index 000000000..4f3312854
Binary files /dev/null and b/images/emoji/1f624.png differ
diff --git a/images/emoji/1f625.png b/images/emoji/1f625.png
new file mode 100644
index 000000000..aef864d2b
Binary files /dev/null and b/images/emoji/1f625.png differ
diff --git a/images/emoji/1f626.png b/images/emoji/1f626.png
new file mode 100644
index 000000000..43ab6b0a1
Binary files /dev/null and b/images/emoji/1f626.png differ
diff --git a/images/emoji/1f627.png b/images/emoji/1f627.png
new file mode 100644
index 000000000..f99026a3b
Binary files /dev/null and b/images/emoji/1f627.png differ
diff --git a/images/emoji/1f628.png b/images/emoji/1f628.png
new file mode 100644
index 000000000..eb8b347ce
Binary files /dev/null and b/images/emoji/1f628.png differ
diff --git a/images/emoji/1f629.png b/images/emoji/1f629.png
new file mode 100644
index 000000000..98bfbd24a
Binary files /dev/null and b/images/emoji/1f629.png differ
diff --git a/images/emoji/1f62a.png b/images/emoji/1f62a.png
new file mode 100644
index 000000000..836b41077
Binary files /dev/null and b/images/emoji/1f62a.png differ
diff --git a/images/emoji/1f62b.png b/images/emoji/1f62b.png
new file mode 100644
index 000000000..19aba1bc1
Binary files /dev/null and b/images/emoji/1f62b.png differ
diff --git a/images/emoji/1f62c.png b/images/emoji/1f62c.png
new file mode 100644
index 000000000..871b2f071
Binary files /dev/null and b/images/emoji/1f62c.png differ
diff --git a/images/emoji/1f62d.png b/images/emoji/1f62d.png
new file mode 100644
index 000000000..e4f818360
Binary files /dev/null and b/images/emoji/1f62d.png differ
diff --git a/images/emoji/1f62e.png b/images/emoji/1f62e.png
new file mode 100644
index 000000000..a62cd27e1
Binary files /dev/null and b/images/emoji/1f62e.png differ
diff --git a/images/emoji/1f62f.png b/images/emoji/1f62f.png
new file mode 100644
index 000000000..cad0e2313
Binary files /dev/null and b/images/emoji/1f62f.png differ
diff --git a/images/emoji/1f630.png b/images/emoji/1f630.png
new file mode 100644
index 000000000..85b2231bb
Binary files /dev/null and b/images/emoji/1f630.png differ
diff --git a/images/emoji/1f631.png b/images/emoji/1f631.png
new file mode 100644
index 000000000..6ab43a0d3
Binary files /dev/null and b/images/emoji/1f631.png differ
diff --git a/images/emoji/1f632.png b/images/emoji/1f632.png
new file mode 100644
index 000000000..bd0ac55ec
Binary files /dev/null and b/images/emoji/1f632.png differ
diff --git a/images/emoji/1f633.png b/images/emoji/1f633.png
new file mode 100644
index 000000000..829220bc4
Binary files /dev/null and b/images/emoji/1f633.png differ
diff --git a/images/emoji/1f634.png b/images/emoji/1f634.png
new file mode 100644
index 000000000..9ecf600d6
Binary files /dev/null and b/images/emoji/1f634.png differ
diff --git a/images/emoji/1f635.png b/images/emoji/1f635.png
new file mode 100644
index 000000000..3120316ab
Binary files /dev/null and b/images/emoji/1f635.png differ
diff --git a/images/emoji/1f636.png b/images/emoji/1f636.png
new file mode 100644
index 000000000..b642f6c11
Binary files /dev/null and b/images/emoji/1f636.png differ
diff --git a/images/emoji/1f637.png b/images/emoji/1f637.png
new file mode 100644
index 000000000..23852e578
Binary files /dev/null and b/images/emoji/1f637.png differ
diff --git a/images/emoji/1f638.png b/images/emoji/1f638.png
new file mode 100644
index 000000000..e27290a67
Binary files /dev/null and b/images/emoji/1f638.png differ
diff --git a/images/emoji/1f639.png b/images/emoji/1f639.png
new file mode 100644
index 000000000..aac353179
Binary files /dev/null and b/images/emoji/1f639.png differ
diff --git a/images/emoji/1f63a.png b/images/emoji/1f63a.png
new file mode 100644
index 000000000..d5b1cef0b
Binary files /dev/null and b/images/emoji/1f63a.png differ
diff --git a/images/emoji/1f63b.png b/images/emoji/1f63b.png
new file mode 100644
index 000000000..5a59eed04
Binary files /dev/null and b/images/emoji/1f63b.png differ
diff --git a/images/emoji/1f63c.png b/images/emoji/1f63c.png
new file mode 100644
index 000000000..0bfeae4eb
Binary files /dev/null and b/images/emoji/1f63c.png differ
diff --git a/images/emoji/1f63d.png b/images/emoji/1f63d.png
new file mode 100644
index 000000000..7f1ef2056
Binary files /dev/null and b/images/emoji/1f63d.png differ
diff --git a/images/emoji/1f63e.png b/images/emoji/1f63e.png
new file mode 100644
index 000000000..41ddfeab4
Binary files /dev/null and b/images/emoji/1f63e.png differ
diff --git a/images/emoji/1f63f.png b/images/emoji/1f63f.png
new file mode 100644
index 000000000..ccc8d4f25
Binary files /dev/null and b/images/emoji/1f63f.png differ
diff --git a/images/emoji/1f640.png b/images/emoji/1f640.png
new file mode 100644
index 000000000..15803ad8e
Binary files /dev/null and b/images/emoji/1f640.png differ
diff --git a/images/emoji/1f641.png b/images/emoji/1f641.png
new file mode 100644
index 000000000..b2f1d983d
Binary files /dev/null and b/images/emoji/1f641.png differ
diff --git a/images/emoji/1f642.png b/images/emoji/1f642.png
new file mode 100644
index 000000000..ddd7d65dd
Binary files /dev/null and b/images/emoji/1f642.png differ
diff --git a/images/emoji/1f643.png b/images/emoji/1f643.png
new file mode 100644
index 000000000..128f31c98
Binary files /dev/null and b/images/emoji/1f643.png differ
diff --git a/images/emoji/1f644.png b/images/emoji/1f644.png
new file mode 100644
index 000000000..2f77b9fc3
Binary files /dev/null and b/images/emoji/1f644.png differ
diff --git a/images/emoji/1f645-1f3fb.png b/images/emoji/1f645-1f3fb.png
new file mode 100644
index 000000000..7f28bf121
Binary files /dev/null and b/images/emoji/1f645-1f3fb.png differ
diff --git a/images/emoji/1f645-1f3fc.png b/images/emoji/1f645-1f3fc.png
new file mode 100644
index 000000000..80d8021f8
Binary files /dev/null and b/images/emoji/1f645-1f3fc.png differ
diff --git a/images/emoji/1f645-1f3fd.png b/images/emoji/1f645-1f3fd.png
new file mode 100644
index 000000000..635e6a008
Binary files /dev/null and b/images/emoji/1f645-1f3fd.png differ
diff --git a/images/emoji/1f645-1f3fe.png b/images/emoji/1f645-1f3fe.png
new file mode 100644
index 000000000..42006e7da
Binary files /dev/null and b/images/emoji/1f645-1f3fe.png differ
diff --git a/images/emoji/1f645-1f3ff.png b/images/emoji/1f645-1f3ff.png
new file mode 100644
index 000000000..309096cba
Binary files /dev/null and b/images/emoji/1f645-1f3ff.png differ
diff --git a/images/emoji/1f645.png b/images/emoji/1f645.png
new file mode 100644
index 000000000..381753cd8
Binary files /dev/null and b/images/emoji/1f645.png differ
diff --git a/images/emoji/1f646-1f3fb.png b/images/emoji/1f646-1f3fb.png
new file mode 100644
index 000000000..ac28746a5
Binary files /dev/null and b/images/emoji/1f646-1f3fb.png differ
diff --git a/images/emoji/1f646-1f3fc.png b/images/emoji/1f646-1f3fc.png
new file mode 100644
index 000000000..5d845b042
Binary files /dev/null and b/images/emoji/1f646-1f3fc.png differ
diff --git a/images/emoji/1f646-1f3fd.png b/images/emoji/1f646-1f3fd.png
new file mode 100644
index 000000000..74c7b794f
Binary files /dev/null and b/images/emoji/1f646-1f3fd.png differ
diff --git a/images/emoji/1f646-1f3fe.png b/images/emoji/1f646-1f3fe.png
new file mode 100644
index 000000000..2fbcd7f67
Binary files /dev/null and b/images/emoji/1f646-1f3fe.png differ
diff --git a/images/emoji/1f646-1f3ff.png b/images/emoji/1f646-1f3ff.png
new file mode 100644
index 000000000..da2d13546
Binary files /dev/null and b/images/emoji/1f646-1f3ff.png differ
diff --git a/images/emoji/1f646.png b/images/emoji/1f646.png
new file mode 100644
index 000000000..3de4594bd
Binary files /dev/null and b/images/emoji/1f646.png differ
diff --git a/images/emoji/1f647-1f3fb.png b/images/emoji/1f647-1f3fb.png
new file mode 100644
index 000000000..003d66052
Binary files /dev/null and b/images/emoji/1f647-1f3fb.png differ
diff --git a/images/emoji/1f647-1f3fc.png b/images/emoji/1f647-1f3fc.png
new file mode 100644
index 000000000..d774be9c9
Binary files /dev/null and b/images/emoji/1f647-1f3fc.png differ
diff --git a/images/emoji/1f647-1f3fd.png b/images/emoji/1f647-1f3fd.png
new file mode 100644
index 000000000..43e06fd86
Binary files /dev/null and b/images/emoji/1f647-1f3fd.png differ
diff --git a/images/emoji/1f647-1f3fe.png b/images/emoji/1f647-1f3fe.png
new file mode 100644
index 000000000..2d0f1a7c7
Binary files /dev/null and b/images/emoji/1f647-1f3fe.png differ
diff --git a/images/emoji/1f647-1f3ff.png b/images/emoji/1f647-1f3ff.png
new file mode 100644
index 000000000..91f1a8ace
Binary files /dev/null and b/images/emoji/1f647-1f3ff.png differ
diff --git a/images/emoji/1f647.png b/images/emoji/1f647.png
new file mode 100644
index 000000000..3a0e83ee8
Binary files /dev/null and b/images/emoji/1f647.png differ
diff --git a/images/emoji/1f648.png b/images/emoji/1f648.png
new file mode 100644
index 000000000..5187e4745
Binary files /dev/null and b/images/emoji/1f648.png differ
diff --git a/images/emoji/1f649.png b/images/emoji/1f649.png
new file mode 100644
index 000000000..74b6be0c6
Binary files /dev/null and b/images/emoji/1f649.png differ
diff --git a/images/emoji/1f64a.png b/images/emoji/1f64a.png
new file mode 100644
index 000000000..c75f42ae7
Binary files /dev/null and b/images/emoji/1f64a.png differ
diff --git a/images/emoji/1f64b-1f3fb.png b/images/emoji/1f64b-1f3fb.png
new file mode 100644
index 000000000..1c90e3e26
Binary files /dev/null and b/images/emoji/1f64b-1f3fb.png differ
diff --git a/images/emoji/1f64b-1f3fc.png b/images/emoji/1f64b-1f3fc.png
new file mode 100644
index 000000000..82c3ef2bf
Binary files /dev/null and b/images/emoji/1f64b-1f3fc.png differ
diff --git a/images/emoji/1f64b-1f3fd.png b/images/emoji/1f64b-1f3fd.png
new file mode 100644
index 000000000..92a389f72
Binary files /dev/null and b/images/emoji/1f64b-1f3fd.png differ
diff --git a/images/emoji/1f64b-1f3fe.png b/images/emoji/1f64b-1f3fe.png
new file mode 100644
index 000000000..8b95f0533
Binary files /dev/null and b/images/emoji/1f64b-1f3fe.png differ
diff --git a/images/emoji/1f64b-1f3ff.png b/images/emoji/1f64b-1f3ff.png
new file mode 100644
index 000000000..b86200fd8
Binary files /dev/null and b/images/emoji/1f64b-1f3ff.png differ
diff --git a/images/emoji/1f64b.png b/images/emoji/1f64b.png
new file mode 100644
index 000000000..7c803b315
Binary files /dev/null and b/images/emoji/1f64b.png differ
diff --git a/images/emoji/1f64c-1f3fb.png b/images/emoji/1f64c-1f3fb.png
new file mode 100644
index 000000000..1168b8236
Binary files /dev/null and b/images/emoji/1f64c-1f3fb.png differ
diff --git a/images/emoji/1f64c-1f3fc.png b/images/emoji/1f64c-1f3fc.png
new file mode 100644
index 000000000..322de6229
Binary files /dev/null and b/images/emoji/1f64c-1f3fc.png differ
diff --git a/images/emoji/1f64c-1f3fd.png b/images/emoji/1f64c-1f3fd.png
new file mode 100644
index 000000000..2aa24e05a
Binary files /dev/null and b/images/emoji/1f64c-1f3fd.png differ
diff --git a/images/emoji/1f64c-1f3fe.png b/images/emoji/1f64c-1f3fe.png
new file mode 100644
index 000000000..f31bf0db9
Binary files /dev/null and b/images/emoji/1f64c-1f3fe.png differ
diff --git a/images/emoji/1f64c-1f3ff.png b/images/emoji/1f64c-1f3ff.png
new file mode 100644
index 000000000..5e95067f9
Binary files /dev/null and b/images/emoji/1f64c-1f3ff.png differ
diff --git a/images/emoji/1f64c.png b/images/emoji/1f64c.png
new file mode 100644
index 000000000..c0155f728
Binary files /dev/null and b/images/emoji/1f64c.png differ
diff --git a/images/emoji/1f64d-1f3fb.png b/images/emoji/1f64d-1f3fb.png
new file mode 100644
index 000000000..21d3bb439
Binary files /dev/null and b/images/emoji/1f64d-1f3fb.png differ
diff --git a/images/emoji/1f64d-1f3fc.png b/images/emoji/1f64d-1f3fc.png
new file mode 100644
index 000000000..973f5fc83
Binary files /dev/null and b/images/emoji/1f64d-1f3fc.png differ
diff --git a/images/emoji/1f64d-1f3fd.png b/images/emoji/1f64d-1f3fd.png
new file mode 100644
index 000000000..41fbcc788
Binary files /dev/null and b/images/emoji/1f64d-1f3fd.png differ
diff --git a/images/emoji/1f64d-1f3fe.png b/images/emoji/1f64d-1f3fe.png
new file mode 100644
index 000000000..5a37c7410
Binary files /dev/null and b/images/emoji/1f64d-1f3fe.png differ
diff --git a/images/emoji/1f64d-1f3ff.png b/images/emoji/1f64d-1f3ff.png
new file mode 100644
index 000000000..e08141f3e
Binary files /dev/null and b/images/emoji/1f64d-1f3ff.png differ
diff --git a/images/emoji/1f64d.png b/images/emoji/1f64d.png
new file mode 100644
index 000000000..579324959
Binary files /dev/null and b/images/emoji/1f64d.png differ
diff --git a/images/emoji/1f64e-1f3fb.png b/images/emoji/1f64e-1f3fb.png
new file mode 100644
index 000000000..57e826b75
Binary files /dev/null and b/images/emoji/1f64e-1f3fb.png differ
diff --git a/images/emoji/1f64e-1f3fc.png b/images/emoji/1f64e-1f3fc.png
new file mode 100644
index 000000000..3f317c0c2
Binary files /dev/null and b/images/emoji/1f64e-1f3fc.png differ
diff --git a/images/emoji/1f64e-1f3fd.png b/images/emoji/1f64e-1f3fd.png
new file mode 100644
index 000000000..d2fbb6c20
Binary files /dev/null and b/images/emoji/1f64e-1f3fd.png differ
diff --git a/images/emoji/1f64e-1f3fe.png b/images/emoji/1f64e-1f3fe.png
new file mode 100644
index 000000000..643ceb4a5
Binary files /dev/null and b/images/emoji/1f64e-1f3fe.png differ
diff --git a/images/emoji/1f64e-1f3ff.png b/images/emoji/1f64e-1f3ff.png
new file mode 100644
index 000000000..b2eb6859c
Binary files /dev/null and b/images/emoji/1f64e-1f3ff.png differ
diff --git a/images/emoji/1f64e.png b/images/emoji/1f64e.png
new file mode 100644
index 000000000..10eb05710
Binary files /dev/null and b/images/emoji/1f64e.png differ
diff --git a/images/emoji/1f64f-1f3fb.png b/images/emoji/1f64f-1f3fb.png
new file mode 100644
index 000000000..060ef2571
Binary files /dev/null and b/images/emoji/1f64f-1f3fb.png differ
diff --git a/images/emoji/1f64f-1f3fc.png b/images/emoji/1f64f-1f3fc.png
new file mode 100644
index 000000000..56dc607c0
Binary files /dev/null and b/images/emoji/1f64f-1f3fc.png differ
diff --git a/images/emoji/1f64f-1f3fd.png b/images/emoji/1f64f-1f3fd.png
new file mode 100644
index 000000000..0f33b8620
Binary files /dev/null and b/images/emoji/1f64f-1f3fd.png differ
diff --git a/images/emoji/1f64f-1f3fe.png b/images/emoji/1f64f-1f3fe.png
new file mode 100644
index 000000000..2ea8dc116
Binary files /dev/null and b/images/emoji/1f64f-1f3fe.png differ
diff --git a/images/emoji/1f64f-1f3ff.png b/images/emoji/1f64f-1f3ff.png
new file mode 100644
index 000000000..2128a6c47
Binary files /dev/null and b/images/emoji/1f64f-1f3ff.png differ
diff --git a/images/emoji/1f64f.png b/images/emoji/1f64f.png
new file mode 100644
index 000000000..8347f2435
Binary files /dev/null and b/images/emoji/1f64f.png differ
diff --git a/images/emoji/1f680.png b/images/emoji/1f680.png
new file mode 100644
index 000000000..0d8da089a
Binary files /dev/null and b/images/emoji/1f680.png differ
diff --git a/images/emoji/1f681.png b/images/emoji/1f681.png
new file mode 100644
index 000000000..7ec5f39a5
Binary files /dev/null and b/images/emoji/1f681.png differ
diff --git a/images/emoji/1f682.png b/images/emoji/1f682.png
new file mode 100644
index 000000000..9ac0d999c
Binary files /dev/null and b/images/emoji/1f682.png differ
diff --git a/images/emoji/1f683.png b/images/emoji/1f683.png
new file mode 100644
index 000000000..a9acbf130
Binary files /dev/null and b/images/emoji/1f683.png differ
diff --git a/images/emoji/1f684.png b/images/emoji/1f684.png
new file mode 100644
index 000000000..ed61c67bf
Binary files /dev/null and b/images/emoji/1f684.png differ
diff --git a/images/emoji/1f685.png b/images/emoji/1f685.png
new file mode 100644
index 000000000..4f698e056
Binary files /dev/null and b/images/emoji/1f685.png differ
diff --git a/images/emoji/1f686.png b/images/emoji/1f686.png
new file mode 100644
index 000000000..8701e41e7
Binary files /dev/null and b/images/emoji/1f686.png differ
diff --git a/images/emoji/1f687.png b/images/emoji/1f687.png
new file mode 100644
index 000000000..1de8f0551
Binary files /dev/null and b/images/emoji/1f687.png differ
diff --git a/images/emoji/1f688.png b/images/emoji/1f688.png
new file mode 100644
index 000000000..a64829f50
Binary files /dev/null and b/images/emoji/1f688.png differ
diff --git a/images/emoji/1f689.png b/images/emoji/1f689.png
new file mode 100644
index 000000000..5c26fee52
Binary files /dev/null and b/images/emoji/1f689.png differ
diff --git a/images/emoji/1f68a.png b/images/emoji/1f68a.png
new file mode 100644
index 000000000..b6f0e6903
Binary files /dev/null and b/images/emoji/1f68a.png differ
diff --git a/images/emoji/1f68b.png b/images/emoji/1f68b.png
new file mode 100644
index 000000000..3c80321f7
Binary files /dev/null and b/images/emoji/1f68b.png differ
diff --git a/images/emoji/1f68c.png b/images/emoji/1f68c.png
new file mode 100644
index 000000000..641ddc56c
Binary files /dev/null and b/images/emoji/1f68c.png differ
diff --git a/images/emoji/1f68d.png b/images/emoji/1f68d.png
new file mode 100644
index 000000000..ad91e256c
Binary files /dev/null and b/images/emoji/1f68d.png differ
diff --git a/images/emoji/1f68e.png b/images/emoji/1f68e.png
new file mode 100644
index 000000000..139a9931b
Binary files /dev/null and b/images/emoji/1f68e.png differ
diff --git a/images/emoji/1f68f.png b/images/emoji/1f68f.png
new file mode 100644
index 000000000..b2b62208b
Binary files /dev/null and b/images/emoji/1f68f.png differ
diff --git a/images/emoji/1f690.png b/images/emoji/1f690.png
new file mode 100644
index 000000000..c60dd8f47
Binary files /dev/null and b/images/emoji/1f690.png differ
diff --git a/images/emoji/1f691.png b/images/emoji/1f691.png
new file mode 100644
index 000000000..6fb8076d7
Binary files /dev/null and b/images/emoji/1f691.png differ
diff --git a/images/emoji/1f692.png b/images/emoji/1f692.png
new file mode 100644
index 000000000..249ffaabd
Binary files /dev/null and b/images/emoji/1f692.png differ
diff --git a/images/emoji/1f693.png b/images/emoji/1f693.png
new file mode 100644
index 000000000..3da4253de
Binary files /dev/null and b/images/emoji/1f693.png differ
diff --git a/images/emoji/1f694.png b/images/emoji/1f694.png
new file mode 100644
index 000000000..a50388fc9
Binary files /dev/null and b/images/emoji/1f694.png differ
diff --git a/images/emoji/1f695.png b/images/emoji/1f695.png
new file mode 100644
index 000000000..55f4cc847
Binary files /dev/null and b/images/emoji/1f695.png differ
diff --git a/images/emoji/1f696.png b/images/emoji/1f696.png
new file mode 100644
index 000000000..b4a9ddde4
Binary files /dev/null and b/images/emoji/1f696.png differ
diff --git a/images/emoji/1f697.png b/images/emoji/1f697.png
new file mode 100644
index 000000000..b3e6a774d
Binary files /dev/null and b/images/emoji/1f697.png differ
diff --git a/images/emoji/1f698.png b/images/emoji/1f698.png
new file mode 100644
index 000000000..3c7e1d52e
Binary files /dev/null and b/images/emoji/1f698.png differ
diff --git a/images/emoji/1f699.png b/images/emoji/1f699.png
new file mode 100644
index 000000000..e8ba817d3
Binary files /dev/null and b/images/emoji/1f699.png differ
diff --git a/images/emoji/1f69a.png b/images/emoji/1f69a.png
new file mode 100644
index 000000000..c7677a769
Binary files /dev/null and b/images/emoji/1f69a.png differ
diff --git a/images/emoji/1f69b.png b/images/emoji/1f69b.png
new file mode 100644
index 000000000..b3b7742e6
Binary files /dev/null and b/images/emoji/1f69b.png differ
diff --git a/images/emoji/1f69c.png b/images/emoji/1f69c.png
new file mode 100644
index 000000000..c1bf8cae4
Binary files /dev/null and b/images/emoji/1f69c.png differ
diff --git a/images/emoji/1f69d.png b/images/emoji/1f69d.png
new file mode 100644
index 000000000..11eb1f574
Binary files /dev/null and b/images/emoji/1f69d.png differ
diff --git a/images/emoji/1f69e.png b/images/emoji/1f69e.png
new file mode 100644
index 000000000..d136d60aa
Binary files /dev/null and b/images/emoji/1f69e.png differ
diff --git a/images/emoji/1f69f.png b/images/emoji/1f69f.png
new file mode 100644
index 000000000..a59d5f48c
Binary files /dev/null and b/images/emoji/1f69f.png differ
diff --git a/images/emoji/1f6a0.png b/images/emoji/1f6a0.png
new file mode 100644
index 000000000..1dea73ca5
Binary files /dev/null and b/images/emoji/1f6a0.png differ
diff --git a/images/emoji/1f6a1.png b/images/emoji/1f6a1.png
new file mode 100644
index 000000000..3eb4b61bf
Binary files /dev/null and b/images/emoji/1f6a1.png differ
diff --git a/images/emoji/1f6a2.png b/images/emoji/1f6a2.png
new file mode 100644
index 000000000..62d54f7d6
Binary files /dev/null and b/images/emoji/1f6a2.png differ
diff --git a/images/emoji/1f6a3-1f3fb.png b/images/emoji/1f6a3-1f3fb.png
new file mode 100644
index 000000000..947471874
Binary files /dev/null and b/images/emoji/1f6a3-1f3fb.png differ
diff --git a/images/emoji/1f6a3-1f3fc.png b/images/emoji/1f6a3-1f3fc.png
new file mode 100644
index 000000000..9b123ef88
Binary files /dev/null and b/images/emoji/1f6a3-1f3fc.png differ
diff --git a/images/emoji/1f6a3-1f3fd.png b/images/emoji/1f6a3-1f3fd.png
new file mode 100644
index 000000000..8ebd89a55
Binary files /dev/null and b/images/emoji/1f6a3-1f3fd.png differ
diff --git a/images/emoji/1f6a3-1f3fe.png b/images/emoji/1f6a3-1f3fe.png
new file mode 100644
index 000000000..2b0d04f87
Binary files /dev/null and b/images/emoji/1f6a3-1f3fe.png differ
diff --git a/images/emoji/1f6a3-1f3ff.png b/images/emoji/1f6a3-1f3ff.png
new file mode 100644
index 000000000..b346f2dfc
Binary files /dev/null and b/images/emoji/1f6a3-1f3ff.png differ
diff --git a/images/emoji/1f6a3.png b/images/emoji/1f6a3.png
new file mode 100644
index 000000000..dd4dfc095
Binary files /dev/null and b/images/emoji/1f6a3.png differ
diff --git a/images/emoji/1f6a4.png b/images/emoji/1f6a4.png
new file mode 100644
index 000000000..74059d12d
Binary files /dev/null and b/images/emoji/1f6a4.png differ
diff --git a/images/emoji/1f6a5.png b/images/emoji/1f6a5.png
new file mode 100644
index 000000000..6b312285b
Binary files /dev/null and b/images/emoji/1f6a5.png differ
diff --git a/images/emoji/1f6a6.png b/images/emoji/1f6a6.png
new file mode 100644
index 000000000..8085973ee
Binary files /dev/null and b/images/emoji/1f6a6.png differ
diff --git a/images/emoji/1f6a7.png b/images/emoji/1f6a7.png
new file mode 100644
index 000000000..ef8db5f47
Binary files /dev/null and b/images/emoji/1f6a7.png differ
diff --git a/images/emoji/1f6a8.png b/images/emoji/1f6a8.png
new file mode 100644
index 000000000..cad66b0af
Binary files /dev/null and b/images/emoji/1f6a8.png differ
diff --git a/images/emoji/1f6a9.png b/images/emoji/1f6a9.png
new file mode 100644
index 000000000..c12d8b068
Binary files /dev/null and b/images/emoji/1f6a9.png differ
diff --git a/images/emoji/1f6aa.png b/images/emoji/1f6aa.png
new file mode 100644
index 000000000..36ae3e274
Binary files /dev/null and b/images/emoji/1f6aa.png differ
diff --git a/images/emoji/1f6ab.png b/images/emoji/1f6ab.png
new file mode 100644
index 000000000..d2efd65e7
Binary files /dev/null and b/images/emoji/1f6ab.png differ
diff --git a/images/emoji/1f6ac.png b/images/emoji/1f6ac.png
new file mode 100644
index 000000000..910f648c8
Binary files /dev/null and b/images/emoji/1f6ac.png differ
diff --git a/images/emoji/1f6ad.png b/images/emoji/1f6ad.png
new file mode 100644
index 000000000..d33b9de53
Binary files /dev/null and b/images/emoji/1f6ad.png differ
diff --git a/images/emoji/1f6ae.png b/images/emoji/1f6ae.png
new file mode 100644
index 000000000..82a84f9a3
Binary files /dev/null and b/images/emoji/1f6ae.png differ
diff --git a/images/emoji/1f6af.png b/images/emoji/1f6af.png
new file mode 100644
index 000000000..341d2575f
Binary files /dev/null and b/images/emoji/1f6af.png differ
diff --git a/images/emoji/1f6b0.png b/images/emoji/1f6b0.png
new file mode 100644
index 000000000..2c6100494
Binary files /dev/null and b/images/emoji/1f6b0.png differ
diff --git a/images/emoji/1f6b1.png b/images/emoji/1f6b1.png
new file mode 100644
index 000000000..827d4193f
Binary files /dev/null and b/images/emoji/1f6b1.png differ
diff --git a/images/emoji/1f6b2.png b/images/emoji/1f6b2.png
new file mode 100644
index 000000000..6125842f8
Binary files /dev/null and b/images/emoji/1f6b2.png differ
diff --git a/images/emoji/1f6b3.png b/images/emoji/1f6b3.png
new file mode 100644
index 000000000..19c85421c
Binary files /dev/null and b/images/emoji/1f6b3.png differ
diff --git a/images/emoji/1f6b4-1f3fb.png b/images/emoji/1f6b4-1f3fb.png
new file mode 100644
index 000000000..decc2f728
Binary files /dev/null and b/images/emoji/1f6b4-1f3fb.png differ
diff --git a/images/emoji/1f6b4-1f3fc.png b/images/emoji/1f6b4-1f3fc.png
new file mode 100644
index 000000000..0067717b8
Binary files /dev/null and b/images/emoji/1f6b4-1f3fc.png differ
diff --git a/images/emoji/1f6b4-1f3fd.png b/images/emoji/1f6b4-1f3fd.png
new file mode 100644
index 000000000..a4f7b5e27
Binary files /dev/null and b/images/emoji/1f6b4-1f3fd.png differ
diff --git a/images/emoji/1f6b4-1f3fe.png b/images/emoji/1f6b4-1f3fe.png
new file mode 100644
index 000000000..a3c8a797d
Binary files /dev/null and b/images/emoji/1f6b4-1f3fe.png differ
diff --git a/images/emoji/1f6b4-1f3ff.png b/images/emoji/1f6b4-1f3ff.png
new file mode 100644
index 000000000..1606a8740
Binary files /dev/null and b/images/emoji/1f6b4-1f3ff.png differ
diff --git a/images/emoji/1f6b4.png b/images/emoji/1f6b4.png
new file mode 100644
index 000000000..9274da110
Binary files /dev/null and b/images/emoji/1f6b4.png differ
diff --git a/images/emoji/1f6b5-1f3fb.png b/images/emoji/1f6b5-1f3fb.png
new file mode 100644
index 000000000..e9f1daf5e
Binary files /dev/null and b/images/emoji/1f6b5-1f3fb.png differ
diff --git a/images/emoji/1f6b5-1f3fc.png b/images/emoji/1f6b5-1f3fc.png
new file mode 100644
index 000000000..555b9e29d
Binary files /dev/null and b/images/emoji/1f6b5-1f3fc.png differ
diff --git a/images/emoji/1f6b5-1f3fd.png b/images/emoji/1f6b5-1f3fd.png
new file mode 100644
index 000000000..7df5508ec
Binary files /dev/null and b/images/emoji/1f6b5-1f3fd.png differ
diff --git a/images/emoji/1f6b5-1f3fe.png b/images/emoji/1f6b5-1f3fe.png
new file mode 100644
index 000000000..f94b34506
Binary files /dev/null and b/images/emoji/1f6b5-1f3fe.png differ
diff --git a/images/emoji/1f6b5-1f3ff.png b/images/emoji/1f6b5-1f3ff.png
new file mode 100644
index 000000000..16a45861e
Binary files /dev/null and b/images/emoji/1f6b5-1f3ff.png differ
diff --git a/images/emoji/1f6b5.png b/images/emoji/1f6b5.png
new file mode 100644
index 000000000..41d3dc3ac
Binary files /dev/null and b/images/emoji/1f6b5.png differ
diff --git a/images/emoji/1f6b6-1f3fb.png b/images/emoji/1f6b6-1f3fb.png
new file mode 100644
index 000000000..4e391b45a
Binary files /dev/null and b/images/emoji/1f6b6-1f3fb.png differ
diff --git a/images/emoji/1f6b6-1f3fc.png b/images/emoji/1f6b6-1f3fc.png
new file mode 100644
index 000000000..31f94a1bc
Binary files /dev/null and b/images/emoji/1f6b6-1f3fc.png differ
diff --git a/images/emoji/1f6b6-1f3fd.png b/images/emoji/1f6b6-1f3fd.png
new file mode 100644
index 000000000..f7ed8e39c
Binary files /dev/null and b/images/emoji/1f6b6-1f3fd.png differ
diff --git a/images/emoji/1f6b6-1f3fe.png b/images/emoji/1f6b6-1f3fe.png
new file mode 100644
index 000000000..e58dc04c7
Binary files /dev/null and b/images/emoji/1f6b6-1f3fe.png differ
diff --git a/images/emoji/1f6b6-1f3ff.png b/images/emoji/1f6b6-1f3ff.png
new file mode 100644
index 000000000..ba4e1b58f
Binary files /dev/null and b/images/emoji/1f6b6-1f3ff.png differ
diff --git a/images/emoji/1f6b6.png b/images/emoji/1f6b6.png
new file mode 100644
index 000000000..06dc169a3
Binary files /dev/null and b/images/emoji/1f6b6.png differ
diff --git a/images/emoji/1f6b7.png b/images/emoji/1f6b7.png
new file mode 100644
index 000000000..286aa577a
Binary files /dev/null and b/images/emoji/1f6b7.png differ
diff --git a/images/emoji/1f6b8.png b/images/emoji/1f6b8.png
new file mode 100644
index 000000000..fa4c091c7
Binary files /dev/null and b/images/emoji/1f6b8.png differ
diff --git a/images/emoji/1f6b9.png b/images/emoji/1f6b9.png
new file mode 100644
index 000000000..f5a1e1ba0
Binary files /dev/null and b/images/emoji/1f6b9.png differ
diff --git a/images/emoji/1f6ba.png b/images/emoji/1f6ba.png
new file mode 100644
index 000000000..d4ecc22e7
Binary files /dev/null and b/images/emoji/1f6ba.png differ
diff --git a/images/emoji/1f6bb.png b/images/emoji/1f6bb.png
new file mode 100644
index 000000000..9588e0f0e
Binary files /dev/null and b/images/emoji/1f6bb.png differ
diff --git a/images/emoji/1f6bc.png b/images/emoji/1f6bc.png
new file mode 100644
index 000000000..64a10b717
Binary files /dev/null and b/images/emoji/1f6bc.png differ
diff --git a/images/emoji/1f6bd.png b/images/emoji/1f6bd.png
new file mode 100644
index 000000000..1392f7618
Binary files /dev/null and b/images/emoji/1f6bd.png differ
diff --git a/images/emoji/1f6be.png b/images/emoji/1f6be.png
new file mode 100644
index 000000000..aa433e84b
Binary files /dev/null and b/images/emoji/1f6be.png differ
diff --git a/images/emoji/1f6bf.png b/images/emoji/1f6bf.png
new file mode 100644
index 000000000..156776a2e
Binary files /dev/null and b/images/emoji/1f6bf.png differ
diff --git a/images/emoji/1f6c0-1f3fb.png b/images/emoji/1f6c0-1f3fb.png
new file mode 100644
index 000000000..2152eabf2
Binary files /dev/null and b/images/emoji/1f6c0-1f3fb.png differ
diff --git a/images/emoji/1f6c0-1f3fc.png b/images/emoji/1f6c0-1f3fc.png
new file mode 100644
index 000000000..2102e6133
Binary files /dev/null and b/images/emoji/1f6c0-1f3fc.png differ
diff --git a/images/emoji/1f6c0-1f3fd.png b/images/emoji/1f6c0-1f3fd.png
new file mode 100644
index 000000000..fae66181e
Binary files /dev/null and b/images/emoji/1f6c0-1f3fd.png differ
diff --git a/images/emoji/1f6c0-1f3fe.png b/images/emoji/1f6c0-1f3fe.png
new file mode 100644
index 000000000..1f8959d0d
Binary files /dev/null and b/images/emoji/1f6c0-1f3fe.png differ
diff --git a/images/emoji/1f6c0-1f3ff.png b/images/emoji/1f6c0-1f3ff.png
new file mode 100644
index 000000000..c8a08e84f
Binary files /dev/null and b/images/emoji/1f6c0-1f3ff.png differ
diff --git a/images/emoji/1f6c0.png b/images/emoji/1f6c0.png
new file mode 100644
index 000000000..43fba5c8a
Binary files /dev/null and b/images/emoji/1f6c0.png differ
diff --git a/images/emoji/1f6c1.png b/images/emoji/1f6c1.png
new file mode 100644
index 000000000..9a5f09361
Binary files /dev/null and b/images/emoji/1f6c1.png differ
diff --git a/images/emoji/1f6c2.png b/images/emoji/1f6c2.png
new file mode 100644
index 000000000..079e34ee4
Binary files /dev/null and b/images/emoji/1f6c2.png differ
diff --git a/images/emoji/1f6c3.png b/images/emoji/1f6c3.png
new file mode 100644
index 000000000..21b7ce2c6
Binary files /dev/null and b/images/emoji/1f6c3.png differ
diff --git a/images/emoji/1f6c4.png b/images/emoji/1f6c4.png
new file mode 100644
index 000000000..409b593e7
Binary files /dev/null and b/images/emoji/1f6c4.png differ
diff --git a/images/emoji/1f6c5.png b/images/emoji/1f6c5.png
new file mode 100644
index 000000000..887b23f3f
Binary files /dev/null and b/images/emoji/1f6c5.png differ
diff --git a/images/emoji/1f6cb.png b/images/emoji/1f6cb.png
new file mode 100644
index 000000000..27b19b13b
Binary files /dev/null and b/images/emoji/1f6cb.png differ
diff --git a/images/emoji/1f6cc.png b/images/emoji/1f6cc.png
new file mode 100644
index 000000000..c739e7fb6
Binary files /dev/null and b/images/emoji/1f6cc.png differ
diff --git a/images/emoji/1f6cd.png b/images/emoji/1f6cd.png
new file mode 100644
index 000000000..99f2a2b13
Binary files /dev/null and b/images/emoji/1f6cd.png differ
diff --git a/images/emoji/1f6ce.png b/images/emoji/1f6ce.png
new file mode 100644
index 000000000..6b3297cea
Binary files /dev/null and b/images/emoji/1f6ce.png differ
diff --git a/images/emoji/1f6cf.png b/images/emoji/1f6cf.png
new file mode 100644
index 000000000..cf75349a3
Binary files /dev/null and b/images/emoji/1f6cf.png differ
diff --git a/images/emoji/1f6d0.png b/images/emoji/1f6d0.png
new file mode 100644
index 000000000..207d59cce
Binary files /dev/null and b/images/emoji/1f6d0.png differ
diff --git a/images/emoji/1f6d1.png b/images/emoji/1f6d1.png
new file mode 100644
index 000000000..5ed610040
Binary files /dev/null and b/images/emoji/1f6d1.png differ
diff --git a/images/emoji/1f6d2.png b/images/emoji/1f6d2.png
new file mode 100644
index 000000000..1086fe6e4
Binary files /dev/null and b/images/emoji/1f6d2.png differ
diff --git a/images/emoji/1f6e0.png b/images/emoji/1f6e0.png
new file mode 100644
index 000000000..3c6049273
Binary files /dev/null and b/images/emoji/1f6e0.png differ
diff --git a/images/emoji/1f6e1.png b/images/emoji/1f6e1.png
new file mode 100644
index 000000000..610bf033c
Binary files /dev/null and b/images/emoji/1f6e1.png differ
diff --git a/images/emoji/1f6e2.png b/images/emoji/1f6e2.png
new file mode 100644
index 000000000..c4c4d42da
Binary files /dev/null and b/images/emoji/1f6e2.png differ
diff --git a/images/emoji/1f6e3.png b/images/emoji/1f6e3.png
new file mode 100644
index 000000000..8c3d3d03e
Binary files /dev/null and b/images/emoji/1f6e3.png differ
diff --git a/images/emoji/1f6e4.png b/images/emoji/1f6e4.png
new file mode 100644
index 000000000..3bde6fb65
Binary files /dev/null and b/images/emoji/1f6e4.png differ
diff --git a/images/emoji/1f6e5.png b/images/emoji/1f6e5.png
new file mode 100644
index 000000000..0506db1a4
Binary files /dev/null and b/images/emoji/1f6e5.png differ
diff --git a/images/emoji/1f6e9.png b/images/emoji/1f6e9.png
new file mode 100644
index 000000000..b731b15e3
Binary files /dev/null and b/images/emoji/1f6e9.png differ
diff --git a/images/emoji/1f6eb.png b/images/emoji/1f6eb.png
new file mode 100644
index 000000000..a5766f9f4
Binary files /dev/null and b/images/emoji/1f6eb.png differ
diff --git a/images/emoji/1f6ec.png b/images/emoji/1f6ec.png
new file mode 100644
index 000000000..d66841962
Binary files /dev/null and b/images/emoji/1f6ec.png differ
diff --git a/images/emoji/1f6f0.png b/images/emoji/1f6f0.png
new file mode 100644
index 000000000..4ba55d6e2
Binary files /dev/null and b/images/emoji/1f6f0.png differ
diff --git a/images/emoji/1f6f3.png b/images/emoji/1f6f3.png
new file mode 100644
index 000000000..19d4acbe4
Binary files /dev/null and b/images/emoji/1f6f3.png differ
diff --git a/images/emoji/1f6f4.png b/images/emoji/1f6f4.png
new file mode 100644
index 000000000..4ab7ef59c
Binary files /dev/null and b/images/emoji/1f6f4.png differ
diff --git a/images/emoji/1f6f5.png b/images/emoji/1f6f5.png
new file mode 100644
index 000000000..c5afa72d8
Binary files /dev/null and b/images/emoji/1f6f5.png differ
diff --git a/images/emoji/1f6f6.png b/images/emoji/1f6f6.png
new file mode 100644
index 000000000..e26cdb9da
Binary files /dev/null and b/images/emoji/1f6f6.png differ
diff --git a/images/emoji/1f910.png b/images/emoji/1f910.png
new file mode 100644
index 000000000..f8ced2502
Binary files /dev/null and b/images/emoji/1f910.png differ
diff --git a/images/emoji/1f911.png b/images/emoji/1f911.png
new file mode 100644
index 000000000..75fd1e90c
Binary files /dev/null and b/images/emoji/1f911.png differ
diff --git a/images/emoji/1f912.png b/images/emoji/1f912.png
new file mode 100644
index 000000000..8a1e841af
Binary files /dev/null and b/images/emoji/1f912.png differ
diff --git a/images/emoji/1f913.png b/images/emoji/1f913.png
new file mode 100644
index 000000000..7820bd581
Binary files /dev/null and b/images/emoji/1f913.png differ
diff --git a/images/emoji/1f914.png b/images/emoji/1f914.png
new file mode 100644
index 000000000..c18f6fd14
Binary files /dev/null and b/images/emoji/1f914.png differ
diff --git a/images/emoji/1f915.png b/images/emoji/1f915.png
new file mode 100644
index 000000000..53c7be1d2
Binary files /dev/null and b/images/emoji/1f915.png differ
diff --git a/images/emoji/1f916.png b/images/emoji/1f916.png
new file mode 100644
index 000000000..7cc62612c
Binary files /dev/null and b/images/emoji/1f916.png differ
diff --git a/images/emoji/1f917.png b/images/emoji/1f917.png
new file mode 100644
index 000000000..f398b783a
Binary files /dev/null and b/images/emoji/1f917.png differ
diff --git a/images/emoji/1f918-1f3fb.png b/images/emoji/1f918-1f3fb.png
new file mode 100644
index 000000000..c080d2add
Binary files /dev/null and b/images/emoji/1f918-1f3fb.png differ
diff --git a/images/emoji/1f918-1f3fc.png b/images/emoji/1f918-1f3fc.png
new file mode 100644
index 000000000..12313529b
Binary files /dev/null and b/images/emoji/1f918-1f3fc.png differ
diff --git a/images/emoji/1f918-1f3fd.png b/images/emoji/1f918-1f3fd.png
new file mode 100644
index 000000000..ca9be6ae6
Binary files /dev/null and b/images/emoji/1f918-1f3fd.png differ
diff --git a/images/emoji/1f918-1f3fe.png b/images/emoji/1f918-1f3fe.png
new file mode 100644
index 000000000..abe28cbf8
Binary files /dev/null and b/images/emoji/1f918-1f3fe.png differ
diff --git a/images/emoji/1f918-1f3ff.png b/images/emoji/1f918-1f3ff.png
new file mode 100644
index 000000000..0c6b5dd34
Binary files /dev/null and b/images/emoji/1f918-1f3ff.png differ
diff --git a/images/emoji/1f918.png b/images/emoji/1f918.png
new file mode 100644
index 000000000..4aa6e7e0a
Binary files /dev/null and b/images/emoji/1f918.png differ
diff --git a/images/emoji/1f919-1f3fb.png b/images/emoji/1f919-1f3fb.png
new file mode 100644
index 000000000..2c9320118
Binary files /dev/null and b/images/emoji/1f919-1f3fb.png differ
diff --git a/images/emoji/1f919-1f3fc.png b/images/emoji/1f919-1f3fc.png
new file mode 100644
index 000000000..c39f45a41
Binary files /dev/null and b/images/emoji/1f919-1f3fc.png differ
diff --git a/images/emoji/1f919-1f3fd.png b/images/emoji/1f919-1f3fd.png
new file mode 100644
index 000000000..83a57f63c
Binary files /dev/null and b/images/emoji/1f919-1f3fd.png differ
diff --git a/images/emoji/1f919-1f3fe.png b/images/emoji/1f919-1f3fe.png
new file mode 100644
index 000000000..65b3468fe
Binary files /dev/null and b/images/emoji/1f919-1f3fe.png differ
diff --git a/images/emoji/1f919-1f3ff.png b/images/emoji/1f919-1f3ff.png
new file mode 100644
index 000000000..94ef68ff3
Binary files /dev/null and b/images/emoji/1f919-1f3ff.png differ
diff --git a/images/emoji/1f919.png b/images/emoji/1f919.png
new file mode 100644
index 000000000..a10c59ba7
Binary files /dev/null and b/images/emoji/1f919.png differ
diff --git a/images/emoji/1f91a-1f3fb.png b/images/emoji/1f91a-1f3fb.png
new file mode 100644
index 000000000..813d28499
Binary files /dev/null and b/images/emoji/1f91a-1f3fb.png differ
diff --git a/images/emoji/1f91a-1f3fc.png b/images/emoji/1f91a-1f3fc.png
new file mode 100644
index 000000000..192ff795e
Binary files /dev/null and b/images/emoji/1f91a-1f3fc.png differ
diff --git a/images/emoji/1f91a-1f3fd.png b/images/emoji/1f91a-1f3fd.png
new file mode 100644
index 000000000..61a727abe
Binary files /dev/null and b/images/emoji/1f91a-1f3fd.png differ
diff --git a/images/emoji/1f91a-1f3fe.png b/images/emoji/1f91a-1f3fe.png
new file mode 100644
index 000000000..2e83da511
Binary files /dev/null and b/images/emoji/1f91a-1f3fe.png differ
diff --git a/images/emoji/1f91a-1f3ff.png b/images/emoji/1f91a-1f3ff.png
new file mode 100644
index 000000000..d7a5b95a0
Binary files /dev/null and b/images/emoji/1f91a-1f3ff.png differ
diff --git a/images/emoji/1f91a.png b/images/emoji/1f91a.png
new file mode 100644
index 000000000..479234294
Binary files /dev/null and b/images/emoji/1f91a.png differ
diff --git a/images/emoji/1f91b-1f3fb.png b/images/emoji/1f91b-1f3fb.png
new file mode 100644
index 000000000..1262a6b4b
Binary files /dev/null and b/images/emoji/1f91b-1f3fb.png differ
diff --git a/images/emoji/1f91b-1f3fc.png b/images/emoji/1f91b-1f3fc.png
new file mode 100644
index 000000000..40bf70b82
Binary files /dev/null and b/images/emoji/1f91b-1f3fc.png differ
diff --git a/images/emoji/1f91b-1f3fd.png b/images/emoji/1f91b-1f3fd.png
new file mode 100644
index 000000000..93f581451
Binary files /dev/null and b/images/emoji/1f91b-1f3fd.png differ
diff --git a/images/emoji/1f91b-1f3fe.png b/images/emoji/1f91b-1f3fe.png
new file mode 100644
index 000000000..d82b5ec91
Binary files /dev/null and b/images/emoji/1f91b-1f3fe.png differ
diff --git a/images/emoji/1f91b-1f3ff.png b/images/emoji/1f91b-1f3ff.png
new file mode 100644
index 000000000..09ae4cd49
Binary files /dev/null and b/images/emoji/1f91b-1f3ff.png differ
diff --git a/images/emoji/1f91b.png b/images/emoji/1f91b.png
new file mode 100644
index 000000000..a9d9fd8d5
Binary files /dev/null and b/images/emoji/1f91b.png differ
diff --git a/images/emoji/1f91c-1f3fb.png b/images/emoji/1f91c-1f3fb.png
new file mode 100644
index 000000000..33ded2f61
Binary files /dev/null and b/images/emoji/1f91c-1f3fb.png differ
diff --git a/images/emoji/1f91c-1f3fc.png b/images/emoji/1f91c-1f3fc.png
new file mode 100644
index 000000000..88054e335
Binary files /dev/null and b/images/emoji/1f91c-1f3fc.png differ
diff --git a/images/emoji/1f91c-1f3fd.png b/images/emoji/1f91c-1f3fd.png
new file mode 100644
index 000000000..84b9f5da7
Binary files /dev/null and b/images/emoji/1f91c-1f3fd.png differ
diff --git a/images/emoji/1f91c-1f3fe.png b/images/emoji/1f91c-1f3fe.png
new file mode 100644
index 000000000..e741cfea6
Binary files /dev/null and b/images/emoji/1f91c-1f3fe.png differ
diff --git a/images/emoji/1f91c-1f3ff.png b/images/emoji/1f91c-1f3ff.png
new file mode 100644
index 000000000..cf66d760c
Binary files /dev/null and b/images/emoji/1f91c-1f3ff.png differ
diff --git a/images/emoji/1f91c.png b/images/emoji/1f91c.png
new file mode 100644
index 000000000..754ed066d
Binary files /dev/null and b/images/emoji/1f91c.png differ
diff --git a/images/emoji/1f91d-1f3fb.png b/images/emoji/1f91d-1f3fb.png
new file mode 100644
index 000000000..255fc7ec6
Binary files /dev/null and b/images/emoji/1f91d-1f3fb.png differ
diff --git a/images/emoji/1f91d-1f3fc.png b/images/emoji/1f91d-1f3fc.png
new file mode 100644
index 000000000..1aec7450e
Binary files /dev/null and b/images/emoji/1f91d-1f3fc.png differ
diff --git a/images/emoji/1f91d-1f3fd.png b/images/emoji/1f91d-1f3fd.png
new file mode 100644
index 000000000..104d65691
Binary files /dev/null and b/images/emoji/1f91d-1f3fd.png differ
diff --git a/images/emoji/1f91d-1f3fe.png b/images/emoji/1f91d-1f3fe.png
new file mode 100644
index 000000000..999966d4b
Binary files /dev/null and b/images/emoji/1f91d-1f3fe.png differ
diff --git a/images/emoji/1f91d-1f3ff.png b/images/emoji/1f91d-1f3ff.png
new file mode 100644
index 000000000..9a38f1b66
Binary files /dev/null and b/images/emoji/1f91d-1f3ff.png differ
diff --git a/images/emoji/1f91d.png b/images/emoji/1f91d.png
new file mode 100644
index 000000000..75e8d58e9
Binary files /dev/null and b/images/emoji/1f91d.png differ
diff --git a/images/emoji/1f91e-1f3fb.png b/images/emoji/1f91e-1f3fb.png
new file mode 100644
index 000000000..dd2384a6c
Binary files /dev/null and b/images/emoji/1f91e-1f3fb.png differ
diff --git a/images/emoji/1f91e-1f3fc.png b/images/emoji/1f91e-1f3fc.png
new file mode 100644
index 000000000..6228401be
Binary files /dev/null and b/images/emoji/1f91e-1f3fc.png differ
diff --git a/images/emoji/1f91e-1f3fd.png b/images/emoji/1f91e-1f3fd.png
new file mode 100644
index 000000000..b1074da15
Binary files /dev/null and b/images/emoji/1f91e-1f3fd.png differ
diff --git a/images/emoji/1f91e-1f3fe.png b/images/emoji/1f91e-1f3fe.png
new file mode 100644
index 000000000..75e05e4d3
Binary files /dev/null and b/images/emoji/1f91e-1f3fe.png differ
diff --git a/images/emoji/1f91e-1f3ff.png b/images/emoji/1f91e-1f3ff.png
new file mode 100644
index 000000000..761aebdc3
Binary files /dev/null and b/images/emoji/1f91e-1f3ff.png differ
diff --git a/images/emoji/1f91e.png b/images/emoji/1f91e.png
new file mode 100644
index 000000000..4cd18514e
Binary files /dev/null and b/images/emoji/1f91e.png differ
diff --git a/images/emoji/1f920.png b/images/emoji/1f920.png
new file mode 100644
index 000000000..e67709b88
Binary files /dev/null and b/images/emoji/1f920.png differ
diff --git a/images/emoji/1f921.png b/images/emoji/1f921.png
new file mode 100644
index 000000000..f0e05bac4
Binary files /dev/null and b/images/emoji/1f921.png differ
diff --git a/images/emoji/1f922.png b/images/emoji/1f922.png
new file mode 100644
index 000000000..a566c109c
Binary files /dev/null and b/images/emoji/1f922.png differ
diff --git a/images/emoji/1f923.png b/images/emoji/1f923.png
new file mode 100644
index 000000000..b1736fedf
Binary files /dev/null and b/images/emoji/1f923.png differ
diff --git a/images/emoji/1f924.png b/images/emoji/1f924.png
new file mode 100644
index 000000000..a54605325
Binary files /dev/null and b/images/emoji/1f924.png differ
diff --git a/images/emoji/1f925.png b/images/emoji/1f925.png
new file mode 100644
index 000000000..02827e262
Binary files /dev/null and b/images/emoji/1f925.png differ
diff --git a/images/emoji/1f926-1f3fb.png b/images/emoji/1f926-1f3fb.png
new file mode 100644
index 000000000..2f4b010bb
Binary files /dev/null and b/images/emoji/1f926-1f3fb.png differ
diff --git a/images/emoji/1f926-1f3fc.png b/images/emoji/1f926-1f3fc.png
new file mode 100644
index 000000000..9cba0b0e1
Binary files /dev/null and b/images/emoji/1f926-1f3fc.png differ
diff --git a/images/emoji/1f926-1f3fd.png b/images/emoji/1f926-1f3fd.png
new file mode 100644
index 000000000..b5b5c1e53
Binary files /dev/null and b/images/emoji/1f926-1f3fd.png differ
diff --git a/images/emoji/1f926-1f3fe.png b/images/emoji/1f926-1f3fe.png
new file mode 100644
index 000000000..2840b1134
Binary files /dev/null and b/images/emoji/1f926-1f3fe.png differ
diff --git a/images/emoji/1f926-1f3ff.png b/images/emoji/1f926-1f3ff.png
new file mode 100644
index 000000000..6f070db98
Binary files /dev/null and b/images/emoji/1f926-1f3ff.png differ
diff --git a/images/emoji/1f926.png b/images/emoji/1f926.png
new file mode 100644
index 000000000..defc796cf
Binary files /dev/null and b/images/emoji/1f926.png differ
diff --git a/images/emoji/1f927.png b/images/emoji/1f927.png
new file mode 100644
index 000000000..d6c796746
Binary files /dev/null and b/images/emoji/1f927.png differ
diff --git a/images/emoji/1f930-1f3fb.png b/images/emoji/1f930-1f3fb.png
new file mode 100644
index 000000000..a78703b33
Binary files /dev/null and b/images/emoji/1f930-1f3fb.png differ
diff --git a/images/emoji/1f930-1f3fc.png b/images/emoji/1f930-1f3fc.png
new file mode 100644
index 000000000..0068c6c4a
Binary files /dev/null and b/images/emoji/1f930-1f3fc.png differ
diff --git a/images/emoji/1f930-1f3fd.png b/images/emoji/1f930-1f3fd.png
new file mode 100644
index 000000000..3206296b6
Binary files /dev/null and b/images/emoji/1f930-1f3fd.png differ
diff --git a/images/emoji/1f930-1f3fe.png b/images/emoji/1f930-1f3fe.png
new file mode 100644
index 000000000..120fda5cd
Binary files /dev/null and b/images/emoji/1f930-1f3fe.png differ
diff --git a/images/emoji/1f930-1f3ff.png b/images/emoji/1f930-1f3ff.png
new file mode 100644
index 000000000..569bfdf05
Binary files /dev/null and b/images/emoji/1f930-1f3ff.png differ
diff --git a/images/emoji/1f930.png b/images/emoji/1f930.png
new file mode 100644
index 000000000..084e83a41
Binary files /dev/null and b/images/emoji/1f930.png differ
diff --git a/images/emoji/1f933-1f3fb.png b/images/emoji/1f933-1f3fb.png
new file mode 100644
index 000000000..290e075b5
Binary files /dev/null and b/images/emoji/1f933-1f3fb.png differ
diff --git a/images/emoji/1f933-1f3fc.png b/images/emoji/1f933-1f3fc.png
new file mode 100644
index 000000000..fcd9595b6
Binary files /dev/null and b/images/emoji/1f933-1f3fc.png differ
diff --git a/images/emoji/1f933-1f3fd.png b/images/emoji/1f933-1f3fd.png
new file mode 100644
index 000000000..f3a22fdf4
Binary files /dev/null and b/images/emoji/1f933-1f3fd.png differ
diff --git a/images/emoji/1f933-1f3fe.png b/images/emoji/1f933-1f3fe.png
new file mode 100644
index 000000000..cdecf6d9f
Binary files /dev/null and b/images/emoji/1f933-1f3fe.png differ
diff --git a/images/emoji/1f933-1f3ff.png b/images/emoji/1f933-1f3ff.png
new file mode 100644
index 000000000..86acbb6c2
Binary files /dev/null and b/images/emoji/1f933-1f3ff.png differ
diff --git a/images/emoji/1f933.png b/images/emoji/1f933.png
new file mode 100644
index 000000000..6a1ba75c7
Binary files /dev/null and b/images/emoji/1f933.png differ
diff --git a/images/emoji/1f934-1f3fb.png b/images/emoji/1f934-1f3fb.png
new file mode 100644
index 000000000..9102f9c46
Binary files /dev/null and b/images/emoji/1f934-1f3fb.png differ
diff --git a/images/emoji/1f934-1f3fc.png b/images/emoji/1f934-1f3fc.png
new file mode 100644
index 000000000..23d8b3b12
Binary files /dev/null and b/images/emoji/1f934-1f3fc.png differ
diff --git a/images/emoji/1f934-1f3fd.png b/images/emoji/1f934-1f3fd.png
new file mode 100644
index 000000000..e7692efb7
Binary files /dev/null and b/images/emoji/1f934-1f3fd.png differ
diff --git a/images/emoji/1f934-1f3fe.png b/images/emoji/1f934-1f3fe.png
new file mode 100644
index 000000000..8e10f8be6
Binary files /dev/null and b/images/emoji/1f934-1f3fe.png differ
diff --git a/images/emoji/1f934-1f3ff.png b/images/emoji/1f934-1f3ff.png
new file mode 100644
index 000000000..138d4ea70
Binary files /dev/null and b/images/emoji/1f934-1f3ff.png differ
diff --git a/images/emoji/1f934.png b/images/emoji/1f934.png
new file mode 100644
index 000000000..38d69344c
Binary files /dev/null and b/images/emoji/1f934.png differ
diff --git a/images/emoji/1f935-1f3fb.png b/images/emoji/1f935-1f3fb.png
new file mode 100644
index 000000000..7b6b3acd9
Binary files /dev/null and b/images/emoji/1f935-1f3fb.png differ
diff --git a/images/emoji/1f935-1f3fc.png b/images/emoji/1f935-1f3fc.png
new file mode 100644
index 000000000..7975191b3
Binary files /dev/null and b/images/emoji/1f935-1f3fc.png differ
diff --git a/images/emoji/1f935-1f3fd.png b/images/emoji/1f935-1f3fd.png
new file mode 100644
index 000000000..a2816f600
Binary files /dev/null and b/images/emoji/1f935-1f3fd.png differ
diff --git a/images/emoji/1f935-1f3fe.png b/images/emoji/1f935-1f3fe.png
new file mode 100644
index 000000000..ea8291760
Binary files /dev/null and b/images/emoji/1f935-1f3fe.png differ
diff --git a/images/emoji/1f935-1f3ff.png b/images/emoji/1f935-1f3ff.png
new file mode 100644
index 000000000..c743e05fc
Binary files /dev/null and b/images/emoji/1f935-1f3ff.png differ
diff --git a/images/emoji/1f935.png b/images/emoji/1f935.png
new file mode 100644
index 000000000..5f7e9303f
Binary files /dev/null and b/images/emoji/1f935.png differ
diff --git a/images/emoji/1f936-1f3fb.png b/images/emoji/1f936-1f3fb.png
new file mode 100644
index 000000000..d8a695d70
Binary files /dev/null and b/images/emoji/1f936-1f3fb.png differ
diff --git a/images/emoji/1f936-1f3fc.png b/images/emoji/1f936-1f3fc.png
new file mode 100644
index 000000000..0e17e8c51
Binary files /dev/null and b/images/emoji/1f936-1f3fc.png differ
diff --git a/images/emoji/1f936-1f3fd.png b/images/emoji/1f936-1f3fd.png
new file mode 100644
index 000000000..195ebc400
Binary files /dev/null and b/images/emoji/1f936-1f3fd.png differ
diff --git a/images/emoji/1f936-1f3fe.png b/images/emoji/1f936-1f3fe.png
new file mode 100644
index 000000000..68a556da2
Binary files /dev/null and b/images/emoji/1f936-1f3fe.png differ
diff --git a/images/emoji/1f936-1f3ff.png b/images/emoji/1f936-1f3ff.png
new file mode 100644
index 000000000..ccab3c40f
Binary files /dev/null and b/images/emoji/1f936-1f3ff.png differ
diff --git a/images/emoji/1f936.png b/images/emoji/1f936.png
new file mode 100644
index 000000000..078f0657f
Binary files /dev/null and b/images/emoji/1f936.png differ
diff --git a/images/emoji/1f937-1f3fb.png b/images/emoji/1f937-1f3fb.png
new file mode 100644
index 000000000..1c895e644
Binary files /dev/null and b/images/emoji/1f937-1f3fb.png differ
diff --git a/images/emoji/1f937-1f3fc.png b/images/emoji/1f937-1f3fc.png
new file mode 100644
index 000000000..d76ac4b19
Binary files /dev/null and b/images/emoji/1f937-1f3fc.png differ
diff --git a/images/emoji/1f937-1f3fd.png b/images/emoji/1f937-1f3fd.png
new file mode 100644
index 000000000..dc3a5a9fb
Binary files /dev/null and b/images/emoji/1f937-1f3fd.png differ
diff --git a/images/emoji/1f937-1f3fe.png b/images/emoji/1f937-1f3fe.png
new file mode 100644
index 000000000..5fbef3f22
Binary files /dev/null and b/images/emoji/1f937-1f3fe.png differ
diff --git a/images/emoji/1f937-1f3ff.png b/images/emoji/1f937-1f3ff.png
new file mode 100644
index 000000000..303640fe7
Binary files /dev/null and b/images/emoji/1f937-1f3ff.png differ
diff --git a/images/emoji/1f937.png b/images/emoji/1f937.png
new file mode 100644
index 000000000..76e63bfac
Binary files /dev/null and b/images/emoji/1f937.png differ
diff --git a/images/emoji/1f938-1f3fb.png b/images/emoji/1f938-1f3fb.png
new file mode 100644
index 000000000..db6d65895
Binary files /dev/null and b/images/emoji/1f938-1f3fb.png differ
diff --git a/images/emoji/1f938-1f3fc.png b/images/emoji/1f938-1f3fc.png
new file mode 100644
index 000000000..e00ffbc27
Binary files /dev/null and b/images/emoji/1f938-1f3fc.png differ
diff --git a/images/emoji/1f938-1f3fd.png b/images/emoji/1f938-1f3fd.png
new file mode 100644
index 000000000..49321be39
Binary files /dev/null and b/images/emoji/1f938-1f3fd.png differ
diff --git a/images/emoji/1f938-1f3fe.png b/images/emoji/1f938-1f3fe.png
new file mode 100644
index 000000000..d4562b5e3
Binary files /dev/null and b/images/emoji/1f938-1f3fe.png differ
diff --git a/images/emoji/1f938-1f3ff.png b/images/emoji/1f938-1f3ff.png
new file mode 100644
index 000000000..6e09a8707
Binary files /dev/null and b/images/emoji/1f938-1f3ff.png differ
diff --git a/images/emoji/1f938.png b/images/emoji/1f938.png
new file mode 100644
index 000000000..cbcaa5782
Binary files /dev/null and b/images/emoji/1f938.png differ
diff --git a/images/emoji/1f939-1f3fb.png b/images/emoji/1f939-1f3fb.png
new file mode 100644
index 000000000..c18eda400
Binary files /dev/null and b/images/emoji/1f939-1f3fb.png differ
diff --git a/images/emoji/1f939-1f3fc.png b/images/emoji/1f939-1f3fc.png
new file mode 100644
index 000000000..de3b7a555
Binary files /dev/null and b/images/emoji/1f939-1f3fc.png differ
diff --git a/images/emoji/1f939-1f3fd.png b/images/emoji/1f939-1f3fd.png
new file mode 100644
index 000000000..74ab6d854
Binary files /dev/null and b/images/emoji/1f939-1f3fd.png differ
diff --git a/images/emoji/1f939-1f3fe.png b/images/emoji/1f939-1f3fe.png
new file mode 100644
index 000000000..1c5782320
Binary files /dev/null and b/images/emoji/1f939-1f3fe.png differ
diff --git a/images/emoji/1f939-1f3ff.png b/images/emoji/1f939-1f3ff.png
new file mode 100644
index 000000000..c343d6ee9
Binary files /dev/null and b/images/emoji/1f939-1f3ff.png differ
diff --git a/images/emoji/1f939.png b/images/emoji/1f939.png
new file mode 100644
index 000000000..a37f6224a
Binary files /dev/null and b/images/emoji/1f939.png differ
diff --git a/images/emoji/1f93a.png b/images/emoji/1f93a.png
new file mode 100644
index 000000000..9f6cb6ff8
Binary files /dev/null and b/images/emoji/1f93a.png differ
diff --git a/images/emoji/1f93b-1f3fb.png b/images/emoji/1f93b-1f3fb.png
new file mode 100644
index 000000000..f29209325
Binary files /dev/null and b/images/emoji/1f93b-1f3fb.png differ
diff --git a/images/emoji/1f93b-1f3fc.png b/images/emoji/1f93b-1f3fc.png
new file mode 100644
index 000000000..fea2cc7ee
Binary files /dev/null and b/images/emoji/1f93b-1f3fc.png differ
diff --git a/images/emoji/1f93b-1f3fd.png b/images/emoji/1f93b-1f3fd.png
new file mode 100644
index 000000000..030f32fdd
Binary files /dev/null and b/images/emoji/1f93b-1f3fd.png differ
diff --git a/images/emoji/1f93b-1f3fe.png b/images/emoji/1f93b-1f3fe.png
new file mode 100644
index 000000000..d4d011091
Binary files /dev/null and b/images/emoji/1f93b-1f3fe.png differ
diff --git a/images/emoji/1f93b-1f3ff.png b/images/emoji/1f93b-1f3ff.png
new file mode 100644
index 000000000..69a9789f5
Binary files /dev/null and b/images/emoji/1f93b-1f3ff.png differ
diff --git a/images/emoji/1f93b.png b/images/emoji/1f93b.png
new file mode 100644
index 000000000..71e67cfad
Binary files /dev/null and b/images/emoji/1f93b.png differ
diff --git a/images/emoji/1f93c-1f3fb.png b/images/emoji/1f93c-1f3fb.png
new file mode 100644
index 000000000..379070fd0
Binary files /dev/null and b/images/emoji/1f93c-1f3fb.png differ
diff --git a/images/emoji/1f93c-1f3fc.png b/images/emoji/1f93c-1f3fc.png
new file mode 100644
index 000000000..6863ea920
Binary files /dev/null and b/images/emoji/1f93c-1f3fc.png differ
diff --git a/images/emoji/1f93c-1f3fd.png b/images/emoji/1f93c-1f3fd.png
new file mode 100644
index 000000000..b7e629101
Binary files /dev/null and b/images/emoji/1f93c-1f3fd.png differ
diff --git a/images/emoji/1f93c-1f3fe.png b/images/emoji/1f93c-1f3fe.png
new file mode 100644
index 000000000..750f95892
Binary files /dev/null and b/images/emoji/1f93c-1f3fe.png differ
diff --git a/images/emoji/1f93c-1f3ff.png b/images/emoji/1f93c-1f3ff.png
new file mode 100644
index 000000000..36ab9bb3f
Binary files /dev/null and b/images/emoji/1f93c-1f3ff.png differ
diff --git a/images/emoji/1f93c.png b/images/emoji/1f93c.png
new file mode 100644
index 000000000..9838f24e5
Binary files /dev/null and b/images/emoji/1f93c.png differ
diff --git a/images/emoji/1f93d-1f3fb.png b/images/emoji/1f93d-1f3fb.png
new file mode 100644
index 000000000..bed1a908d
Binary files /dev/null and b/images/emoji/1f93d-1f3fb.png differ
diff --git a/images/emoji/1f93d-1f3fc.png b/images/emoji/1f93d-1f3fc.png
new file mode 100644
index 000000000..2e44151d3
Binary files /dev/null and b/images/emoji/1f93d-1f3fc.png differ
diff --git a/images/emoji/1f93d-1f3fd.png b/images/emoji/1f93d-1f3fd.png
new file mode 100644
index 000000000..b081a4a5a
Binary files /dev/null and b/images/emoji/1f93d-1f3fd.png differ
diff --git a/images/emoji/1f93d-1f3fe.png b/images/emoji/1f93d-1f3fe.png
new file mode 100644
index 000000000..82cfbc3b0
Binary files /dev/null and b/images/emoji/1f93d-1f3fe.png differ
diff --git a/images/emoji/1f93d-1f3ff.png b/images/emoji/1f93d-1f3ff.png
new file mode 100644
index 000000000..6b8e245dc
Binary files /dev/null and b/images/emoji/1f93d-1f3ff.png differ
diff --git a/images/emoji/1f93d.png b/images/emoji/1f93d.png
new file mode 100644
index 000000000..8d6114761
Binary files /dev/null and b/images/emoji/1f93d.png differ
diff --git a/images/emoji/1f93e-1f3fb.png b/images/emoji/1f93e-1f3fb.png
new file mode 100644
index 000000000..a68057a7d
Binary files /dev/null and b/images/emoji/1f93e-1f3fb.png differ
diff --git a/images/emoji/1f93e-1f3fc.png b/images/emoji/1f93e-1f3fc.png
new file mode 100644
index 000000000..74972f8a5
Binary files /dev/null and b/images/emoji/1f93e-1f3fc.png differ
diff --git a/images/emoji/1f93e-1f3fd.png b/images/emoji/1f93e-1f3fd.png
new file mode 100644
index 000000000..0e3a37c3d
Binary files /dev/null and b/images/emoji/1f93e-1f3fd.png differ
diff --git a/images/emoji/1f93e-1f3fe.png b/images/emoji/1f93e-1f3fe.png
new file mode 100644
index 000000000..e1233f382
Binary files /dev/null and b/images/emoji/1f93e-1f3fe.png differ
diff --git a/images/emoji/1f93e-1f3ff.png b/images/emoji/1f93e-1f3ff.png
new file mode 100644
index 000000000..6b1eb9b64
Binary files /dev/null and b/images/emoji/1f93e-1f3ff.png differ
diff --git a/images/emoji/1f93e.png b/images/emoji/1f93e.png
new file mode 100644
index 000000000..cb4457678
Binary files /dev/null and b/images/emoji/1f93e.png differ
diff --git a/images/emoji/1f93f.png b/images/emoji/1f93f.png
new file mode 100644
index 000000000..677c060b4
Binary files /dev/null and b/images/emoji/1f93f.png differ
diff --git a/images/emoji/1f940.png b/images/emoji/1f940.png
new file mode 100644
index 000000000..62412b143
Binary files /dev/null and b/images/emoji/1f940.png differ
diff --git a/images/emoji/1f942.png b/images/emoji/1f942.png
new file mode 100644
index 000000000..32f18d4c9
Binary files /dev/null and b/images/emoji/1f942.png differ
diff --git a/images/emoji/1f943.png b/images/emoji/1f943.png
new file mode 100644
index 000000000..7bf092298
Binary files /dev/null and b/images/emoji/1f943.png differ
diff --git a/images/emoji/1f944.png b/images/emoji/1f944.png
new file mode 100644
index 000000000..3c4da766a
Binary files /dev/null and b/images/emoji/1f944.png differ
diff --git a/images/emoji/1f945.png b/images/emoji/1f945.png
new file mode 100644
index 000000000..3bec11c5b
Binary files /dev/null and b/images/emoji/1f945.png differ
diff --git a/images/emoji/1f946.png b/images/emoji/1f946.png
new file mode 100644
index 000000000..2815a1bb3
Binary files /dev/null and b/images/emoji/1f946.png differ
diff --git a/images/emoji/1f947.png b/images/emoji/1f947.png
new file mode 100644
index 000000000..83011ad99
Binary files /dev/null and b/images/emoji/1f947.png differ
diff --git a/images/emoji/1f948.png b/images/emoji/1f948.png
new file mode 100644
index 000000000..41926fcf5
Binary files /dev/null and b/images/emoji/1f948.png differ
diff --git a/images/emoji/1f949.png b/images/emoji/1f949.png
new file mode 100644
index 000000000..c713851bc
Binary files /dev/null and b/images/emoji/1f949.png differ
diff --git a/images/emoji/1f950.png b/images/emoji/1f950.png
new file mode 100644
index 000000000..502df5b15
Binary files /dev/null and b/images/emoji/1f950.png differ
diff --git a/images/emoji/1f951.png b/images/emoji/1f951.png
new file mode 100644
index 000000000..96b847232
Binary files /dev/null and b/images/emoji/1f951.png differ
diff --git a/images/emoji/1f952.png b/images/emoji/1f952.png
new file mode 100644
index 000000000..c01fd0edd
Binary files /dev/null and b/images/emoji/1f952.png differ
diff --git a/images/emoji/1f953.png b/images/emoji/1f953.png
new file mode 100644
index 000000000..f38a485fb
Binary files /dev/null and b/images/emoji/1f953.png differ
diff --git a/images/emoji/1f954.png b/images/emoji/1f954.png
new file mode 100644
index 000000000..5fa341216
Binary files /dev/null and b/images/emoji/1f954.png differ
diff --git a/images/emoji/1f955.png b/images/emoji/1f955.png
new file mode 100644
index 000000000..c68829b58
Binary files /dev/null and b/images/emoji/1f955.png differ
diff --git a/images/emoji/1f956.png b/images/emoji/1f956.png
new file mode 100644
index 000000000..72477ff78
Binary files /dev/null and b/images/emoji/1f956.png differ
diff --git a/images/emoji/1f957.png b/images/emoji/1f957.png
new file mode 100644
index 000000000..c89f93411
Binary files /dev/null and b/images/emoji/1f957.png differ
diff --git a/images/emoji/1f958.png b/images/emoji/1f958.png
new file mode 100644
index 000000000..663a1006a
Binary files /dev/null and b/images/emoji/1f958.png differ
diff --git a/images/emoji/1f959.png b/images/emoji/1f959.png
new file mode 100644
index 000000000..a2e10df40
Binary files /dev/null and b/images/emoji/1f959.png differ
diff --git a/images/emoji/1f95a.png b/images/emoji/1f95a.png
new file mode 100644
index 000000000..c171974d9
Binary files /dev/null and b/images/emoji/1f95a.png differ
diff --git a/images/emoji/1f95b.png b/images/emoji/1f95b.png
new file mode 100644
index 000000000..e4fcf2e64
Binary files /dev/null and b/images/emoji/1f95b.png differ
diff --git a/images/emoji/1f95c.png b/images/emoji/1f95c.png
new file mode 100644
index 000000000..b64fadad0
Binary files /dev/null and b/images/emoji/1f95c.png differ
diff --git a/images/emoji/1f95d.png b/images/emoji/1f95d.png
new file mode 100644
index 000000000..f04835776
Binary files /dev/null and b/images/emoji/1f95d.png differ
diff --git a/images/emoji/1f95e.png b/images/emoji/1f95e.png
new file mode 100644
index 000000000..6223d1a28
Binary files /dev/null and b/images/emoji/1f95e.png differ
diff --git a/images/emoji/1f960.png b/images/emoji/1f960.png
new file mode 100644
index 000000000..e890c30d4
Binary files /dev/null and b/images/emoji/1f960.png differ
diff --git a/images/emoji/1f961.png b/images/emoji/1f961.png
new file mode 100644
index 000000000..4d09f0ee4
Binary files /dev/null and b/images/emoji/1f961.png differ
diff --git a/images/emoji/1f980.png b/images/emoji/1f980.png
new file mode 100644
index 000000000..ca9350f51
Binary files /dev/null and b/images/emoji/1f980.png differ
diff --git a/images/emoji/1f981.png b/images/emoji/1f981.png
new file mode 100644
index 000000000..5062ab47e
Binary files /dev/null and b/images/emoji/1f981.png differ
diff --git a/images/emoji/1f982.png b/images/emoji/1f982.png
new file mode 100644
index 000000000..449a6b281
Binary files /dev/null and b/images/emoji/1f982.png differ
diff --git a/images/emoji/1f983.png b/images/emoji/1f983.png
new file mode 100644
index 000000000..344af94c9
Binary files /dev/null and b/images/emoji/1f983.png differ
diff --git a/images/emoji/1f984.png b/images/emoji/1f984.png
new file mode 100644
index 000000000..05a97969f
Binary files /dev/null and b/images/emoji/1f984.png differ
diff --git a/images/emoji/1f985.png b/images/emoji/1f985.png
new file mode 100644
index 000000000..4f277debe
Binary files /dev/null and b/images/emoji/1f985.png differ
diff --git a/images/emoji/1f986.png b/images/emoji/1f986.png
new file mode 100644
index 000000000..74330b77c
Binary files /dev/null and b/images/emoji/1f986.png differ
diff --git a/images/emoji/1f987.png b/images/emoji/1f987.png
new file mode 100644
index 000000000..c8f23c515
Binary files /dev/null and b/images/emoji/1f987.png differ
diff --git a/images/emoji/1f988.png b/images/emoji/1f988.png
new file mode 100644
index 000000000..c75076d57
Binary files /dev/null and b/images/emoji/1f988.png differ
diff --git a/images/emoji/1f989.png b/images/emoji/1f989.png
new file mode 100644
index 000000000..a2c318b15
Binary files /dev/null and b/images/emoji/1f989.png differ
diff --git a/images/emoji/1f98a.png b/images/emoji/1f98a.png
new file mode 100644
index 000000000..aaf1dad35
Binary files /dev/null and b/images/emoji/1f98a.png differ
diff --git a/images/emoji/1f98b.png b/images/emoji/1f98b.png
new file mode 100644
index 000000000..5631fe992
Binary files /dev/null and b/images/emoji/1f98b.png differ
diff --git a/images/emoji/1f98c.png b/images/emoji/1f98c.png
new file mode 100644
index 000000000..4a501f880
Binary files /dev/null and b/images/emoji/1f98c.png differ
diff --git a/images/emoji/1f98d.png b/images/emoji/1f98d.png
new file mode 100644
index 000000000..4f2f9bb38
Binary files /dev/null and b/images/emoji/1f98d.png differ
diff --git a/images/emoji/1f98e.png b/images/emoji/1f98e.png
new file mode 100644
index 000000000..836387605
Binary files /dev/null and b/images/emoji/1f98e.png differ
diff --git a/images/emoji/1f98f.png b/images/emoji/1f98f.png
new file mode 100644
index 000000000..12f4e0d9d
Binary files /dev/null and b/images/emoji/1f98f.png differ
diff --git a/images/emoji/1f990.png b/images/emoji/1f990.png
new file mode 100644
index 000000000..49eff28a7
Binary files /dev/null and b/images/emoji/1f990.png differ
diff --git a/images/emoji/1f991.png b/images/emoji/1f991.png
new file mode 100644
index 000000000..f01eeba24
Binary files /dev/null and b/images/emoji/1f991.png differ
diff --git a/images/emoji/1f9c0.png b/images/emoji/1f9c0.png
new file mode 100644
index 000000000..00e997622
Binary files /dev/null and b/images/emoji/1f9c0.png differ
diff --git a/images/emoji/203c.png b/images/emoji/203c.png
new file mode 100644
index 000000000..58a9c528f
Binary files /dev/null and b/images/emoji/203c.png differ
diff --git a/images/emoji/2049.png b/images/emoji/2049.png
new file mode 100644
index 000000000..509813e9b
Binary files /dev/null and b/images/emoji/2049.png differ
diff --git a/images/emoji/2122.png b/images/emoji/2122.png
new file mode 100644
index 000000000..7a0c44a2c
Binary files /dev/null and b/images/emoji/2122.png differ
diff --git a/images/emoji/2139.png b/images/emoji/2139.png
new file mode 100644
index 000000000..871f2db93
Binary files /dev/null and b/images/emoji/2139.png differ
diff --git a/images/emoji/2194.png b/images/emoji/2194.png
new file mode 100644
index 000000000..7937f24f2
Binary files /dev/null and b/images/emoji/2194.png differ
diff --git a/images/emoji/2195.png b/images/emoji/2195.png
new file mode 100644
index 000000000..dfa32b971
Binary files /dev/null and b/images/emoji/2195.png differ
diff --git a/images/emoji/2196.png b/images/emoji/2196.png
new file mode 100644
index 000000000..f38718fbe
Binary files /dev/null and b/images/emoji/2196.png differ
diff --git a/images/emoji/2197.png b/images/emoji/2197.png
new file mode 100644
index 000000000..c43e12d0f
Binary files /dev/null and b/images/emoji/2197.png differ
diff --git a/images/emoji/2198.png b/images/emoji/2198.png
new file mode 100644
index 000000000..7e807da73
Binary files /dev/null and b/images/emoji/2198.png differ
diff --git a/images/emoji/2199.png b/images/emoji/2199.png
new file mode 100644
index 000000000..88b377160
Binary files /dev/null and b/images/emoji/2199.png differ
diff --git a/images/emoji/21a9.png b/images/emoji/21a9.png
new file mode 100644
index 000000000..ba45c2ad9
Binary files /dev/null and b/images/emoji/21a9.png differ
diff --git a/images/emoji/21aa.png b/images/emoji/21aa.png
new file mode 100644
index 000000000..e7258ad32
Binary files /dev/null and b/images/emoji/21aa.png differ
diff --git a/images/emoji/231a.png b/images/emoji/231a.png
new file mode 100644
index 000000000..64819bc6e
Binary files /dev/null and b/images/emoji/231a.png differ
diff --git a/images/emoji/231b.png b/images/emoji/231b.png
new file mode 100644
index 000000000..a5db2d1d3
Binary files /dev/null and b/images/emoji/231b.png differ
diff --git a/images/emoji/2328.png b/images/emoji/2328.png
new file mode 100644
index 000000000..75027cb9a
Binary files /dev/null and b/images/emoji/2328.png differ
diff --git a/images/emoji/23cf.png b/images/emoji/23cf.png
new file mode 100644
index 000000000..ec5cfc489
Binary files /dev/null and b/images/emoji/23cf.png differ
diff --git a/images/emoji/23e9.png b/images/emoji/23e9.png
new file mode 100644
index 000000000..c406fedfd
Binary files /dev/null and b/images/emoji/23e9.png differ
diff --git a/images/emoji/23ea.png b/images/emoji/23ea.png
new file mode 100644
index 000000000..e22e2bd3d
Binary files /dev/null and b/images/emoji/23ea.png differ
diff --git a/images/emoji/23eb.png b/images/emoji/23eb.png
new file mode 100644
index 000000000..13543d5ee
Binary files /dev/null and b/images/emoji/23eb.png differ
diff --git a/images/emoji/23ec.png b/images/emoji/23ec.png
new file mode 100644
index 000000000..90193bfcb
Binary files /dev/null and b/images/emoji/23ec.png differ
diff --git a/images/emoji/23ed.png b/images/emoji/23ed.png
new file mode 100644
index 000000000..f8880d33b
Binary files /dev/null and b/images/emoji/23ed.png differ
diff --git a/images/emoji/23ee.png b/images/emoji/23ee.png
new file mode 100644
index 000000000..1ffd0566c
Binary files /dev/null and b/images/emoji/23ee.png differ
diff --git a/images/emoji/23ef.png b/images/emoji/23ef.png
new file mode 100644
index 000000000..a9f857139
Binary files /dev/null and b/images/emoji/23ef.png differ
diff --git a/images/emoji/23f0.png b/images/emoji/23f0.png
new file mode 100644
index 000000000..cdbc2fbb9
Binary files /dev/null and b/images/emoji/23f0.png differ
diff --git a/images/emoji/23f1.png b/images/emoji/23f1.png
new file mode 100644
index 000000000..6a3a2ef64
Binary files /dev/null and b/images/emoji/23f1.png differ
diff --git a/images/emoji/23f2.png b/images/emoji/23f2.png
new file mode 100644
index 000000000..8a3be574c
Binary files /dev/null and b/images/emoji/23f2.png differ
diff --git a/images/emoji/23f3.png b/images/emoji/23f3.png
new file mode 100644
index 000000000..b93b15ed6
Binary files /dev/null and b/images/emoji/23f3.png differ
diff --git a/images/emoji/23f8.png b/images/emoji/23f8.png
new file mode 100644
index 000000000..4f07e7ebf
Binary files /dev/null and b/images/emoji/23f8.png differ
diff --git a/images/emoji/23f9.png b/images/emoji/23f9.png
new file mode 100644
index 000000000..cfa99988a
Binary files /dev/null and b/images/emoji/23f9.png differ
diff --git a/images/emoji/23fa.png b/images/emoji/23fa.png
new file mode 100644
index 000000000..ada52830f
Binary files /dev/null and b/images/emoji/23fa.png differ
diff --git a/images/emoji/24c2.png b/images/emoji/24c2.png
new file mode 100644
index 000000000..8a3506fc1
Binary files /dev/null and b/images/emoji/24c2.png differ
diff --git a/images/emoji/25aa.png b/images/emoji/25aa.png
new file mode 100644
index 000000000..48595d3e1
Binary files /dev/null and b/images/emoji/25aa.png differ
diff --git a/images/emoji/25ab.png b/images/emoji/25ab.png
new file mode 100644
index 000000000..d7ebdb0c0
Binary files /dev/null and b/images/emoji/25ab.png differ
diff --git a/images/emoji/25b6.png b/images/emoji/25b6.png
new file mode 100644
index 000000000..4e2b68285
Binary files /dev/null and b/images/emoji/25b6.png differ
diff --git a/images/emoji/25c0.png b/images/emoji/25c0.png
new file mode 100644
index 000000000..ee38e3b03
Binary files /dev/null and b/images/emoji/25c0.png differ
diff --git a/images/emoji/25fb.png b/images/emoji/25fb.png
new file mode 100644
index 000000000..8daacf570
Binary files /dev/null and b/images/emoji/25fb.png differ
diff --git a/images/emoji/25fc.png b/images/emoji/25fc.png
new file mode 100644
index 000000000..05a30a6aa
Binary files /dev/null and b/images/emoji/25fc.png differ
diff --git a/images/emoji/25fd.png b/images/emoji/25fd.png
new file mode 100644
index 000000000..ae8741267
Binary files /dev/null and b/images/emoji/25fd.png differ
diff --git a/images/emoji/25fe.png b/images/emoji/25fe.png
new file mode 100644
index 000000000..39765bba6
Binary files /dev/null and b/images/emoji/25fe.png differ
diff --git a/images/emoji/2600.png b/images/emoji/2600.png
new file mode 100644
index 000000000..fd521ae31
Binary files /dev/null and b/images/emoji/2600.png differ
diff --git a/images/emoji/2601.png b/images/emoji/2601.png
new file mode 100644
index 000000000..5b4f57f77
Binary files /dev/null and b/images/emoji/2601.png differ
diff --git a/images/emoji/2602.png b/images/emoji/2602.png
new file mode 100644
index 000000000..97fe859e7
Binary files /dev/null and b/images/emoji/2602.png differ
diff --git a/images/emoji/2603.png b/images/emoji/2603.png
new file mode 100644
index 000000000..896f28502
Binary files /dev/null and b/images/emoji/2603.png differ
diff --git a/images/emoji/2604.png b/images/emoji/2604.png
new file mode 100644
index 000000000..d775d6387
Binary files /dev/null and b/images/emoji/2604.png differ
diff --git a/images/emoji/260e.png b/images/emoji/260e.png
new file mode 100644
index 000000000..0fbb8c12c
Binary files /dev/null and b/images/emoji/260e.png differ
diff --git a/images/emoji/2611.png b/images/emoji/2611.png
new file mode 100644
index 000000000..284d95738
Binary files /dev/null and b/images/emoji/2611.png differ
diff --git a/images/emoji/2614.png b/images/emoji/2614.png
new file mode 100644
index 000000000..5b35b7ff6
Binary files /dev/null and b/images/emoji/2614.png differ
diff --git a/images/emoji/2615.png b/images/emoji/2615.png
new file mode 100644
index 000000000..553061471
Binary files /dev/null and b/images/emoji/2615.png differ
diff --git a/images/emoji/2618.png b/images/emoji/2618.png
new file mode 100644
index 000000000..f202aecfe
Binary files /dev/null and b/images/emoji/2618.png differ
diff --git a/images/emoji/261d-1f3fb.png b/images/emoji/261d-1f3fb.png
new file mode 100644
index 000000000..6a9db21d6
Binary files /dev/null and b/images/emoji/261d-1f3fb.png differ
diff --git a/images/emoji/261d-1f3fc.png b/images/emoji/261d-1f3fc.png
new file mode 100644
index 000000000..15aa9ea0e
Binary files /dev/null and b/images/emoji/261d-1f3fc.png differ
diff --git a/images/emoji/261d-1f3fd.png b/images/emoji/261d-1f3fd.png
new file mode 100644
index 000000000..652b73a9c
Binary files /dev/null and b/images/emoji/261d-1f3fd.png differ
diff --git a/images/emoji/261d-1f3fe.png b/images/emoji/261d-1f3fe.png
new file mode 100644
index 000000000..692bad926
Binary files /dev/null and b/images/emoji/261d-1f3fe.png differ
diff --git a/images/emoji/261d-1f3ff.png b/images/emoji/261d-1f3ff.png
new file mode 100644
index 000000000..1e1b10fb7
Binary files /dev/null and b/images/emoji/261d-1f3ff.png differ
diff --git a/images/emoji/261d.png b/images/emoji/261d.png
new file mode 100644
index 000000000..f4978ff0f
Binary files /dev/null and b/images/emoji/261d.png differ
diff --git a/images/emoji/2620.png b/images/emoji/2620.png
new file mode 100644
index 000000000..b459df922
Binary files /dev/null and b/images/emoji/2620.png differ
diff --git a/images/emoji/2622.png b/images/emoji/2622.png
new file mode 100644
index 000000000..3b46199fe
Binary files /dev/null and b/images/emoji/2622.png differ
diff --git a/images/emoji/2623.png b/images/emoji/2623.png
new file mode 100644
index 000000000..007b4fc2d
Binary files /dev/null and b/images/emoji/2623.png differ
diff --git a/images/emoji/2626.png b/images/emoji/2626.png
new file mode 100644
index 000000000..0530e33a4
Binary files /dev/null and b/images/emoji/2626.png differ
diff --git a/images/emoji/262a.png b/images/emoji/262a.png
new file mode 100644
index 000000000..e18263645
Binary files /dev/null and b/images/emoji/262a.png differ
diff --git a/images/emoji/262e.png b/images/emoji/262e.png
new file mode 100644
index 000000000..86033faf4
Binary files /dev/null and b/images/emoji/262e.png differ
diff --git a/images/emoji/262f.png b/images/emoji/262f.png
new file mode 100644
index 000000000..f2900f633
Binary files /dev/null and b/images/emoji/262f.png differ
diff --git a/images/emoji/2638.png b/images/emoji/2638.png
new file mode 100644
index 000000000..3666db001
Binary files /dev/null and b/images/emoji/2638.png differ
diff --git a/images/emoji/2639.png b/images/emoji/2639.png
new file mode 100644
index 000000000..6ae71f233
Binary files /dev/null and b/images/emoji/2639.png differ
diff --git a/images/emoji/263a.png b/images/emoji/263a.png
new file mode 100644
index 000000000..e9e53c03d
Binary files /dev/null and b/images/emoji/263a.png differ
diff --git a/images/emoji/2648.png b/images/emoji/2648.png
new file mode 100644
index 000000000..21a189d0e
Binary files /dev/null and b/images/emoji/2648.png differ
diff --git a/images/emoji/2649.png b/images/emoji/2649.png
new file mode 100644
index 000000000..b2a370df4
Binary files /dev/null and b/images/emoji/2649.png differ
diff --git a/images/emoji/264a.png b/images/emoji/264a.png
new file mode 100644
index 000000000..1a09698cf
Binary files /dev/null and b/images/emoji/264a.png differ
diff --git a/images/emoji/264b.png b/images/emoji/264b.png
new file mode 100644
index 000000000..a64af07cb
Binary files /dev/null and b/images/emoji/264b.png differ
diff --git a/images/emoji/264c.png b/images/emoji/264c.png
new file mode 100644
index 000000000..30158d34d
Binary files /dev/null and b/images/emoji/264c.png differ
diff --git a/images/emoji/264d.png b/images/emoji/264d.png
new file mode 100644
index 000000000..a6b56c2cb
Binary files /dev/null and b/images/emoji/264d.png differ
diff --git a/images/emoji/264e.png b/images/emoji/264e.png
new file mode 100644
index 000000000..8fd133a35
Binary files /dev/null and b/images/emoji/264e.png differ
diff --git a/images/emoji/264f.png b/images/emoji/264f.png
new file mode 100644
index 000000000..c31a99204
Binary files /dev/null and b/images/emoji/264f.png differ
diff --git a/images/emoji/2650.png b/images/emoji/2650.png
new file mode 100644
index 000000000..f8d94ff29
Binary files /dev/null and b/images/emoji/2650.png differ
diff --git a/images/emoji/2651.png b/images/emoji/2651.png
new file mode 100644
index 000000000..6293d31d4
Binary files /dev/null and b/images/emoji/2651.png differ
diff --git a/images/emoji/2652.png b/images/emoji/2652.png
new file mode 100644
index 000000000..641a4f688
Binary files /dev/null and b/images/emoji/2652.png differ
diff --git a/images/emoji/2653.png b/images/emoji/2653.png
new file mode 100644
index 000000000..7f6f646a9
Binary files /dev/null and b/images/emoji/2653.png differ
diff --git a/images/emoji/2660.png b/images/emoji/2660.png
new file mode 100644
index 000000000..f822f184c
Binary files /dev/null and b/images/emoji/2660.png differ
diff --git a/images/emoji/2663.png b/images/emoji/2663.png
new file mode 100644
index 000000000..4f2abf791
Binary files /dev/null and b/images/emoji/2663.png differ
diff --git a/images/emoji/2665.png b/images/emoji/2665.png
new file mode 100644
index 000000000..393c3ed52
Binary files /dev/null and b/images/emoji/2665.png differ
diff --git a/images/emoji/2666.png b/images/emoji/2666.png
new file mode 100644
index 000000000..1f25f51f9
Binary files /dev/null and b/images/emoji/2666.png differ
diff --git a/images/emoji/2668.png b/images/emoji/2668.png
new file mode 100644
index 000000000..3d9df2d94
Binary files /dev/null and b/images/emoji/2668.png differ
diff --git a/images/emoji/267b.png b/images/emoji/267b.png
new file mode 100644
index 000000000..9221f095c
Binary files /dev/null and b/images/emoji/267b.png differ
diff --git a/images/emoji/267f.png b/images/emoji/267f.png
new file mode 100644
index 000000000..4e5b2698e
Binary files /dev/null and b/images/emoji/267f.png differ
diff --git a/images/emoji/2692.png b/images/emoji/2692.png
new file mode 100644
index 000000000..3bee30ec5
Binary files /dev/null and b/images/emoji/2692.png differ
diff --git a/images/emoji/2693.png b/images/emoji/2693.png
new file mode 100644
index 000000000..b036f70a0
Binary files /dev/null and b/images/emoji/2693.png differ
diff --git a/images/emoji/2694.png b/images/emoji/2694.png
new file mode 100644
index 000000000..907e96071
Binary files /dev/null and b/images/emoji/2694.png differ
diff --git a/images/emoji/2696.png b/images/emoji/2696.png
new file mode 100644
index 000000000..0757eda16
Binary files /dev/null and b/images/emoji/2696.png differ
diff --git a/images/emoji/2697.png b/images/emoji/2697.png
new file mode 100644
index 000000000..307a73242
Binary files /dev/null and b/images/emoji/2697.png differ
diff --git a/images/emoji/2699.png b/images/emoji/2699.png
new file mode 100644
index 000000000..2a1cc2c0f
Binary files /dev/null and b/images/emoji/2699.png differ
diff --git a/images/emoji/269b.png b/images/emoji/269b.png
new file mode 100644
index 000000000..5f4567aa0
Binary files /dev/null and b/images/emoji/269b.png differ
diff --git a/images/emoji/269c.png b/images/emoji/269c.png
new file mode 100644
index 000000000..c9250d27f
Binary files /dev/null and b/images/emoji/269c.png differ
diff --git a/images/emoji/26a0.png b/images/emoji/26a0.png
new file mode 100644
index 000000000..35691c2ed
Binary files /dev/null and b/images/emoji/26a0.png differ
diff --git a/images/emoji/26a1.png b/images/emoji/26a1.png
new file mode 100644
index 000000000..47e68e48e
Binary files /dev/null and b/images/emoji/26a1.png differ
diff --git a/images/emoji/26aa.png b/images/emoji/26aa.png
new file mode 100644
index 000000000..c19e15684
Binary files /dev/null and b/images/emoji/26aa.png differ
diff --git a/images/emoji/26ab.png b/images/emoji/26ab.png
new file mode 100644
index 000000000..b62b87170
Binary files /dev/null and b/images/emoji/26ab.png differ
diff --git a/images/emoji/26b0.png b/images/emoji/26b0.png
new file mode 100644
index 000000000..fb2932aa5
Binary files /dev/null and b/images/emoji/26b0.png differ
diff --git a/images/emoji/26b1.png b/images/emoji/26b1.png
new file mode 100644
index 000000000..6b5b35034
Binary files /dev/null and b/images/emoji/26b1.png differ
diff --git a/images/emoji/26bd.png b/images/emoji/26bd.png
new file mode 100644
index 000000000..28cfa218d
Binary files /dev/null and b/images/emoji/26bd.png differ
diff --git a/images/emoji/26be.png b/images/emoji/26be.png
new file mode 100644
index 000000000..f8463f153
Binary files /dev/null and b/images/emoji/26be.png differ
diff --git a/images/emoji/26c4.png b/images/emoji/26c4.png
new file mode 100644
index 000000000..20c177c2a
Binary files /dev/null and b/images/emoji/26c4.png differ
diff --git a/images/emoji/26c5.png b/images/emoji/26c5.png
new file mode 100644
index 000000000..a55e59c34
Binary files /dev/null and b/images/emoji/26c5.png differ
diff --git a/images/emoji/26c8.png b/images/emoji/26c8.png
new file mode 100644
index 000000000..31a26a1b6
Binary files /dev/null and b/images/emoji/26c8.png differ
diff --git a/images/emoji/26ce.png b/images/emoji/26ce.png
new file mode 100644
index 000000000..0a780a700
Binary files /dev/null and b/images/emoji/26ce.png differ
diff --git a/images/emoji/26cf.png b/images/emoji/26cf.png
new file mode 100644
index 000000000..6370fe6d7
Binary files /dev/null and b/images/emoji/26cf.png differ
diff --git a/images/emoji/26d1.png b/images/emoji/26d1.png
new file mode 100644
index 000000000..7140a6760
Binary files /dev/null and b/images/emoji/26d1.png differ
diff --git a/images/emoji/26d3.png b/images/emoji/26d3.png
new file mode 100644
index 000000000..57f46139a
Binary files /dev/null and b/images/emoji/26d3.png differ
diff --git a/images/emoji/26d4.png b/images/emoji/26d4.png
new file mode 100644
index 000000000..476800fc5
Binary files /dev/null and b/images/emoji/26d4.png differ
diff --git a/images/emoji/26e9.png b/images/emoji/26e9.png
new file mode 100644
index 000000000..5a344975b
Binary files /dev/null and b/images/emoji/26e9.png differ
diff --git a/images/emoji/26ea.png b/images/emoji/26ea.png
new file mode 100644
index 000000000..24df10f1a
Binary files /dev/null and b/images/emoji/26ea.png differ
diff --git a/images/emoji/26f0.png b/images/emoji/26f0.png
new file mode 100644
index 000000000..6722ebdd2
Binary files /dev/null and b/images/emoji/26f0.png differ
diff --git a/images/emoji/26f1.png b/images/emoji/26f1.png
new file mode 100644
index 000000000..258e1e757
Binary files /dev/null and b/images/emoji/26f1.png differ
diff --git a/images/emoji/26f2.png b/images/emoji/26f2.png
new file mode 100644
index 000000000..293f5d91c
Binary files /dev/null and b/images/emoji/26f2.png differ
diff --git a/images/emoji/26f3.png b/images/emoji/26f3.png
new file mode 100644
index 000000000..f65a21d8a
Binary files /dev/null and b/images/emoji/26f3.png differ
diff --git a/images/emoji/26f4.png b/images/emoji/26f4.png
new file mode 100644
index 000000000..41816b3ae
Binary files /dev/null and b/images/emoji/26f4.png differ
diff --git a/images/emoji/26f5.png b/images/emoji/26f5.png
new file mode 100644
index 000000000..772ef11da
Binary files /dev/null and b/images/emoji/26f5.png differ
diff --git a/images/emoji/26f7.png b/images/emoji/26f7.png
new file mode 100644
index 000000000..2eb3bdce2
Binary files /dev/null and b/images/emoji/26f7.png differ
diff --git a/images/emoji/26f8.png b/images/emoji/26f8.png
new file mode 100644
index 000000000..c56b7b8a5
Binary files /dev/null and b/images/emoji/26f8.png differ
diff --git a/images/emoji/26f9-1f3fb.png b/images/emoji/26f9-1f3fb.png
new file mode 100644
index 000000000..43f97e7c3
Binary files /dev/null and b/images/emoji/26f9-1f3fb.png differ
diff --git a/images/emoji/26f9-1f3fc.png b/images/emoji/26f9-1f3fc.png
new file mode 100644
index 000000000..f892fd596
Binary files /dev/null and b/images/emoji/26f9-1f3fc.png differ
diff --git a/images/emoji/26f9-1f3fd.png b/images/emoji/26f9-1f3fd.png
new file mode 100644
index 000000000..e109997a9
Binary files /dev/null and b/images/emoji/26f9-1f3fd.png differ
diff --git a/images/emoji/26f9-1f3fe.png b/images/emoji/26f9-1f3fe.png
new file mode 100644
index 000000000..354e8f9c2
Binary files /dev/null and b/images/emoji/26f9-1f3fe.png differ
diff --git a/images/emoji/26f9-1f3ff.png b/images/emoji/26f9-1f3ff.png
new file mode 100644
index 000000000..9581dbbea
Binary files /dev/null and b/images/emoji/26f9-1f3ff.png differ
diff --git a/images/emoji/26f9.png b/images/emoji/26f9.png
new file mode 100644
index 000000000..63bff9c3e
Binary files /dev/null and b/images/emoji/26f9.png differ
diff --git a/images/emoji/26fa.png b/images/emoji/26fa.png
new file mode 100644
index 000000000..3fddcfc56
Binary files /dev/null and b/images/emoji/26fa.png differ
diff --git a/images/emoji/26fd.png b/images/emoji/26fd.png
new file mode 100644
index 000000000..05b187944
Binary files /dev/null and b/images/emoji/26fd.png differ
diff --git a/images/emoji/2702.png b/images/emoji/2702.png
new file mode 100644
index 000000000..270571c8c
Binary files /dev/null and b/images/emoji/2702.png differ
diff --git a/images/emoji/2705.png b/images/emoji/2705.png
new file mode 100644
index 000000000..e55f087e5
Binary files /dev/null and b/images/emoji/2705.png differ
diff --git a/images/emoji/2708.png b/images/emoji/2708.png
new file mode 100644
index 000000000..268d2ac3c
Binary files /dev/null and b/images/emoji/2708.png differ
diff --git a/images/emoji/2709.png b/images/emoji/2709.png
new file mode 100644
index 000000000..ec77ac375
Binary files /dev/null and b/images/emoji/2709.png differ
diff --git a/images/emoji/270a-1f3fb.png b/images/emoji/270a-1f3fb.png
new file mode 100644
index 000000000..02809e2dd
Binary files /dev/null and b/images/emoji/270a-1f3fb.png differ
diff --git a/images/emoji/270a-1f3fc.png b/images/emoji/270a-1f3fc.png
new file mode 100644
index 000000000..5de348103
Binary files /dev/null and b/images/emoji/270a-1f3fc.png differ
diff --git a/images/emoji/270a-1f3fd.png b/images/emoji/270a-1f3fd.png
new file mode 100644
index 000000000..0d5240129
Binary files /dev/null and b/images/emoji/270a-1f3fd.png differ
diff --git a/images/emoji/270a-1f3fe.png b/images/emoji/270a-1f3fe.png
new file mode 100644
index 000000000..a95c0dd63
Binary files /dev/null and b/images/emoji/270a-1f3fe.png differ
diff --git a/images/emoji/270a-1f3ff.png b/images/emoji/270a-1f3ff.png
new file mode 100644
index 000000000..a2f092fd8
Binary files /dev/null and b/images/emoji/270a-1f3ff.png differ
diff --git a/images/emoji/270a.png b/images/emoji/270a.png
new file mode 100644
index 000000000..de33592bf
Binary files /dev/null and b/images/emoji/270a.png differ
diff --git a/images/emoji/270b-1f3fb.png b/images/emoji/270b-1f3fb.png
new file mode 100644
index 000000000..3b752902c
Binary files /dev/null and b/images/emoji/270b-1f3fb.png differ
diff --git a/images/emoji/270b-1f3fc.png b/images/emoji/270b-1f3fc.png
new file mode 100644
index 000000000..44e2a514c
Binary files /dev/null and b/images/emoji/270b-1f3fc.png differ
diff --git a/images/emoji/270b-1f3fd.png b/images/emoji/270b-1f3fd.png
new file mode 100644
index 000000000..5bb62a752
Binary files /dev/null and b/images/emoji/270b-1f3fd.png differ
diff --git a/images/emoji/270b-1f3fe.png b/images/emoji/270b-1f3fe.png
new file mode 100644
index 000000000..c7f8c9ec2
Binary files /dev/null and b/images/emoji/270b-1f3fe.png differ
diff --git a/images/emoji/270b-1f3ff.png b/images/emoji/270b-1f3ff.png
new file mode 100644
index 000000000..c601b58a7
Binary files /dev/null and b/images/emoji/270b-1f3ff.png differ
diff --git a/images/emoji/270b.png b/images/emoji/270b.png
new file mode 100644
index 000000000..6b2954315
Binary files /dev/null and b/images/emoji/270b.png differ
diff --git a/images/emoji/270c-1f3fb.png b/images/emoji/270c-1f3fb.png
new file mode 100644
index 000000000..6ac54a745
Binary files /dev/null and b/images/emoji/270c-1f3fb.png differ
diff --git a/images/emoji/270c-1f3fc.png b/images/emoji/270c-1f3fc.png
new file mode 100644
index 000000000..6dd966986
Binary files /dev/null and b/images/emoji/270c-1f3fc.png differ
diff --git a/images/emoji/270c-1f3fd.png b/images/emoji/270c-1f3fd.png
new file mode 100644
index 000000000..a615e53f0
Binary files /dev/null and b/images/emoji/270c-1f3fd.png differ
diff --git a/images/emoji/270c-1f3fe.png b/images/emoji/270c-1f3fe.png
new file mode 100644
index 000000000..33a34bd5a
Binary files /dev/null and b/images/emoji/270c-1f3fe.png differ
diff --git a/images/emoji/270c-1f3ff.png b/images/emoji/270c-1f3ff.png
new file mode 100644
index 000000000..45ad14b6c
Binary files /dev/null and b/images/emoji/270c-1f3ff.png differ
diff --git a/images/emoji/270c.png b/images/emoji/270c.png
new file mode 100644
index 000000000..70c5516ff
Binary files /dev/null and b/images/emoji/270c.png differ
diff --git a/images/emoji/270d-1f3fb.png b/images/emoji/270d-1f3fb.png
new file mode 100644
index 000000000..7923d8ebb
Binary files /dev/null and b/images/emoji/270d-1f3fb.png differ
diff --git a/images/emoji/270d-1f3fc.png b/images/emoji/270d-1f3fc.png
new file mode 100644
index 000000000..bcb304e15
Binary files /dev/null and b/images/emoji/270d-1f3fc.png differ
diff --git a/images/emoji/270d-1f3fd.png b/images/emoji/270d-1f3fd.png
new file mode 100644
index 000000000..fd885fd2d
Binary files /dev/null and b/images/emoji/270d-1f3fd.png differ
diff --git a/images/emoji/270d-1f3fe.png b/images/emoji/270d-1f3fe.png
new file mode 100644
index 000000000..d065b8c64
Binary files /dev/null and b/images/emoji/270d-1f3fe.png differ
diff --git a/images/emoji/270d-1f3ff.png b/images/emoji/270d-1f3ff.png
new file mode 100644
index 000000000..a44b3dd75
Binary files /dev/null and b/images/emoji/270d-1f3ff.png differ
diff --git a/images/emoji/270d.png b/images/emoji/270d.png
new file mode 100644
index 000000000..85639f8ac
Binary files /dev/null and b/images/emoji/270d.png differ
diff --git a/images/emoji/270f.png b/images/emoji/270f.png
new file mode 100644
index 000000000..3833d590f
Binary files /dev/null and b/images/emoji/270f.png differ
diff --git a/images/emoji/2712.png b/images/emoji/2712.png
new file mode 100644
index 000000000..872d0ae15
Binary files /dev/null and b/images/emoji/2712.png differ
diff --git a/images/emoji/2714.png b/images/emoji/2714.png
new file mode 100644
index 000000000..03bd69537
Binary files /dev/null and b/images/emoji/2714.png differ
diff --git a/images/emoji/2716.png b/images/emoji/2716.png
new file mode 100644
index 000000000..e47cc1b68
Binary files /dev/null and b/images/emoji/2716.png differ
diff --git a/images/emoji/271d.png b/images/emoji/271d.png
new file mode 100644
index 000000000..42b10e822
Binary files /dev/null and b/images/emoji/271d.png differ
diff --git a/images/emoji/2721.png b/images/emoji/2721.png
new file mode 100644
index 000000000..fc59d0dde
Binary files /dev/null and b/images/emoji/2721.png differ
diff --git a/images/emoji/2728.png b/images/emoji/2728.png
new file mode 100644
index 000000000..169bc10b0
Binary files /dev/null and b/images/emoji/2728.png differ
diff --git a/images/emoji/2733.png b/images/emoji/2733.png
new file mode 100644
index 000000000..3307ffa62
Binary files /dev/null and b/images/emoji/2733.png differ
diff --git a/images/emoji/2734.png b/images/emoji/2734.png
new file mode 100644
index 000000000..820179bda
Binary files /dev/null and b/images/emoji/2734.png differ
diff --git a/images/emoji/2744.png b/images/emoji/2744.png
new file mode 100644
index 000000000..db319a77e
Binary files /dev/null and b/images/emoji/2744.png differ
diff --git a/images/emoji/2747.png b/images/emoji/2747.png
new file mode 100644
index 000000000..6aa7b6ec9
Binary files /dev/null and b/images/emoji/2747.png differ
diff --git a/images/emoji/274c.png b/images/emoji/274c.png
new file mode 100644
index 000000000..9f9ed0f7a
Binary files /dev/null and b/images/emoji/274c.png differ
diff --git a/images/emoji/274e.png b/images/emoji/274e.png
new file mode 100644
index 000000000..dae487f1f
Binary files /dev/null and b/images/emoji/274e.png differ
diff --git a/images/emoji/2753.png b/images/emoji/2753.png
new file mode 100644
index 000000000..5a58f3458
Binary files /dev/null and b/images/emoji/2753.png differ
diff --git a/images/emoji/2754.png b/images/emoji/2754.png
new file mode 100644
index 000000000..6e7824c75
Binary files /dev/null and b/images/emoji/2754.png differ
diff --git a/images/emoji/2755.png b/images/emoji/2755.png
new file mode 100644
index 000000000..9b64da8bf
Binary files /dev/null and b/images/emoji/2755.png differ
diff --git a/images/emoji/2757.png b/images/emoji/2757.png
new file mode 100644
index 000000000..2c1440642
Binary files /dev/null and b/images/emoji/2757.png differ
diff --git a/images/emoji/2763.png b/images/emoji/2763.png
new file mode 100644
index 000000000..91b520be4
Binary files /dev/null and b/images/emoji/2763.png differ
diff --git a/images/emoji/2764.png b/images/emoji/2764.png
new file mode 100644
index 000000000..638cb72dc
Binary files /dev/null and b/images/emoji/2764.png differ
diff --git a/images/emoji/2795.png b/images/emoji/2795.png
new file mode 100644
index 000000000..40799798a
Binary files /dev/null and b/images/emoji/2795.png differ
diff --git a/images/emoji/2796.png b/images/emoji/2796.png
new file mode 100644
index 000000000..054211caf
Binary files /dev/null and b/images/emoji/2796.png differ
diff --git a/images/emoji/2797.png b/images/emoji/2797.png
new file mode 100644
index 000000000..df32ab21b
Binary files /dev/null and b/images/emoji/2797.png differ
diff --git a/images/emoji/27a1.png b/images/emoji/27a1.png
new file mode 100644
index 000000000..4755670b5
Binary files /dev/null and b/images/emoji/27a1.png differ
diff --git a/images/emoji/27b0.png b/images/emoji/27b0.png
new file mode 100644
index 000000000..440aa56d5
Binary files /dev/null and b/images/emoji/27b0.png differ
diff --git a/images/emoji/27bf.png b/images/emoji/27bf.png
new file mode 100644
index 000000000..0b82c8fe3
Binary files /dev/null and b/images/emoji/27bf.png differ
diff --git a/images/emoji/2934.png b/images/emoji/2934.png
new file mode 100644
index 000000000..f29bfcfc0
Binary files /dev/null and b/images/emoji/2934.png differ
diff --git a/images/emoji/2935.png b/images/emoji/2935.png
new file mode 100644
index 000000000..2d9d24bca
Binary files /dev/null and b/images/emoji/2935.png differ
diff --git a/images/emoji/2b05.png b/images/emoji/2b05.png
new file mode 100644
index 000000000..8c685e0a8
Binary files /dev/null and b/images/emoji/2b05.png differ
diff --git a/images/emoji/2b06.png b/images/emoji/2b06.png
new file mode 100644
index 000000000..af8218a87
Binary files /dev/null and b/images/emoji/2b06.png differ
diff --git a/images/emoji/2b07.png b/images/emoji/2b07.png
new file mode 100644
index 000000000..b8eefd0b1
Binary files /dev/null and b/images/emoji/2b07.png differ
diff --git a/images/emoji/2b1b.png b/images/emoji/2b1b.png
new file mode 100644
index 000000000..162f2bb42
Binary files /dev/null and b/images/emoji/2b1b.png differ
diff --git a/images/emoji/2b1c.png b/images/emoji/2b1c.png
new file mode 100644
index 000000000..6f06c1c79
Binary files /dev/null and b/images/emoji/2b1c.png differ
diff --git a/images/emoji/2b50.png b/images/emoji/2b50.png
new file mode 100644
index 000000000..c93094707
Binary files /dev/null and b/images/emoji/2b50.png differ
diff --git a/images/emoji/2b55.png b/images/emoji/2b55.png
new file mode 100644
index 000000000..3fe75ce46
Binary files /dev/null and b/images/emoji/2b55.png differ
diff --git a/images/emoji/3030.png b/images/emoji/3030.png
new file mode 100644
index 000000000..001c8d6e4
Binary files /dev/null and b/images/emoji/3030.png differ
diff --git a/images/emoji/303d.png b/images/emoji/303d.png
new file mode 100644
index 000000000..70453d415
Binary files /dev/null and b/images/emoji/303d.png differ
diff --git a/images/emoji/3297.png b/images/emoji/3297.png
new file mode 100644
index 000000000..ba8c89d95
Binary files /dev/null and b/images/emoji/3297.png differ
diff --git a/images/emoji/3299.png b/images/emoji/3299.png
new file mode 100644
index 000000000..5fd72608e
Binary files /dev/null and b/images/emoji/3299.png differ
diff --git a/images/emoji/README b/images/emoji/README
new file mode 100644
index 000000000..ab478b753
--- /dev/null
+++ b/images/emoji/README
@@ -0,0 +1,2 @@
+These files supplied by emojione. License is CC BY 4.0. Attribution is required for commercial use.
+See http://emojione.com
diff --git a/include/BaseObject.php b/include/BaseObject.php
deleted file mode 100644
index a88978a83..000000000
--- a/include/BaseObject.php
+++ /dev/null
@@ -1,38 +0,0 @@
- $xchan['xchan_name'],
- '$photo' => ((is_array(App::$profile) && array_key_exists('photo',App::$profile)) ? App::$profile['photo'] : $xchan['xchan_photo_l']),
- '$follow' => $xchan['xchan_addr'],
- '$link' => zid($xchan['xchan_url']),
- '$connect' => $connect,
- '$newwin' => (($mode === 'chanview') ? t('New window') : ''),
- '$newtit' => t('Open the selected location in a different window or browser tab'),
- '$url' => $url,
- ));
-}
-
-function abook_toggle_flag($abook,$flag) {
-
- $field = '';
-
- switch($flag) {
- case ABOOK_FLAG_BLOCKED:
- $field = 'abook_blocked';
- break;
- case ABOOK_FLAG_IGNORED:
- $field = 'abook_ignored';
- break;
- case ABOOK_FLAG_HIDDEN:
- $field = 'abook_hidden';
- break;
- case ABOOK_FLAG_ARCHIVED:
- $field = 'abook_archived';
- break;
- case ABOOK_FLAG_PENDING:
- $field = 'abook_pending';
- break;
- case ABOOK_FLAG_UNCONNECTED:
- $field = 'abook_unconnected';
- break;
- case ABOOK_FLAG_SELF:
- $field = 'abook_self';
- break;
- case ABOOK_FLAG_FEED:
- $field = 'abook_feed';
- break;
- default:
- break;
- }
- if(! $field)
- return;
-
- $r = q("UPDATE abook set $field = (1 - $field) where abook_id = %d and abook_channel = %d",
- intval($abook['abook_id']),
- intval($abook['abook_channel'])
- );
-
-
- // if unsetting the archive bit, update the timestamps so we'll try to connect for an additional 30 days.
-
- if(($flag === ABOOK_FLAG_ARCHIVED) && (intval($abook['abook_archived']))) {
- $r = q("update abook set abook_connected = '%s', abook_updated = '%s'
- where abook_id = %d and abook_channel = %d",
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($abook['abook_id']),
- intval($abook['abook_channel'])
- );
- }
-
- return $r;
-
-}
-
-
-// Included here for completeness, but this is a very dangerous operation.
-// It is the caller's responsibility to confirm the requestor's intent and
-// authorisation to do this.
-
-function user_remove($uid) {
-
-}
-
-function account_remove($account_id,$local = true,$unset_session=true) {
-
- logger('account_remove: ' . $account_id);
-
- if(! intval($account_id)) {
- logger('account_remove: no account.');
- return false;
- }
-
- // Don't let anybody nuke the only admin account.
-
- $r = q("select account_id from account where (account_roles & %d)>0",
- intval(ACCOUNT_ROLE_ADMIN)
- );
-
- if($r !== false && count($r) == 1 && $r[0]['account_id'] == $account_id) {
- logger("Unable to remove the only remaining admin account");
- return false;
- }
-
- $r = q("select * from account where account_id = %d limit 1",
- intval($account_id)
- );
- $account_email=$r[0]['account_email'];
-
- if(! $r) {
- logger('account_remove: No account with id: ' . $account_id);
- return false;
- }
-
- $x = q("select channel_id from channel where channel_account_id = %d",
- intval($account_id)
- );
- if($x) {
- foreach($x as $xx) {
- channel_remove($xx['channel_id'],$local,false);
- }
- }
-
- $r = q("delete from account where account_id = %d",
- intval($account_id)
- );
-
-
- if ($unset_session) {
- unset($_SESSION['authenticated']);
- unset($_SESSION['uid']);
- notice( sprintf(t("User '%s' deleted"),$account_email) . EOL);
- goaway(z_root());
- }
- return $r;
-
-}
-// recursively delete a directory
-function rrmdir($path)
-{
- if (is_dir($path) === true)
- {
- $files = array_diff(scandir($path), array('.', '..'));
-
- foreach ($files as $file)
- {
- rrmdir(realpath($path) . '/' . $file);
- }
-
- return rmdir($path);
- }
-
- else if (is_file($path) === true)
- {
- return unlink($path);
- }
-
- return false;
-}
-
-function channel_remove($channel_id, $local = true, $unset_session=false) {
-
- if(! $channel_id)
- return;
- $a = get_app();
- logger('Removing channel: ' . $channel_id);
- logger('channel_remove: local only: ' . intval($local));
-
- $r = q("select * from channel where channel_id = %d limit 1", intval($channel_id));
- if(! $r) {
- logger('channel_remove: channel not found: ' . $channel_id);
- return;
- }
-
- $channel = $r[0];
-
- call_hooks('channel_remove',$r[0]);
-
- if(! $local) {
-
- $r = q("update channel set channel_deleted = '%s', channel_removed = 1, channel_r_stream = 0, channel_r_profile = 0,
- channel_r_photos = 0, channel_r_abook = 0, channel_w_stream = 0, channel_w_wall = 0, channel_w_tagwall = 0,
- channel_w_comment = 0, channel_w_mail = 0, channel_w_photos = 0, channel_w_chat = 0, channel_a_delegate = 0,
- channel_r_storage = 0, channel_w_storage = 0, channel_r_pages = 0, channel_w_pages = 0, channel_a_republish = 0
- where channel_id = %d",
- dbesc(datetime_convert()),
- intval($channel_id)
- );
-
- logger('deleting hublocs',LOGGER_DEBUG);
-
- $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s'",
- dbesc($channel['channel_hash'])
- );
-
-
- $r = q("update xchan set xchan_deleted = 1 where xchan_hash = '%s'",
- dbesc($channel['channel_hash'])
- );
-
- proc_run('php','include/notifier.php','purge_all',$channel_id);
-
- }
-
- q("DELETE FROM `groups` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `group_member` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `event` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `item` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `item_id` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `mail` WHERE `channel_id` = %d", intval($channel_id));
- q("DELETE FROM `notify` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `photo` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `attach` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `profile` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($channel_id));
- q("DELETE FROM `spam` WHERE `uid` = %d", intval($channel_id));
-
- // @FIXME At this stage we need to remove the file resources located under /store/$nickname
-
-
- q("delete from abook where abook_xchan = '%s' and abook_self = 1 ",
- dbesc($channel['channel_hash'])
- );
-
- $r = q("update channel set channel_deleted = '%s', channel_removed = 1 where channel_id = %d",
- dbesc(datetime_convert()),
- intval($channel_id)
- );
-
- // if this was the default channel, set another one as default
- if(App::$account['account_default_channel'] == $channel_id) {
- $r = q("select channel_id from channel where channel_account_id = %d and channel_removed = 0 limit 1",
- intval(App::$account['account_id']),
- intval(PAGE_REMOVED));
- if ($r) {
- $rr = q("update account set account_default_channel = %d where account_id = %d",
- intval($r[0]['channel_id']),
- intval(App::$account['account_id']));
- logger("Default channel deleted, changing default to channel_id " . $r[0]['channel_id']);
- }
- else {
- $rr = q("update account set account_default_channel = 0 where account_id = %d",
- intval(App::$account['account_id'])
- );
- }
- }
-
- logger('deleting hublocs',LOGGER_DEBUG);
-
- $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s' and hubloc_url = '%s' ",
- dbesc($channel['channel_hash']),
- dbesc(z_root())
- );
-
- // Do we have any valid hublocs remaining?
-
- $hublocs = 0;
-
- $r = q("select hubloc_id from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0",
- dbesc($channel['channel_hash'])
- );
- if($r)
- $hublocs = count($r);
-
- if(! $hublocs) {
- $r = q("update xchan set xchan_deleted = 1 where xchan_hash = '%s' ",
- dbesc($channel['channel_hash'])
- );
- }
-
- //remove from file system
- $r = q("select channel_address from channel where channel_id = %d limit 1",
- intval($channel_id)
- );
- if($r)
- $channel_address = $r[0]['channel_address'] ;
- if ($channel_address !== '') {
- $f = 'store/' . $channel_address.'/';
- logger ('delete '. $f);
- if(is_dir($f))
- @rrmdir($f);
- }
-
- proc_run('php','include/directory.php',$channel_id);
-
- if($channel_id == local_channel() && $unset_session) {
- \Zotlabs\Web\Session::nuke();
- goaway(z_root());
- }
-
-}
-
-/**
- * mark any hubs "offline" that haven't been heard from in more than 30 days
- * Allow them to redeem themselves if they come back later.
- * Then go through all those that are newly marked and see if any other hubs
- * are attached to the controlling xchan that are still alive.
- * If not, they're dead (although they could come back some day).
- */
-
-
-function mark_orphan_hubsxchans() {
-
- $dirmode = intval(get_config('system','directory_mode'));
- if($dirmode == DIRECTORY_MODE_NORMAL)
- return;
-
- $r = q("update hubloc set hubloc_error = 1 where hubloc_error = 0
- and hubloc_network = 'zot' and hubloc_connected < %s - interval %s",
- db_utcnow(), db_quoteinterval('36 day')
- );
-
-// $realm = get_directory_realm();
-// if($realm == DIRECTORY_REALM) {
-// $r = q("select * from site where site_access != 0 and site_register !=0 and ( site_realm = '%s' or site_realm = '') order by rand()",
-// dbesc($realm)
-// );
-// }
-// else {
-// $r = q("select * from site where site_access != 0 and site_register !=0 and site_realm = '%s' order by rand()",
-// dbesc($realm)
-// );
-// }
-
-
- $r = q("select hubloc_id, hubloc_hash from hubloc where hubloc_error = 0 and hubloc_orphancheck = 0");
-
- if($r) {
- foreach($r as $rr) {
-
- // see if any other hublocs are still alive for this channel
-
- $x = q("select * from hubloc where hubloc_hash = '%s' and hubloc_error = 0",
- dbesc($rr['hubloc_hash'])
- );
- if($x) {
-
- // yes - if the xchan was marked as an orphan, undo it
-
- $y = q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
- dbesc($rr['hubloc_hash'])
- );
-
- }
- else {
-
- // nope - mark the xchan as an orphan
-
- $y = q("update xchan set xchan_orphan = 1 where xchan_hash = '%s'",
- dbesc($rr['hubloc_hash'])
- );
- }
-
- // mark that we've checked this entry so we don't need to do it again
-
- $y = q("update hubloc set hubloc_orphancheck = 1 where hubloc_id = %d",
- dbesc($rr['hubloc_id'])
- );
- }
- }
-
-}
-
-
-
-
-function remove_all_xchan_resources($xchan, $channel_id = 0) {
-
- if(intval($channel_id)) {
-
-
-
- }
- else {
-
- $dirmode = intval(get_config('system','directory_mode'));
-
-
- $r = q("delete from photo where xchan = '%s'",
- dbesc($xchan)
- );
- $r = q("select resource_id, resource_type, uid, id from item where ( author_xchan = '%s' or owner_xchan = '%s' ) ",
- dbesc($xchan),
- dbesc($xchan)
- );
- if($r) {
- foreach($r as $rr) {
- drop_item($rr,false);
- }
- }
- $r = q("delete from event where event_xchan = '%s'",
- dbesc($xchan)
- );
- $r = q("delete from group_member where xchan = '%s'",
- dbesc($xchan)
- );
- $r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' )",
- dbesc($xchan),
- dbesc($xchan)
- );
- $r = q("delete from xlink where ( xlink_xchan = '%s' or xlink_link = '%s' )",
- dbesc($xchan),
- dbesc($xchan)
- );
-
- $r = q("delete from abook where abook_xchan = '%s'",
- dbesc($xchan)
- );
-
-
- if($dirmode === false || $dirmode == DIRECTORY_MODE_NORMAL) {
-
- $r = q("delete from xchan where xchan_hash = '%s'",
- dbesc($xchan)
- );
- $r = q("delete from hubloc where hubloc_hash = '%s'",
- dbesc($xchan)
- );
-
- }
- else {
-
- // directory servers need to keep the record around for sync purposes - mark it deleted
-
- $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s'",
- dbesc($xchan)
- );
-
- $r = q("update xchan set xchan_deleted = 1 where xchan_hash = '%s'",
- dbesc($xchan)
- );
- }
- }
-}
-
-
-function contact_remove($channel_id, $abook_id) {
-
- if((! $channel_id) || (! $abook_id))
- return false;
-
- logger('removing contact ' . $abook_id . ' for channel ' . $channel_id,LOGGER_DEBUG);
-
- $archive = get_pconfig($channel_id, 'system','archive_removed_contacts');
- if($archive) {
- q("update abook set abook_archived = 1 where abook_id = %d and abook_channel = %d",
- intval($abook_id),
- intval($channel_id)
- );
- return true;
- }
-
- $r = q("select * from abook where abook_id = %d and abook_channel = %d limit 1",
- intval($abook_id),
- intval($channel_id)
- );
-
- if(! $r)
- return false;
-
- $abook = $r[0];
-
- if(intval($abook['abook_self']))
- return false;
-
-
- $r = q("select * from item where author_xchan = '%s' and uid = %d",
- dbesc($abook['abook_xchan']),
- intval($channel_id)
- );
- if($r) {
- foreach($r as $rr) {
- drop_item($rr['id'],false);
- }
- }
-
- q("delete from abook where abook_id = %d and abook_channel = %d",
- intval($abook['abook_id']),
- intval($channel_id)
- );
-
- $r = q("delete from event where event_xchan = '%s' and uid = %d",
- dbesc($abook['abook_xchan']),
- intval($channel_id)
- );
-
- $r = q("delete from group_member where xchan = '%s' and uid = %d",
- dbesc($abook['abook_xchan']),
- intval($channel_id)
- );
-
- $r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' ) and channel_id = %d ",
- dbesc($abook['abook_xchan']),
- dbesc($abook['abook_xchan']),
- intval($channel_id)
- );
-
- return true;
-}
-
-
-
-function random_profile() {
- $randfunc = db_getfunc('rand');
-
- $checkrandom = get_config('randprofile','check'); // False by default
- $retryrandom = intval(get_config('randprofile','retry'));
- if($retryrandom == 0) $retryrandom = 5;
-
- for($i = 0; $i < $retryrandom; $i++) {
-
- $r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1",
- db_utcnow(), db_quoteinterval('30 day')
- );
-
- if(!$r) return ''; // Couldn't get a random channel
-
- if($checkrandom) {
- $x = z_fetch_url($r[0]['xchan_url']);
- if($x['success'])
- return $r[0]['xchan_url'];
- else
- logger('Random channel turned out to be bad.');
- }
- else {
- return $r[0]['xchan_url'];
- }
-
- }
- return '';
-}
-
diff --git a/include/ConversationObject.php b/include/ConversationObject.php
deleted file mode 100644
index 82f381b0c..000000000
--- a/include/ConversationObject.php
+++ /dev/null
@@ -1,225 +0,0 @@
-set_mode($mode);
- $this->preview = $preview;
- $this->prepared_item = $prepared_item;
- $c = ((local_channel()) ? get_pconfig(local_channel(),'system','default_cipher') : '');
- if($c)
- $this->cipher = $c;
- }
-
- /**
- * Set the mode we'll be displayed on
- */
- private function set_mode($mode) {
- if($this->get_mode() == $mode)
- return;
-
- $a = $this->get_app();
-
- $this->observer = App::get_observer();
- $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
-
- switch($mode) {
- case 'network':
- $this->profile_owner = local_channel();
- $this->writable = true;
- break;
- case 'channel':
- $this->profile_owner = App::$profile['profile_uid'];
- $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- break;
- case 'display':
- // in this mode we set profile_owner after initialisation (from conversation()) and then
- // pull some trickery which allows us to re-invoke this function afterward
- // it's an ugly hack so FIXME
- $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- break;
- case 'page':
- $this->profile_owner = App::$profile['uid'];
- $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- break;
- default:
- logger('[ERROR] Conversation::set_mode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
- return false;
- break;
- }
- $this->mode = $mode;
- }
-
- /**
- * Get mode
- */
- public function get_mode() {
- return $this->mode;
- }
-
- /**
- * Check if page is writable
- */
- public function is_writable() {
- return $this->writable;
- }
-
- public function is_commentable() {
- return $this->commentable;
- }
-
- /**
- * Check if page is a preview
- */
- public function is_preview() {
- return $this->preview;
- }
-
- /**
- * Get profile owner
- */
- public function get_profile_owner() {
- return $this->profile_owner;
- }
-
- public function set_profile_owner($uid) {
- $this->profile_owner = $uid;
- $mode = $this->get_mode();
- $this->mode = null;
- $this->set_mode($mode);
- }
-
- public function get_observer() {
- return $this->observer;
- }
-
- public function get_cipher() {
- return $this->cipher;
- }
-
-
- /**
- * Add a thread to the conversation
- *
- * Returns:
- * _ The inserted item on success
- * _ false on failure
- */
- public function add_thread($item) {
- $item_id = $item->get_id();
- if(!$item_id) {
- logger('Item has no ID!!', LOGGER_DEBUG, LOG_ERR);
- return false;
- }
- if($this->get_thread($item->get_id())) {
- logger('Thread already exists ('. $item->get_id() .').', LOGGER_DEBUG, LOG_WARNING);
- return false;
- }
-
- /*
- * Only add things that will be displayed
- */
-
-
- if(($item->get_data_value('id') != $item->get_data_value('parent')) && (activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE))) {
- return false;
- }
-
- $item->set_commentable(false);
- $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
-
- if(! comments_are_now_closed($item->get_data())) {
- if(($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash))
- $item->set_commentable(true);
-
- if(intval($item->get_data_value('item_nocomment'))) {
- $item->set_commentable(false);
- }
- elseif(($this->observer) && (! $item->is_commentable())) {
- if((array_key_exists('owner',$item->data)) && intval($item->data['owner']['abook_self']))
- $item->set_commentable(perm_is_allowed($this->profile_owner,$this->observer['xchan_hash'],'post_comments'));
- else
- $item->set_commentable(can_comment_on_post($this->observer['xchan_hash'],$item->data));
- }
- }
- require_once('include/identity.php');
-
- $item->set_conversation($this);
- $this->threads[] = $item;
- return end($this->threads);
- }
-
- /**
- * Get data in a form usable by a conversation template
- *
- * We should find a way to avoid using those arguments (at least most of them)
- *
- * Returns:
- * _ The data requested on success
- * _ false on failure
- */
- public function get_template_data($conv_responses) {
- $result = array();
-
- foreach($this->threads as $item) {
-
- if(($item->get_data_value('id') == $item->get_data_value('parent')) && $this->prepared_item) {
- $item_data = $this->prepared_item;
- }
- else {
- $item_data = $item->get_template_data($conv_responses);
- }
- if(!$item_data) {
- logger('Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG, LOG_ERR);
- return false;
- }
- $result[] = $item_data;
- }
-
- return $result;
- }
-
- /**
- * Get a thread based on its item id
- *
- * Returns:
- * _ The found item on success
- * _ false on failure
- */
- private function get_thread($id) {
- foreach($this->threads as $item) {
- if($item->get_id() == $id)
- return $item;
- }
-
- return false;
- }
-}
diff --git a/include/ITemplateEngine.php b/include/ITemplateEngine.php
deleted file mode 100755
index 7bd559a63..000000000
--- a/include/ITemplateEngine.php
+++ /dev/null
@@ -1,10 +0,0 @@
-get_app();
-
- $this->data = $data;
- $this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
-
- // Prepare the children
- if(count($data['children'])) {
- foreach($data['children'] as $item) {
-
- /*
- * Only add those that will be displayed
- */
-
- if((! visible_activity($item)) || array_key_exists('author_blocked',$item)) {
- continue;
- }
-
- $child = new Item($item);
- $this->add_child($child);
- }
- }
- }
-
- /**
- * Get data in a form usable by a conversation template
- *
- * Returns:
- * _ The data requested on success
- * _ false on failure
- */
-
- public function get_template_data($conv_responses, $thread_level=1) {
-
- $result = array();
-
- $a = $this->get_app();
- $item = $this->get_data();
-
- $commentww = '';
- $sparkle = '';
- $buttons = '';
- $dropping = false;
- $star = false;
- $isstarred = "unstarred icon-star-empty";
- $indent = '';
- $osparkle = '';
- $total_children = $this->count_descendants();
- $unseen_comments = (($item['real_uid']) ? 0 : $this->count_unseen_descendants());
-
- $conv = $this->get_conversation();
- $observer = $conv->get_observer();
-
- $lock = ((($item['item_private'] == 1) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
- || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
- ? t('Private Message')
- : false);
- $shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && ($item['item_private'] != 1)) ? true : false);
-
- // allow an exemption for sharing stuff from your private feeds
- if($item['author']['xchan_network'] === 'rss')
- $shareable = true;
-
- $mode = $conv->get_mode();
-
- if(local_channel() && $observer['xchan_hash'] === $item['author_xchan'])
- $edpost = array(z_root()."/editpost/".$item['id'], t("Edit"));
- else
- $edpost = false;
-
-
- if($observer['xchan_hash'] == $this->get_data_value('author_xchan')
- || $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
- || $this->get_data_value('uid') == local_channel())
- $dropping = true;
-
-
- if(array_key_exists('real_uid',$item)) {
- $edpost = false;
- $dropping = false;
- }
-
-
- if($dropping) {
- $drop = array(
- 'dropping' => $dropping,
- 'delete' => t('Delete'),
- );
- }
-// FIXME
- if($observer_is_pageowner) {
- $multidrop = array(
- 'select' => t('Select'),
- );
- }
-
- $filer = ((($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid',$item))) ? t("Save to Folder") : false);
-
- $profile_avatar = $item['author']['xchan_photo_m'];
- $profile_link = chanlink_url($item['author']['xchan_url']);
- $profile_name = $item['author']['xchan_name'];
-
- $location = format_location($item);
- $isevent = false;
- $attend = null;
- $canvote = false;
-
- // process action responses - e.g. like/dislike/attend/agree/whatever
- $response_verbs = array('like');
- if(feature_enabled($conv->get_profile_owner(),'dislike'))
- $response_verbs[] = 'dislike';
- if($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
- $response_verbs[] = 'attendyes';
- $response_verbs[] = 'attendno';
- $response_verbs[] = 'attendmaybe';
- if($this->is_commentable()) {
- $isevent = true;
- $attend = array( t('I will attend'), t('I will not attend'), t('I might attend'));
- }
- }
-
- $consensus = (intval($item['item_consensus']) ? true : false);
- if($consensus) {
- $response_verbs[] = 'agree';
- $response_verbs[] = 'disagree';
- $response_verbs[] = 'abstain';
- if($this->is_commentable()) {
- $conlabels = array( t('I agree'), t('I disagree'), t('I abstain'));
- $canvote = true;
- }
- }
-
- if(! feature_enabled($conv->get_profile_owner(),'dislike'))
- unset($conv_responses['dislike']);
-
- $responses = get_responses($conv_responses,$response_verbs,$this,$item);
-
- $like_count = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid']] : '');
- $like_list = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid'] . '-l'] : '');
- if (count($like_list) > MAX_LIKERS) {
- $like_list_part = array_slice($like_list, 0, MAX_LIKERS);
- array_push($like_list_part, '' . t('View all') . '');
- } else {
- $like_list_part = '';
- }
- $like_button_label = tt('Like','Likes',$like_count,'noun');
-
- if (feature_enabled($conv->get_profile_owner(),'dislike')) {
- $dislike_count = ((x($conv_responses['dislike'],$item['mid'])) ? $conv_responses['dislike'][$item['mid']] : '');
- $dislike_list = ((x($conv_responses['dislike'],$item['mid'])) ? $conv_responses['dislike'][$item['mid'] . '-l'] : '');
- $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun');
- if (count($dislike_list) > MAX_LIKERS) {
- $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
- array_push($dislike_list_part, '' . t('View all') . '');
- } else {
- $dislike_list_part = '';
- }
- }
-
- $showlike = ((x($conv_responses['like'],$item['mid'])) ? format_like($conv_responses['like'][$item['mid']],$conv_responses['like'][$item['mid'] . '-l'],'like',$item['mid']) : '');
- $showdislike = ((x($conv_responses['dislike'],$item['mid']) && feature_enabled($conv->get_profile_owner(),'dislike'))
- ? format_like($conv_responses['dislike'][$item['mid']],$conv_responses['dislike'][$item['mid'] . '-l'],'dislike',$item['mid']) : '');
-
- /*
- * We should avoid doing this all the time, but it depends on the conversation mode
- * And the conv mode may change when we change the conv, or it changes its mode
- * Maybe we should establish a way to be notified about conversation changes
- */
-
- $this->check_wall_to_wall();
-
- if($this->is_toplevel()) {
- // FIXME check this permission
- if(($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid',$item))) {
-
-// FIXME we don't need all this stuff, some can be done in the template
-
- $star = array(
- 'do' => t("Add Star"),
- 'undo' => t("Remove Star"),
- 'toggle' => t("Toggle Star Status"),
- 'classdo' => (intval($item['item_starred']) ? "hidden" : ""),
- 'classundo' => (intval($item['item_starred']) ? "" : "hidden"),
- 'isstarred' => (intval($item['item_starred']) ? "starred icon-star" : "unstarred icon-star-empty"),
- 'starred' => t('starred'),
- );
-
- }
- } else {
- $indent = 'comment';
- }
-
-
- $verified = (intval($item['item_verified']) ? t('Message signature validated') : '');
- $forged = ((($item['sig']) && (! intval($item['item_verified']))) ? t('Message signature incorrect') : '');
- $unverified = '' ; // (($this->is_wall_to_wall() && (! intval($item['item_verified']))) ? t('Message cannot be verified') : '');
-
-
-
- // FIXME - check this permission
- if($conv->get_profile_owner() == local_channel()) {
- $tagger = array(
- 'tagit' => t("Add Tag"),
- 'classtagger' => "",
- );
- }
-
- $has_bookmarks = false;
- if(is_array($item['term'])) {
- foreach($item['term'] as $t) {
- if(!UNO && $t['type'] == TERM_BOOKMARK)
- $has_bookmarks = true;
- }
- }
-
- $has_event = false;
- if(($item['obj_type'] === ACTIVITY_OBJ_EVENT) && $conv->get_profile_owner() == local_channel())
- $has_event = true;
-
- if($this->is_commentable()) {
- $like = array( t("I like this \x28toggle\x29"), t("like"));
- $dislike = array( t("I don't like this \x28toggle\x29"), t("dislike"));
- }
-
- if ($shareable)
- $share = array( t('Share This'), t('share'));
-
- $dreport = '';
-
- $keep_reports = intval(get_config('system','expire_delivery_reports'));
- if($keep_reports === 0)
- $keep_reports = 30;
-
- if((! get_config('system','disable_dreport')) && strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0)
- $dreport = t('Delivery Report');
-
- if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
- $indent .= ' shiny';
-
-
- localize_item($item);
-
- $body = prepare_body($item,true);
-
- // $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
- // since we can't depend on llink or plink pointing to the right local location.
-
- $owner_address = substr($item['owner']['xchan_addr'],0,strpos($item['owner']['xchan_addr'],'@'));
- $viewthread = $item['llink'];
- if($conv->get_mode() === 'channel')
- $viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . $item['mid'];
-
- $comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
- $list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : '');
-
-
-
-
-
- $children = $this->get_children();
-
- $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
-
- $tmp_item = array(
- 'template' => $this->get_template(),
- 'mode' => $mode,
- 'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
- 'body' => $body['html'],
- 'tags' => $body['tags'],
- 'categories' => $body['categories'],
- 'mentions' => $body['mentions'],
- 'attachments' => $body['attachments'],
- 'folders' => $body['folders'],
- 'text' => strip_tags($body['html']),
- 'id' => $this->get_id(),
- 'mid' => $item['mid'],
- 'isevent' => $isevent,
- 'attend' => $attend,
- 'consensus' => $consensus,
- 'conlabels' => $conlabels,
- 'canvote' => $canvote,
- 'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, $item['author']['xchan_addr']),
- 'olinktitle' => sprintf( t('View %s\'s profile - %s'), $this->get_owner_name(), $item['owner']['xchan_addr']),
- 'llink' => $item['llink'],
- 'viewthread' => $viewthread,
- 'to' => t('to'),
- 'via' => t('via'),
- 'wall' => t('Wall-to-Wall'),
- 'vwall' => t('via Wall-To-Wall:'),
- 'profile_url' => $profile_link,
- 'item_photo_menu' => item_photo_menu($item),
- 'dreport' => $dreport,
- 'name' => $profile_name,
- 'thumb' => $profile_avatar,
- 'osparkle' => $osparkle,
- 'sparkle' => $sparkle,
- 'title' => $item['title'],
- 'title_tosource' => get_pconfig($conv->get_profile_owner(),'system','title_tosource'),
- 'ago' => relative_date($item['created']),
- 'app' => $item['app'],
- 'str_app' => sprintf( t('from %s'), $item['app']),
- 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'),
- 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
- 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''),
- 'expiretime' => (($item['expires'] !== NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''),
- 'lock' => $lock,
- 'verified' => $verified,
- 'unverified' => $unverified,
- 'forged' => $forged,
- 'location' => $location,
- 'indent' => $indent,
- 'owner_url' => $this->get_owner_url(),
- 'owner_photo' => $this->get_owner_photo(),
- 'owner_name' => $this->get_owner_name(),
- 'photo' => $body['photo'],
- 'event' => $body['event'],
- 'has_tags' => $has_tags,
-
-// Item toolbar buttons
- 'like' => $like,
- 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
- 'share' => $share,
- 'rawmid' => $item['mid'],
- 'plink' => get_plink($item),
- 'edpost' => $edpost, // ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
- 'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''),
- 'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''),
- 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
- 'bookmark' => (($conv->get_profile_owner() == local_channel() && local_channel() && $has_bookmarks) ? t('Save Bookmarks') : ''),
- 'addtocal' => (($has_event) ? t('Add to Calendar') : ''),
- 'drop' => $drop,
- 'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''),
-// end toolbar buttons
-
- 'unseen_comments' => $unseen_comments,
- 'comment_count' => $total_children,
- 'comment_count_txt' => $comment_count_txt,
- 'list_unseen_txt' => $list_unseen_txt,
- 'markseen' => t('Mark all seen'),
- 'responses' => $responses,
- 'like_count' => $like_count,
- 'like_list' => $like_list,
- 'like_list_part' => $like_list_part,
- 'like_button_label' => $like_button_label,
- 'like_modal_title' => t('Likes','noun'),
- 'dislike_modal_title' => t('Dislikes','noun'),
- 'dislike_count' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''),
- 'dislike_list' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''),
- 'dislike_list_part' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''),
- 'dislike_button_label' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_button_label : ''),
- 'modal_dismiss' => t('Close'),
- 'showlike' => $showlike,
- 'showdislike' => $showdislike,
- 'comment' => $this->get_comment_box($indent),
- 'previewing' => ($conv->is_preview() ? ' preview ' : ''),
- 'wait' => t('Please wait'),
- 'thread_level' => $thread_level
- );
-
- $arr = array('item' => $item, 'output' => $tmp_item);
- call_hooks('display_item', $arr);
-
- $result = $arr['output'];
-
- $result['children'] = array();
- $nb_children = count($children);
-
- $visible_comments = get_config('system','expanded_comments');
- if($visible_comments === false)
- $visible_comments = 3;
-
- if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
- foreach($children as $child) {
- $result['children'][] = $child->get_template_data($conv_responses, $thread_level + 1);
- }
- // Collapse
- if(($nb_children > $visible_comments) || ($thread_level > 1)) {
- $result['children'][0]['comment_firstcollapsed'] = true;
- $result['children'][0]['num_comments'] = $comment_count_txt;
- $result['children'][0]['hide_text'] = t('[+] show all');
- if($thread_level > 1) {
- $result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
- }
- else {
- $result['children'][$nb_children - ($visible_comments + 1)]['comment_lastcollapsed'] = true;
- }
- }
- }
-
- $result['private'] = $item['item_private'];
- $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
-
- if($this->is_threaded()) {
- $result['flatten'] = false;
- $result['threaded'] = true;
- }
- else {
- $result['flatten'] = true;
- $result['threaded'] = false;
- }
-
- return $result;
- }
-
- public function get_id() {
- return $this->get_data_value('id');
- }
-
- public function get_display_mode() {
- return $this->display_mode;
- }
-
- public function set_display_mode($mode) {
- $this->display_mode = $mode;
- }
-
- public function is_threaded() {
- return $this->threaded;
- }
-
- public function set_commentable($val) {
- $this->commentable = $val;
- foreach($this->get_children() as $child)
- $child->set_commentable($val);
- }
-
- public function is_commentable() {
- return $this->commentable;
- }
-
- /**
- * Add a child item
- */
- public function add_child($item) {
- $item_id = $item->get_id();
- if(!$item_id) {
- logger('[ERROR] Item::add_child : Item has no ID!!', LOGGER_DEBUG);
- return false;
- }
- if($this->get_child($item->get_id())) {
- logger('[WARN] Item::add_child : Item already exists ('. $item->get_id() .').', LOGGER_DEBUG);
- return false;
- }
- /*
- * Only add what will be displayed
- */
-
- if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) {
- return false;
- }
-
- $item->set_parent($this);
- $this->children[] = $item;
- return end($this->children);
- }
-
- /**
- * Get a child by its ID
- */
- public function get_child($id) {
- foreach($this->get_children() as $child) {
- if($child->get_id() == $id)
- return $child;
- }
- return null;
- }
-
- /**
- * Get all our children
- */
- public function get_children() {
- return $this->children;
- }
-
- /**
- * Set our parent
- */
- protected function set_parent($item) {
- $parent = $this->get_parent();
- if($parent) {
- $parent->remove_child($this);
- }
- $this->parent = $item;
- $this->set_conversation($item->get_conversation());
- }
-
- /**
- * Remove our parent
- */
- protected function remove_parent() {
- $this->parent = null;
- $this->conversation = null;
- }
-
- /**
- * Remove a child
- */
- public function remove_child($item) {
- $id = $item->get_id();
- foreach($this->get_children() as $key => $child) {
- if($child->get_id() == $id) {
- $child->remove_parent();
- unset($this->children[$key]);
- // Reindex the array, in order to make sure there won't be any trouble on loops using count()
- $this->children = array_values($this->children);
- return true;
- }
- }
- logger('[WARN] Item::remove_child : Item is not a child ('. $id .').', LOGGER_DEBUG);
- return false;
- }
-
- /**
- * Get parent item
- */
- protected function get_parent() {
- return $this->parent;
- }
-
- /**
- * set conversation
- */
- public function set_conversation($conv) {
- $previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
-
- $this->conversation = $conv;
-
- // Set it on our children too
- foreach($this->get_children() as $child)
- $child->set_conversation($conv);
- }
-
- /**
- * get conversation
- */
- public function get_conversation() {
- return $this->conversation;
- }
-
- /**
- * Get raw data
- *
- * We shouldn't need this
- */
- public function get_data() {
- return $this->data;
- }
-
- /**
- * Get a data value
- *
- * Returns:
- * _ value on success
- * _ false on failure
- */
- public function get_data_value($name) {
- if(!isset($this->data[$name])) {
-// logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
- return false;
- }
-
- return $this->data[$name];
- }
-
- /**
- * Get template
- */
- public function get_template() {
- return $this->template;
- }
-
-
- public function set_template($t) {
- $this->template = $t;
- }
-
- /**
- * Check if this is a toplevel post
- */
- private function is_toplevel() {
- return $this->toplevel;
- }
-
- /**
- * Count the total of our descendants
- */
- private function count_descendants() {
- $children = $this->get_children();
- $total = count($children);
- if($total > 0) {
- foreach($children as $child) {
- $total += $child->count_descendants();
- }
- }
- return $total;
- }
-
- private function count_unseen_descendants() {
- $children = $this->get_children();
- $total = count($children);
- if($total > 0) {
- $total = 0;
- foreach($children as $child) {
- if((! visible_activity($child->data)) || array_key_exists('author_blocked',$child->data)) {
- continue;
- }
- if(intval($child->data['item_unseen']))
- $total ++;
- }
- }
- return $total;
- }
-
-
- /**
- * Get the template for the comment box
- */
- private function get_comment_box_template() {
- return $this->comment_box_template;
- }
-
- /**
- * Get the comment box
- *
- * Returns:
- * _ The comment box string (empty if no comment box)
- * _ false on failure
- */
- private function get_comment_box($indent) {
-
- if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
- return '';
- }
-
- $comment_box = '';
- $conv = $this->get_conversation();
-
-// logger('Commentable conv: ' . $conv->is_commentable());
-
- if(! $this->is_commentable())
- return;
-
- $template = get_markup_template($this->get_comment_box_template());
-
- $a = $this->get_app();
- $observer = $conv->get_observer();
-
- $qc = ((local_channel()) ? get_pconfig(local_channel(),'system','qcomment') : null);
- $qcomment = (($qc) ? explode("\n",$qc) : null);
-
- $arr = array('comment_buttons' => '','id' => $this->get_id());
- call_hooks('comment_buttons',$arr);
- $comment_buttons = $arr['comment_buttons'];
-
-
- $comment_box = replace_macros($template,array(
- '$return_path' => '',
- '$threaded' => $this->is_threaded(),
- '$jsreload' => '', //(($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
- '$type' => (($conv->get_mode() === 'channel') ? 'wall-comment' : 'net-comment'),
- '$id' => $this->get_id(),
- '$parent' => $this->get_id(),
- '$qcomment' => $qcomment,
- '$comment_buttons' => $comment_buttons,
- '$profile_uid' => $conv->get_profile_owner(),
- '$mylink' => $observer['xchan_url'],
- '$mytitle' => t('This is you'),
- '$myphoto' => $observer['xchan_photo_s'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$edbold' => t('Bold'),
- '$editalic' => t('Italic'),
- '$eduline' => t('Underline'),
- '$edquote' => t('Quote'),
- '$edcode' => t('Code'),
- '$edimg' => t('Image'),
- '$edurl' => t('Insert Link'),
- '$edvideo' => t('Video'),
- '$preview' => t('Preview'), // ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''),
- '$indent' => $indent,
- '$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
- '$encrypt' => t('Encrypt text'),
- '$cipher' => $conv->get_cipher(),
- '$sourceapp' => App::$sourcename
-
- ));
-
- return $comment_box;
- }
-
- private function get_redirect_url() {
- return $this->redirect_url;
- }
-
- /**
- * Check if we are a wall to wall item and set the relevant properties
- */
- protected function check_wall_to_wall() {
- $conv = $this->get_conversation();
- $this->wall_to_wall = false;
- $this->owner_url = '';
- $this->owner_photo = '';
- $this->owner_name = '';
-
- if($conv->get_mode() === 'channel')
- return;
-
- if($this->is_toplevel() && ($this->get_data_value('author_xchan') != $this->get_data_value('owner_xchan'))) {
- $this->owner_url = chanlink_url($this->data['owner']['xchan_url']);
- $this->owner_photo = $this->data['owner']['xchan_photo_m'];
- $this->owner_name = $this->data['owner']['xchan_name'];
- $this->wall_to_wall = true;
- }
- }
-
- private function is_wall_to_wall() {
- return $this->wall_to_wall;
- }
-
- private function get_owner_url() {
- return $this->owner_url;
- }
-
- private function get_owner_photo() {
- return $this->owner_photo;
- }
-
- private function get_owner_name() {
- return $this->owner_name;
- }
-
- private function is_visiting() {
- return $this->visiting;
- }
-
-
-
-
-}
-
diff --git a/include/ProtoDriver.php b/include/ProtoDriver.php
deleted file mode 100644
index 7585a0135..000000000
--- a/include/ProtoDriver.php
+++ /dev/null
@@ -1,43 +0,0 @@
- everything is allowed
+ $limit = engr_units_to_bytes($limit);
if($usage === false) {
// We use negative values for not allowed properties in a subscriber plan
return ((x($limit)) ? (bool) $limit : true);
@@ -627,6 +644,8 @@ function account_service_class_allows($aid, $property, $usage = false) {
if($limit === false)
return true; // No service class is set => everything is allowed
+ $limit = engr_units_to_bytes($limit);
+
if($usage === false) {
// We use negative values for not allowed properties in a subscriber plan
return ((x($limit)) ? (bool) $limit : true);
@@ -653,7 +672,8 @@ function account_service_class_allows($aid, $property, $usage = false) {
* @todo Should we merge this with account_service_class_fetch()?
*/
function service_class_fetch($uid, $property) {
- $a = get_app();
+
+
if($uid == local_channel()) {
$service_class = App::$account['account_service_class'];
}
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 92f9436a2..148c67a6c 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -6,15 +6,14 @@
/**
* @package acl_selectors
*/
-function group_select($selname,$selclass,$preselected = false,$size = 4) {
- $a = get_app();
+function group_select($selname,$selclass,$preselected = false,$size = 4) {
$o = '';
$o .= "