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-11-05 16:54:39 +01:00
commit 91f751d105
9 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1158 );
define ( 'DB_UPDATE_VERSION', 1159 );
/**
* @brief Constant with a HTML line break.

26
include/api.php
View File

@ -660,26 +660,30 @@ require_once('include/attach.php');
dbesc($_REQUEST['file_id'])
);
if($r) {
if($r[0]['is_dir'])
$r[0]['data'] = '';
$ptr = $r[0];
if($length === 0)
$length = intval($ptr['filesize']);
if($ptr['is_dir'])
$ptr['data'] = '';
elseif(! intval($r[0]['os_storage'])) {
$r[0]['start'] = $start;
$x = substr(dbunescbin($r[0]['data'],$start,$length));
$r[0]['length'] = strlen($x);
$r[0]['data'] = base64_encode($x);
$ptr['start'] = $start;
$x = substr(dbunescbin($ptr['data'],$start,$length));
$ptr['length'] = strlen($x);
$ptr['data'] = base64_encode($x);
}
else {
$fp = fopen(dbunescbin($r[0]['data'],'r'));
$fp = fopen(dbunescbin($ptr['data']),'r');
if($fp) {
$seek = fseek($fp,$start,SEEK_SET);
$x = fread($fp,$length);
$r[0]['start'] = $start;
$r[0]['length'] = strlen($x);
$r[0]['data'] = base64_encode($x);
$ptr['start'] = $start;
$ptr['length'] = strlen($x);
$ptr['data'] = base64_encode($x);
}
}
$ret = array('attach' => $r[0]);
$ret = array('attach' => $ptr);
json_return_and_die($ret);
}
killme();

6
include/attach.php
View File

@ -722,7 +722,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
intval($filesize),
intval(1),
intval($is_photo),
dbesc($os_relpath),
dbesc($os_basepath . $os_relpath),
dbesc($created),
intval($existing_id),
intval($channel_id)
@ -742,7 +742,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
intval($x[0]['revision'] + 1),
intval(1),
intval($is_photo),
dbesc($os_relpath),
dbesc($os_basepath . $os_relpath),
dbesc($created),
dbesc($created),
dbesc($x[0]['allow_cid']),
@ -783,7 +783,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
intval(0),
intval(1),
intval($is_photo),
dbesc($os_relpath),
dbesc($os_basepath . $os_relpath),
dbesc($created),
dbesc($created),
dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $str_contact_allow),

17
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1158 );
define( 'UPDATE_VERSION' , 1159 );
/**
*
@ -1917,3 +1917,18 @@ function update_r1157() {
}
function update_r1158() {
$r = q("select attach.id, attach.data, channel_address from attach left join channel on attach.uid = channel_id where os_storage = 1 and not attach.data like '%%store%%' ");
if($r) {
foreach($r as $rr) {
$has_slash = ((substr($rr['data'],0,1) === '/') ? true : false);
q("update attach set data = '%s' where id = %d",
dbesc('store/' . $rr['channel_address']. (($has_slash) ? '' : '/' . $rr['data'])),
dbesc($rr['id'])
);
}
}
return UPDATE_SUCCESS;
}

4
mod/ffsapi.php
View File

@ -55,10 +55,10 @@ function activate(node) {
}
</script>
<button onclick="activate(this)" title="activate the demo provider">$activate</button>
<button onclick="activate(this)" title="activate the demo provider" class="btn btn-primary">$activate</button>
EOT;
return $s;
}
}

5
mod/settings.php
View File

@ -1102,12 +1102,13 @@ function settings_content(&$a) {
'$expert' => feature_enabled(local_channel(),'expert'),
'$hint' => t('Please enable expert mode (in <a href="settings/features">Settings > Additional features</a>) to adjust!'),
'$lbl_misc' => t('Miscellaneous Settings'),
'$photo_path' => array('photo_path', t('Default photo upload folder'), get_pconfig(local_channel(),'system','photo_path'), '%Y - current year, %m - current month'),
'$attach_path' => array('attach_path', t('Default file upload folder'), get_pconfig(local_channel(),'system','attach_path'), '%Y - current year, %m - current month'),
'$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'),
));
call_hooks('settings_form',$o);

2
version.inc
View File

@ -1 +1 @@
2015-11-04.1206
2015-11-05.1207

8
view/css/mod_settings.css
View File

@ -1,3 +1,11 @@
.group {
margin-left: 10px;
}
.ffsapilink {
margin: 10px 0;
}
.channel-menu {
margin-top: 24px;
}

14
view/tpl/settings.tpl
View File

@ -136,7 +136,7 @@
</div>
</div>
</div>
{{if $menus}}
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
<h3>
@ -146,8 +146,12 @@
</h3>
</div>
<div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
<div class="section-content-wrapper">
<div class="form-group">
<div class="section-content-tools-wrapper">
<div class="ffsapilink">
<a type="button" class="btn btn-default" href="/ffsapi">{{$firefoxshare}}</a>
</div>
{{if $menus}}
<div class="form-group channel-menu">
<label for="channel_menu">{{$menu_desc}}</label>
<select name="channel_menu" class="form-control">
{{foreach $menus as $menu }}
@ -156,12 +160,12 @@
</select>
</div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>
</div>
{{/if}}
</div>
</div>
{{/if}}
</div>
</form>
</div>