mirror of https://github.com/friendica/friendica
Merge remote branch 'upstream/master'
This commit is contained in:
Michael
commit
cce69f0509
2
boot.php
2
boot.php
|
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1264' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
||||
define ( 'DB_UPDATE_VERSION', 1127 );
|
||||
define ( 'DB_UPDATE_VERSION', 1128 );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||
|
|
|
|||
12
database.sql
12
database.sql
|
|
@ -838,4 +838,16 @@ INDEX ( `master-parent-item` ),
|
|||
INDEX ( `receiver-uid` )
|
||||
) ENGINE = MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `spam` (
|
||||
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`uid` INT NOT NULL,
|
||||
`spam` INT NOT NULL DEFAULT '0',
|
||||
`ham` INT NOT NULL DEFAULT '0',
|
||||
`term` CHAR(255) NOT NULL,
|
||||
INDEX ( `uid` ),
|
||||
INDEX ( `spam` ),
|
||||
INDEX ( `ham` ),
|
||||
INDEX ( `term` )
|
||||
) ENGINE = MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
function localize_item(&$item){
|
||||
|
||||
$Text = $item['body'];
|
||||
|
||||
|
||||
// find private image (w/data url) if present and convert image
|
||||
// link to a magic-auth redirect.
|
||||
|
||||
$saved_image = '';
|
||||
$img_start = strpos($Text,'[img]data:');
|
||||
$img_end = strpos($Text,'[/img]');
|
||||
|
|
@ -403,6 +408,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
$toplevelprivate = false;
|
||||
|
||||
// Take care of author collapsing and comment collapsing
|
||||
// (author collapsing is currently disabled)
|
||||
// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
|
||||
// If there are more than two comments, squash all but the last 2.
|
||||
|
||||
|
|
@ -410,7 +416,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
$toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
|
||||
$item_writeable = (($item['writable'] || $item['self']) ? true : false);
|
||||
|
||||
/*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
|
||||
// DISABLED
|
||||
/*
|
||||
if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
|
||||
$blowhard_count ++;
|
||||
if($blowhard_count == 3) {
|
||||
$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent']
|
||||
|
|
@ -424,7 +432,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
if($blowhard_count >= 3)
|
||||
$o .= '</div>';
|
||||
$blowhard_count = 0;
|
||||
}*/
|
||||
}
|
||||
// END DISABLED
|
||||
*/
|
||||
|
||||
$comments_seen = 0;
|
||||
$comments_collapsed = false;
|
||||
|
|
|
|||
|
|
@ -135,20 +135,34 @@ function notification($params) {
|
|||
} while($dups == true);
|
||||
|
||||
|
||||
$datarray = array();
|
||||
$datarray['hash'] = $hash;
|
||||
$datarray['name'] = $params['source_name'];
|
||||
$datarray['url'] = $params['source_link'];
|
||||
$datarray['photo'] = $params['source_photo'];
|
||||
$datarray['date'] = datetime_convert();
|
||||
$datarray['uid'] = $params['uid'];
|
||||
$datarray['link'] = $itemlink;
|
||||
$datarray['type'] = $params['type'];
|
||||
$datarray['verb'] = $params['verb'];
|
||||
$datarray['otype'] = $params['otype'];
|
||||
|
||||
call_hooks('enotify_store', $datarray);
|
||||
|
||||
// create notification entry in DB
|
||||
|
||||
$r = q("insert into notify (hash,name,url,photo,date,uid,link,type,verb,otype)
|
||||
values('%s','%s','%s','%s','%s',%d,'%s',%d,'%s','%s')",
|
||||
dbesc($hash),
|
||||
dbesc($params['source_name']),
|
||||
dbesc($params['source_link']),
|
||||
dbesc($params['source_photo']),
|
||||
dbesc(datetime_convert()),
|
||||
intval($params['uid']),
|
||||
dbesc($itemlink),
|
||||
intval($params['type']),
|
||||
dbesc($params['verb']),
|
||||
dbesc($params['otype'])
|
||||
dbesc($datarray['hash']),
|
||||
dbesc($datarray['name']),
|
||||
dbesc($datarray['url']),
|
||||
dbesc($datarray['photo']),
|
||||
dbesc($datarray['date']),
|
||||
intval($datarray['uid']),
|
||||
dbesc($datarray['link']),
|
||||
intval($datarray['type']),
|
||||
dbesc($datarray['verb']),
|
||||
dbesc($datarray['otype'])
|
||||
);
|
||||
|
||||
$r = q("select id from notify where hash = '%s' and uid = %d limit 1",
|
||||
|
|
@ -217,44 +231,68 @@ intval($params['uid']), LOGGER_DEBUG);
|
|||
$htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"),
|
||||
"<br />\n",$body))));
|
||||
|
||||
$datarray = array();
|
||||
$datarray['banner'] = $banner;
|
||||
$datarray['product'] = $product;
|
||||
$datarray['preamble'] = $preamble;
|
||||
$datarray['sitename'] = $sitename;
|
||||
$datarray['siteurl'] = $siteurl;
|
||||
$datarray['source_name'] = $params['source_name'];
|
||||
$datarray['source_link'] = $params['source_link'];
|
||||
$datarray['source_photo'] = $params['source_photo'];
|
||||
$datarray['username'] = $params['to_name'];
|
||||
$datarray['hsitelink'] = $hsitelink;
|
||||
$datarray['tsitelink'] = $tsitelink;
|
||||
$datarray['hitemlink'] = '<a href="' . $itemlink . '">' . $itemlink . '</a>';
|
||||
$datarray['titemlink'] = $itemlink;
|
||||
$datarray['thanks'] = $thanks;
|
||||
$datarray['site_admin'] = $site_admin;
|
||||
$datarray['title'] = stripslashes($title);
|
||||
$datarray['htmlversion'] = $htmlversion;
|
||||
$datarray['textversion'] = $textversion;
|
||||
$datarray['subject'] = $subject;
|
||||
$datarray['headers'] = $additional_mail_header;
|
||||
|
||||
call_hooks('enotify_mail', $datarray);
|
||||
|
||||
// load the template for private message notifications
|
||||
$tpl = get_markup_template('email_notify_html.tpl');
|
||||
$email_html_body = replace_macros($tpl,array(
|
||||
'$banner' => $banner,
|
||||
'$product' => $product,
|
||||
'$preamble' => $preamble,
|
||||
'$sitename' => $sitename,
|
||||
'$siteurl' => $siteurl,
|
||||
'$source_name' => $params['source_name'],
|
||||
'$source_link' => $params['source_link'],
|
||||
'$source_photo' => $params['source_photo'],
|
||||
'$username' => $params['to_name'],
|
||||
'$hsitelink' => $hsitelink,
|
||||
'$itemlink' => '<a href="' . $itemlink . '">' . $itemlink . '</a>',
|
||||
'$thanks' => $thanks,
|
||||
'$site_admin' => $site_admin,
|
||||
'$title' => stripslashes($title),
|
||||
'$htmlversion' => $htmlversion,
|
||||
'$banner' => $datarray['banner'],
|
||||
'$product' => $datarray['product'],
|
||||
'$preamble' => $datarray['preamble'],
|
||||
'$sitename' => $datarray['sitename'],
|
||||
'$siteurl' => $datarray['siteurl'],
|
||||
'$source_name' => $datarray['source_name'],
|
||||
'$source_link' => $datarray['source_link'],
|
||||
'$source_photo' => $datarray['source_photo'],
|
||||
'$username' => $datarray['to_name'],
|
||||
'$hsitelink' => $datarray['hsitelink'],
|
||||
'$hitemlink' => $datarray['hitemlink'],
|
||||
'$thanks' => $datarray['thanks'],
|
||||
'$site_admin' => $datarray['site_admin'],
|
||||
'$title' => $datarray['title'],
|
||||
'$htmlversion' => $datarray['htmlversion'],
|
||||
));
|
||||
|
||||
// load the template for private message notifications
|
||||
$tpl = get_markup_template('email_notify_text.tpl');
|
||||
$email_text_body = replace_macros($tpl,array(
|
||||
'$banner' => $banner,
|
||||
'$product' => $product,
|
||||
'$preamble' => $preamble,
|
||||
'$sitename' => $sitename,
|
||||
'$siteurl' => $siteurl,
|
||||
'$source_name' => $params['source_name'],
|
||||
'$source_link' => $params['source_link'],
|
||||
'$source_photo' => $params['source_photo'],
|
||||
'$username' => $params['to_name'],
|
||||
'$tsitelink' => $tsitelink,
|
||||
'$itemlink' => $itemlink,
|
||||
'$thanks' => $thanks,
|
||||
'$site_admin' => $site_admin,
|
||||
'$title' => stripslashes($title),
|
||||
'$textversion' => $textversion,
|
||||
'$banner' => $datarray['banner'],
|
||||
'$product' => $datarray['product'],
|
||||
'$preamble' => $datarray['preamble'],
|
||||
'$sitename' => $datarray['sitename'],
|
||||
'$siteurl' => $datarray['siteurl'],
|
||||
'$source_name' => $datarray['source_name'],
|
||||
'$source_link' => $datarray['source_link'],
|
||||
'$source_photo' => $datarray['source_photo'],
|
||||
'$username' => $datarray['to_name'],
|
||||
'$tsitelink' => $datarray['tsitelink'],
|
||||
'$titemlink' => $datarray['titemlink'],
|
||||
'$thanks' => $datarray['thanks'],
|
||||
'$site_admin' => $datarray['site_admin'],
|
||||
'$title' => $datarray['title'],
|
||||
'$textversion' => $datarray['textversion'],
|
||||
));
|
||||
|
||||
// logger('text: ' . $email_text_body);
|
||||
|
|
@ -266,10 +304,10 @@ intval($params['uid']), LOGGER_DEBUG);
|
|||
'fromEmail' => $sender_email,
|
||||
'replyTo' => $sender_email,
|
||||
'toEmail' => $params['to_email'],
|
||||
'messageSubject' => $subject,
|
||||
'messageSubject' => $datarray['subject'],
|
||||
'htmlVersion' => $email_html_body,
|
||||
'textVersion' => $email_text_body,
|
||||
'additionalMailHeader' => $additional_mail_header,
|
||||
'additionalMailHeader' => $datarray['headers'],
|
||||
));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ class b8_storage_frndc extends b8_storage_base
|
|||
$token = dbesc($token);
|
||||
$count = dbesc($count);
|
||||
$uid = dbesc($uid);
|
||||
array_push($this->_puts, '("' . $token . '", "' . $count . '", '"' . $uid .'")');
|
||||
array_push($this->_puts, '("' . $token . '", "' . $count . '", "' . $uid .'")');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -273,7 +273,7 @@ class b8_storage_frndc extends b8_storage_base
|
|||
$token = dbesc($token);
|
||||
$count = dbesc($count);
|
||||
$uid = dbesc($uid);
|
||||
array_push($this->_puts, '("' . $token . '", "' . $count . '", '"' . $uid .'")');
|
||||
array_push($this->_puts, '("' . $token . '", "' . $count . '", "' . $uid .'")');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -325,7 +325,7 @@ class b8_storage_frndc extends b8_storage_base
|
|||
if(count($this->_updates) > 0) {
|
||||
|
||||
// this still needs work
|
||||
$result = q("select * from " . $this->config['table_name'] . ' where token = ';
|
||||
$result = q("select * from " . $this->config['table_name'] . ' where token = ');
|
||||
|
||||
|
||||
$result = q('
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@ EOT;
|
|||
$arr['target'] = $target;
|
||||
$arr['object-type'] = $objtype;
|
||||
$arr['object'] = $obj;
|
||||
$arr['private'] = $item['private'];
|
||||
$arr['allow_cid'] = $item['allow_cid'];
|
||||
$arr['allow_gid'] = $item['allow_gid'];
|
||||
$arr['deny_cid'] = $item['deny_cid'];
|
||||
|
|
|
|||
17
update.php
17
update.php
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1127 );
|
||||
define( 'UPDATE_VERSION' , 1128 );
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -1094,3 +1094,18 @@ function update_1126() {
|
|||
q("ALTER TABLE `mailacct` ADD `action` INT NOT NULL AFTER `pass`,
|
||||
ADD `movetofolder` CHAR(255) NOT NULL AFTER `action`");
|
||||
}
|
||||
|
||||
function update_1127() {
|
||||
q("CREATE TABLE IF NOT EXISTS `spam` (
|
||||
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`uid` INT NOT NULL,
|
||||
`spam` INT NOT NULL DEFAULT '0',
|
||||
`ham` INT NOT NULL DEFAULT '0',
|
||||
`term` CHAR(255) NOT NULL,
|
||||
INDEX ( `uid` ),
|
||||
INDEX ( `spam` ),
|
||||
INDEX ( `ham` ),
|
||||
INDEX ( `term` )
|
||||
) ENGINE = MyISAM DEFAULT CHARSET=utf8");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
|
||||
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
|
||||
<tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr>
|
||||
<tr><td style="padding-bottom:11px;" colspan="2">$itemlink</td></tr>
|
||||
<tr><td style="padding-bottom:11px;" colspan="2">$hitemlink</td></tr>
|
||||
<tr><td></td><td>$thanks</td></tr>
|
||||
<tr><td></td><td>$site_admin</td></tr>
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ $title
|
|||
$textversion
|
||||
|
||||
$tsitelink
|
||||
$itemlink
|
||||
$titemlink
|
||||
|
||||
$thanks
|
||||
$site_admin
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
<link rel="search"
|
||||
href="$baseurl/opensearch"
|
||||
type="application/opensearchdescription+xml"
|
||||
title="Search in Friendika" />
|
||||
title="Search in Friendica" />
|
||||
|
||||
<!--[if IE]>
|
||||
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<![endif]-->
|
||||
<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
|
||||
<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ function initEditor(cb){
|
|||
$("a#jot-perms-icon").fancybox({
|
||||
'transitionIn' : 'elastic',
|
||||
'transitionOut' : 'elastic'
|
||||
});
|
||||
});
|
||||
$(".jothidden").show();
|
||||
if (typeof cb!="undefined") cb();
|
||||
return;
|
||||
|
|
@ -129,7 +129,6 @@ function enableOnUser(){
|
|||
$("#profile-jot-text").focus(enableOnUser);
|
||||
$("#profile-jot-text").click(enableOnUser);
|
||||
|
||||
|
||||
var uploader = new window.AjaxUpload(
|
||||
'wall-image-upload',
|
||||
{ action: 'wall_upload/$nickname',
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
|
|
@ -1099,6 +1099,21 @@ div[id$="wrapper"] br { clear: left; }
|
|||
border-bottom: 0px;
|
||||
}*/
|
||||
|
||||
.starred {
|
||||
background-image: url("star.png");
|
||||
repeat: no-repeat;
|
||||
}
|
||||
.unstarred {
|
||||
background-image: url("premium.png");
|
||||
repeat: no-repeat;
|
||||
}
|
||||
|
||||
.tagged {
|
||||
background-image: url("tag.png");
|
||||
repeat: no-repeat;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.border {
|
||||
border: 1px solid #babdb6;
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 632 B |
|
|
@ -24,6 +24,7 @@
|
|||
<div class="wall-item-tools" id="wall-item-tools-$id">
|
||||
{{ if $star }}
|
||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
||||
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
|
||||
{{ endif }}
|
||||
{{ if $vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
<div class="wall-item-tools" id="wall-item-tools-$id">
|
||||
{{ if $star }}
|
||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
||||
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
|
||||
{{ endif }}
|
||||
{{ if $vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@
|
|||
|
||||
{{ if $star }}
|
||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
||||
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@
|
|||
|
||||
{{ if $star }}
|
||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
||||
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
|
||||
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
|
||||
{{ if $star }}
|
||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
||||
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@
|
|||
{{ if $star }}
|
||||
<a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
|
||||
<a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a>
|
||||
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $vote }}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@
|
|||
{{ if $star }}
|
||||
<a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
|
||||
<a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a>
|
||||
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
|
||||
|
||||
{{ endif }}
|
||||
|
||||
{{ if $vote }}
|
||||
|
|
|
|||
Loading…
Reference in New Issue