diff --git a/Zotlabs/Daemon/Run.php b/Zotlabs/Daemon/Run.php index a7987e47e..a8ca219bd 100644 --- a/Zotlabs/Daemon/Run.php +++ b/Zotlabs/Daemon/Run.php @@ -19,6 +19,9 @@ if (array_search( __file__ , get_included_files()) === 0) { class Run { static public function Summon($arr) { + if (file_exists('maintenance_lock') || file_exists('cache/maintenance_lock')) { + return; + } proc_run('php','Zotlabs/Daemon/Run.php',$arr); } diff --git a/Zotlabs/Lib/Libprofile.php b/Zotlabs/Lib/Libprofile.php index eb419ca21..7b71d6146 100644 --- a/Zotlabs/Lib/Libprofile.php +++ b/Zotlabs/Lib/Libprofile.php @@ -353,6 +353,8 @@ class Libprofile { '$rating' => '', '$contact_block' => $contact_block, '$change_photo' => t('Change your profile photo'), + '$copyto' => t('Copy to clipboard'), + '$copied' => t('Address copied to clipboard'), '$editmenu' => self::edit_menu($profile['uid']) )); diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index ee82b2695..ec0a893ef 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -489,11 +489,11 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo return false; } - if(! ($sourceNode->data && $sourceNode->data->hash)) { + if(! ($sourceNode->data && $sourceNode->data['hash'])) { return false; } - return attach_move($this->auth->owner_id, $sourceNode->data->hash, $this->folder_hash); + return attach_move($this->auth->owner_id, $sourceNode->data['hash'], $this->folder_hash); } diff --git a/Zotlabs/Update/_1247.php b/Zotlabs/Update/_1247.php new file mode 100644 index 000000000..e922105be --- /dev/null +++ b/Zotlabs/Update/_1247.php @@ -0,0 +1,20 @@ + limits (0 = no limitation) $w = array( // color properties @@ -746,8 +745,11 @@ function bb_sanitize_style($input, $raw = false) { "text-decoration" => 0, ); + // determine if input is string or array + + $input_is_array = is_array($input); $css = array(); - $css_string = (($raw) ? $input : $input[1]); + $css_string = (($input_is_array) ? $input[1] : $input); $a = explode(';', $css_string); foreach($a as $parts){ @@ -782,10 +784,11 @@ function bb_sanitize_style($input, $raw = false) { $css_string_san .= $key . ":" . $value ."; "; } - if ($raw) { - return $css_string_san; + if ($input_is_array) { + return '' . $input[2] . ''; } - return '' . $input[2] . ''; + + return $css_string_san; } function oblanguage_callback($matches) { @@ -907,12 +910,12 @@ function bb_imgoptions($match) { $x = preg_match("/style='(.*?)'/ism", $attributes, $matches); if ($x) { - $style = bb_sanitize_style($matches[1],true); + $style = bb_sanitize_style($matches[1]); } $x = preg_match("/style=\"\;(.*?)\"\;/ism", $attributes, $matches); if ($x) { - $style = bb_sanitize_style($matches[1],true); + $style = bb_sanitize_style($matches[1]); } // legacy img options @@ -971,7 +974,6 @@ function bb_code_preunprotect($s) { } - function bb_code_protect($s) { return 'b64.^9e%.' . base64_encode($s) . '.b64.$9e%'; } diff --git a/util/db_update.php b/util/db_update old mode 100644 new mode 100755 similarity index 94% rename from util/db_update.php rename to util/db_update index 8fc7c7616..46a98b4db --- a/util/db_update.php +++ b/util/db_update @@ -1,3 +1,4 @@ +#!/usr/bin/env php /dev/null 2>&1 + touch cache/maintenance_lock > /dev/null 2>&1 + if [ -f maintenance_lock -o -f cache/maintenance_lock ]; then + echo "Maintenance mode is enabled" + else + echo "Failed: Maintenance mode is disabled" + fi +fi +if [ $1 == 'off' ]; then + rm maintenance_lock > /dev/null 2>&1 + rm cache/maintenance_lock > /dev/null 2>&1 + if [ -f maintenance_lock -o -f cache/maintenance_lock ]; then + echo "Failed: Maintenance mode is enabled" + else + echo "Maintenance mode is disabled" + fi +fi diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index dcda7b4c3..686b0fcd9 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -24,7 +24,20 @@ {{if ! $zcard}}
{{$profile.fullname}}{{if $profile.online}} {{/if}}
- {{if $reddress}}
{{$profile.reddress}}
{{/if}} + {{if $reddress}} +
{{$profile.reddress}} +
+ + {{/if}} {{/if}} {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} {{if $active}}