harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
zotlabs 2017-03-09 14:31:54 -08:00
parent 15d422db80
commit c93db2cd21
3 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -635,11 +635,11 @@ function sys_boot() {
if(! defined('DEFAULT_PLATFORM_ICON')) { if(! defined('DEFAULT_PLATFORM_ICON')) {
define( 'DEFAULT_PLATFORM_ICON', '/images/hz-32.png' ); define( 'DEFAULT_PLATFORM_ICON', '/images/rm-32.png' );
} }
if(! defined('DEFAULT_NOTIFY_ICON')) { if(! defined('DEFAULT_NOTIFY_ICON')) {
define( 'DEFAULT_NOTIFY_ICON', '/images/hz-white-32.png' ); define( 'DEFAULT_NOTIFY_ICON', '/images/rm-32.png' );
} }
if(! defined('CRYPTO_ALGORITHM')) { if(! defined('CRYPTO_ALGORITHM')) {

35
include/items.php
View File

@ -248,8 +248,6 @@ function can_comment_on_post($observer_xchan, $item) {
} }
if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red')) if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red'))
return true; return true;
if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'diaspora'))
return true;
if(strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],App::get_hostname())) if(strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],App::get_hostname()))
return true; return true;
@ -766,8 +764,6 @@ function import_author_xchan($x) {
if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) { if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) {
$y = import_author_zot($x); $y = import_author_zot($x);
} }
if(! $y)
$y = import_author_diaspora($x);
if($x['network'] === 'rss') { if($x['network'] === 'rss') {
$y = import_author_rss($x); $y = import_author_rss($x);
@ -780,36 +776,6 @@ function import_author_xchan($x) {
return(($y) ? $y : false); return(($y) ? $y : false);
} }
/**
* @brief Imports an author from Diaspora.
*
* @param array $x an associative array with
* * \e string \b address
* @return boolean|string false on error, otherwise xchan_hash of the new entry
*/
function import_author_diaspora($x) {
if(! $x['address'])
return false;
$r = q("select * from xchan where xchan_addr = '%s' limit 1",
dbesc($x['address'])
);
if($r) {
logger('in_cache: ' . $x['address'], LOGGER_DATA);
return $r[0]['xchan_hash'];
}
if(discover_by_webbie($x['address'])) {
$r = q("select xchan_hash from xchan where xchan_addr = '%s' limit 1",
dbesc($x['address'])
);
if($r)
return $r[0]['xchan_hash'];
}
return false;
}
/** /**
* @brief Imports an author from a RSS feed. * @brief Imports an author from a RSS feed.
* *
@ -819,6 +785,7 @@ function import_author_diaspora($x) {
* * \e string \b guid * * \e string \b guid
* @return boolean|string * @return boolean|string
*/ */
function import_author_rss($x) { function import_author_rss($x) {
if(! $x['url']) if(! $x['url'])
return false; return false;

6
include/text.php
View File

@ -1183,8 +1183,7 @@ function list_smilies() {
':coffee', ':coffee',
':facepalm', ':facepalm',
':like', ':like',
':dislike', ':dislike'
':hubzilla'
); );
$icons = array( $icons = array(
@ -1219,8 +1218,7 @@ function list_smilies() {
'<img class="smiley" src="' . z_root() . '/images/emoticons/coffee.gif" alt=":coffee" />', '<img class="smiley" src="' . z_root() . '/images/emoticons/coffee.gif" alt=":coffee" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-facepalm.gif" alt=":facepalm" />', '<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-facepalm.gif" alt=":facepalm" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/like.gif" alt=":like" />', '<img class="smiley" src="' . z_root() . '/images/emoticons/like.gif" alt=":like" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />', '<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />'
'<img class="smiley" src="' . z_root() . '/images/hz-16.png" alt=":hubzilla" />',
); );