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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Haakon Meland Eriksen
2015-12-03 18:14:52 +01:00
parent b96f09bb3a 9f3ea71d5d
commit c363fc71eb
19 changed files with 15068 additions and 15034 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.php
+8 -13
View File
@@ -48,6 +48,7 @@ require_once('include/AccessList.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'STD_VERSION', '0.11.1' );
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1160 );
@@ -65,10 +66,10 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
//define ( 'NULL_DATE', '0000-00-00 00:00:00' );
define ( 'TEMPLATE_BUILD_PATH', 'store/[data]/smarty3' );
define ( 'DIRECTORY_MODE_NORMAL', 0x0000); // This is technically DIRECTORY_MODE_TERTIARY, but it's the default, hence 0x0000
define ( 'DIRECTORY_MODE_PRIMARY', 0x0001);
define ( 'DIRECTORY_MODE_SECONDARY', 0x0002);
define ( 'DIRECTORY_MODE_STANDALONE', 0x0100);
define ( 'DIRECTORY_MODE_NORMAL', 0x0000); // A directory client
define ( 'DIRECTORY_MODE_PRIMARY', 0x0001); // There can only be *one* primary directory server in a directory_realm.
define ( 'DIRECTORY_MODE_SECONDARY', 0x0002); // All other mirror directory servers
define ( 'DIRECTORY_MODE_STANDALONE', 0x0100); // A detached (off the grid) hub with itself as directory server.
// We will look for upstream directories whenever me make contact
// with other sites, but if this is a new installation and isn't
@@ -621,10 +622,10 @@ class App {
public $poi = null; // "person of interest", generally a referenced connection
private $oauth_key = null; // consumer_id of oauth request, if used
public $layout = array(); // Comanche parsed template
public $pdl = null;
public $pdl = null; // Comanche page description
private $perms = null; // observer permissions
private $widgets = array(); // widgets for this page
//private $widgetlist = null; // widget ordering and inclusion directives
public $groups;
public $language;
@@ -1157,7 +1158,7 @@ function z_root() {
}
/**
* @brief Return absolut URL for given $path.
* @brief Return absolute URL for given $path.
*
* @param string $path
*
@@ -1469,12 +1470,6 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
$tpl = get_markup_template("logout.tpl");
}
else {
// There's no such thing as login_head.tpl, has never been in Red, removed from Friendica 1 Jun 2013...
// $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"), array(
// '$baseurl' => $a->get_baseurl(true)
// ));
$tpl = get_markup_template("login.tpl");
if(strlen($a->query_string))
$_SESSION['login_return_url'] = $a->query_string;
include/api.php
+3 -4
View File
@@ -382,7 +382,6 @@ require_once('include/api_auth.php');
function api_item_get_user(&$a, $item) {
global $usercache;
// The author is our direct contact, in a conversation with us.
@@ -396,11 +395,11 @@ require_once('include/api_auth.php');
$name = $item['author']['xchan_name'];
// Generating a random ID
if (is_null($usercache[$nick]) or !array_key_exists($nick, $usercache))
$usercache[$nick] = mt_rand(2000000, 2100000);
if (! $nick)
$nick = mt_rand(2000000, 2100000);
$ret = array(
'id' => $usercache[$nick],
'id' => $nick,
'name' => $name,
'screen_name' => $nick,
'location' => '', //$uinfo[0]['default-location'],
include/comanche.php
+5 -4
View File
@@ -282,15 +282,16 @@ function comanche_widget($name, $text) {
}
}
if(file_exists('widget/' . trim($name) . '.php'))
$func = 'widget_' . trim($name);
if((! function_exists($func)) && file_exists('widget/' . trim($name) . '.php'))
require_once('widget/' . trim($name) . '.php');
else {
$theme_widget = 'widget_' . trim($name) . '.php';
if(theme_include($theme_widget))
$theme_widget = $func . '.php';
if((! function_exists($func)) && theme_include($theme_widget))
require_once(theme_include($theme_widget));
}
$func = 'widget_' . trim($name);
if (function_exists($func))
return $func($vars);
}
include/items.php
+1 -1
View File
@@ -3474,7 +3474,7 @@ function post_is_importable($item,$abook) {
unobscure($item);
$text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text);
$text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text);
$lang = null;
include/message.php
+6 -5
View File
@@ -13,6 +13,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
$ret = array('success' => false);
$a = get_app();
$observer_hash = get_observer_hash();
if(! $recipient) {
$ret['message'] = t('No recipient provided.');
@@ -148,8 +149,8 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
$match = null;
$images = null;
if(preg_match_all("/\[zmg\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
$images = $match[1];
if(preg_match_all("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
$images = $match[3];
$match = false;
@@ -173,7 +174,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
'revision' => $r['data']['revision']
);
}
$body = str_replace($match[1],'',$body);
$body = trim(str_replace($match[1],'',$body));
}
}
@@ -230,7 +231,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
dbesc($image_uri),
intval($channel['channel_id']),
dbesc('<' . $channel['channel_hash'] . '>')
);
);
$r = q("UPDATE attach SET allow_cid = '%s' WHERE hash = '%s' AND is_photo = 1 and uid = %d and allow_cid = '%s'",
dbesc('<' . $recipient . '>'),
dbesc($image_uri),
@@ -239,7 +240,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
);
}
}
if($attaches) {
foreach($attaches as $attach) {
$hash = substr($attach,0,strpos($attach,','));
include/plugin.php
+11
View File
@@ -616,3 +616,14 @@ function get_markup_template($s, $root = '') {
$template = $t->get_markup_template($s, $root);
return $template;
}
// return the standardised version. Since we can't easily compare
// before the STD_VERSION definition was applied, we have to treat
// all prior release versions the same. You can dig through them
// with other means (such as RED_VERSION) if necessary.
function get_std_version() {
if(defined('STD_VERSION'))
return STD_VERSION;
return '0.0.0';
}
mod/dirsearch.php
+2 -2
View File
@@ -26,8 +26,8 @@ function dirsearch_content(&$a) {
$token = get_config('system','realm_token');
if($token && $access_token != $token) {
$result['message'] = t('This directory server requires an access token');
return;
$ret['message'] = t('This directory server requires an access token');
json_return_and_die($ret);
}
mod/mail.php
+2 -1
View File
@@ -329,7 +329,8 @@ function mail_content(&$a) {
'to_url' => chanlink_hash($message['to_xchan']),
'to_photo' => $message['to']['xchan_photo_s'],
'subject' => $message['title'],
'body' => smilies(bbcode($message['body']) . $s),
'body' => smilies(bbcode($message['body'])),
'attachments' => $s,
'delete' => t('Delete message'),
'dreport' => t('Delivery report'),
'recall' => t('Recall message'),
util/update_addon_repo
+6 -1
View File
@@ -7,7 +7,12 @@ if [ $# -ne 1 ]; then
exit 1
fi
cd extend/addon/$1
if [ -d extend/addon/$1 ] ; then
cd extend/addon/$1
else
echo "$1 not found. Aborting..."
exit 1
fi
if [ -d .git ] ; then
git pull
version.inc
+1 -1
View File
@@ -1 +1 @@
2015-11-30.1232
2015-12-02.1234
view/css/mod_mail.css
+4
View File
@@ -24,3 +24,7 @@
#prvmail-rotator {
margin: 15px;
}
.mail-conv-outside-wrapper {
margin-bottom: 20px;
}
view/es/hmessages.po
+6240 -6237
View File
File diff suppressed because it is too large Load Diff
view/es/hstrings.php
+1286 -1286
View File
File diff suppressed because it is too large Load Diff
view/nl/hmessages.po
+6213 -6210
View File
File diff suppressed because it is too large Load Diff
view/nl/hstrings.php
+1264 -1264
View File
File diff suppressed because it is too large Load Diff
view/theme/redbasic/css/narrow_navbar.css
+1 -2
View File
@@ -8,7 +8,7 @@
min-height:25px !important;
}
nav img {
nav .navbar-header img {
height: 30px;
width: 30px;
margin-top: 1px;
@@ -49,7 +49,6 @@
top: -31px;
float: right;
font-size: 10px;
padding: 2px 6px;
cursor: pointer;
}
view/theme/redbasic/css/style.css
+8 -2
View File
@@ -786,6 +786,7 @@ a.rateme, div.rateme {
#nav-search-text {
font-size: 12px;
width: 200px;
height: 20px;
margin: 15px;
padding: 0px 5px 0px 5px;
@@ -1721,6 +1722,13 @@ nav .dropdown-menu {
border-bottom-left-radius: $radiuspx;
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:focus,
.dropdown-menu > .active > a:hover {
color: #333;
background-color: #f5f5f5;
}
.dropdown-menu-img-sm {
float: left;
width: 36px;
@@ -1991,8 +1999,6 @@ nav .badge.mail-update:hover {
#tabs-collapse-1 {
padding: 0px;
margin-bottom: 25px;
border-top: none;
box-shadow: none;
}
.btn {
view/theme/redbasic/schema/bluegrid.css
+1 -1
View File
@@ -110,7 +110,7 @@ input#jot-title:hover, input#jot-title:focus {
border-color: transparent;
}
nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu {
nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu {
background-color: rgba(67,72,138,.97);
color: #fff;
border-radius: 0;
view/tpl/mail_conv.tpl
+6
View File
@@ -13,6 +13,12 @@
{{$mail.body}}
<div class="clear"></div>
</div>
{{if $mail.attachments}}
<div class="dropdown pull-left">
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</ul>
</div>
{{/if}}
<div class="pull-right dropdown">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
<i class="icon-caret-down"></i>