From 76043d97bd5d38e12ae84b18d48bc2dc4537ece0 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 4 Nov 2015 23:06:37 -0800 Subject: dummy update --- install/update.php | 6 +++++- version.inc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/install/update.php b/install/update.php index cc8dc6ae5..b05e433dc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 4 Nov 2015 23:48:55 -0800 Subject: fix path for attachments using os_storage uploaded through attach_store --- boot.php | 2 +- install/update.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index dafe20b83..1faeaf15a 100755 --- a/boot.php +++ b/boot.php @@ -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. diff --git a/install/update.php b/install/update.php index 666d2e799..38e76afda 100644 --- a/install/update.php +++ b/install/update.php @@ -1918,10 +1918,10 @@ 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%' "); + $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) { - $hash_slash = ((substr($rr['data'],0,1) === '/') ? true : false); + $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']) -- cgit v1.2.3 From 58fe4f5cb37bb812993850750eda201d5dccf112 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 5 Nov 2015 00:00:41 -0800 Subject: fix the file chunking api now that we've got working data to test with --- include/api.php | 2 +- version.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/api.php b/include/api.php index 711b946ed..b51bcc5f0 100644 --- a/include/api.php +++ b/include/api.php @@ -673,7 +673,7 @@ require_once('include/attach.php'); $ptr['data'] = base64_encode($x); } else { - $fp = fopen(dbunescbin($ptr['data'],'r')); + $fp = fopen(dbunescbin($ptr['data']),'r'); if($fp) { $seek = fseek($fp,$start,SEEK_SET); $x = fread($fp,$length); diff --git a/version.inc b/version.inc index d0eb99d9c..b1085e3d5 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-04.1206 +2015-11-05.1207 -- cgit v1.2.3 From 91f2e05d5dc15915cb8a9ebbfb6195a6d8d6da35 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 5 Nov 2015 09:06:45 +0100 Subject: Style the button --- mod/ffsapi.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/ffsapi.php b/mod/ffsapi.php index a75e60bcc..de47408bd 100644 --- a/mod/ffsapi.php +++ b/mod/ffsapi.php @@ -55,10 +55,10 @@ function activate(node) { } - + EOT; return $s; -} \ No newline at end of file +} -- cgit v1.2.3 From 0db5a8673d57088ab394cdaf372fb81dbd78bcbb Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 5 Nov 2015 16:20:56 +0100 Subject: Firefox share (that seems now the official name) button added to misc. settings. --- mod/settings.php | 5 +++-- view/css/mod_settings.css | 8 ++++++++ view/tpl/settings.tpl | 14 +++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 8bfff3765..18bfaeb08 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1102,12 +1102,13 @@ function settings_content(&$a) { '$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'), '%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); diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 7eff8e45b..e81d115d4 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -1,3 +1,11 @@ .group { margin-left: 10px; } + +.ffsapilink { + margin: 10px 0; +} + +.channel-menu { + margin-top: 24px; +} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index ab62ede45..7c1f4578d 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -136,7 +136,7 @@ - {{if $menus}} +
-
-
+
+
+ {{$firefoxshare}} +
+ {{if $menus}} +
- +
+ {{/if}}
- {{/if}}
-- cgit v1.2.3