From 29d9d38d7f1362759a820073c6a7771309c4504e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 9 Jun 2015 22:24:24 -0700 Subject: retire old Friendica RINO encryption functions --- include/crypto.php | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/include/crypto.php b/include/crypto.php index a4ce2cf98..494a2a5b9 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -296,34 +296,6 @@ function salmon_key($pubkey) { return 'RSA' . '.' . base64url_encode($m,true) . '.' . base64url_encode($e,true) ; } -// old function for providing mysql compatible encryption and is also -// used in Friendica 'RINO'. This function is messy and should be retired. - - -function aes_decrypt($val,$ky) -{ - $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; - for($a=0;$a=0 and ord(substr($dec, strlen($dec)-1,1))<=16)? chr(ord( substr($dec,strlen($dec)-1,1))):null)); -} - - - -function aes_encrypt($val,$ky) -{ - $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; - for($a=0;$a Date: Wed, 10 Jun 2015 11:58:45 +0200 Subject: really show login form if it is enabled --- mod/home.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/home.php b/mod/home.php index b22dace8c..4b651d899 100644 --- a/mod/home.php +++ b/mod/home.php @@ -72,7 +72,7 @@ function home_content(&$a, $update = 0, $load = false) { if($sitename) $o .= '

' . sprintf( t("Welcome to %s") ,$sitename) . '

'; - if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { + if((! intval(get_config('system','block_public'))) && (! local_channel()) && (! remote_channel())) { // If there's nothing special happening, just spit out a login box $loginbox = get_config('system','login_on_homepage'); if(intval($loginbox) || $loginbox === false) @@ -81,4 +81,4 @@ function home_content(&$a, $update = 0, $load = false) { return $o; -} \ No newline at end of file +} -- cgit v1.2.3 From 50ac9378e3b1b55e8f12513f5b72152078477ab2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 10 Jun 2015 13:08:17 +0200 Subject: assign right aside the same width as we have in left aside but hide it on small and xs screens. make aside width a variablee for easier handling. --- view/css/default.css | 6 ++---- view/php/default.php | 2 +- view/theme/redbasic/css/style.css | 12 +++++++++--- view/theme/redbasic/php/style.php | 9 ++++++--- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/view/css/default.css b/view/css/default.css index 56173f932..2675bc2d8 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -14,10 +14,8 @@ main { height: 100%; } -aside#region_1 { - width: 231px; - min-width: 231px; - max-width: 231px; +aside#region_1, +aside#region_3 { display: table-cell; vertical-align: top; padding: 65px 7px 0px 7px; diff --git a/view/php/default.php b/view/php/default.php index 01cd8a0d4..4c8311ef0 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -14,7 +14,7 @@
- +
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a671a6671..1c575a63e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -24,8 +24,14 @@ body { height: 100%; } +aside { + width: $aside_widthpx; + min-width: $aside_widthpx; + max-width: $aside_widthpx; +} + main { - max-width: $main_width; + max-width: $main_widthpx; } h1, .h1, h2, .h2 { @@ -2097,8 +2103,8 @@ nav .badge.mail-update:hover { } main { - left: -231px; - width: calc( 100% + 231px ); + left: -$aside_widthpx; + width: calc( 100% + $aside_widthpx ); } main.region_1-on { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index c6231e690..5a28fc4e3 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -153,11 +153,13 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - // left aside is 231px + converse width - $main_width = (231 + intval($converse_width)); + $aside_width = 231; + + // left aside and right aside are is 231px + converse width + $main_width = (($aside_width * 2) + intval($converse_width)); // prevent main_width smaller than 768px - $main_width = (($main_width < 768) ? 768 : $main_width) . 'px'; + $main_width = (($main_width < 768) ? 768 : $main_width); $options = array ( '$nav_bg' => $nav_bg, @@ -191,6 +193,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$pmenu_reply' => $pmenu_reply, '$comment_indent' => $comment_indent, '$main_width' => $main_width, + '$aside_width' => $aside_width ); echo str_replace(array_keys($options), array_values($options), $x); -- cgit v1.2.3 From edd2d1e8d47be1ef4fe38edf624335472a2e73bd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 10 Jun 2015 13:24:16 +0200 Subject: show login without checking for block_public, local or remote channel --- mod/home.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mod/home.php b/mod/home.php index 4b651d899..3091be3a1 100644 --- a/mod/home.php +++ b/mod/home.php @@ -72,12 +72,9 @@ function home_content(&$a, $update = 0, $load = false) { if($sitename) $o .= '

' . sprintf( t("Welcome to %s") ,$sitename) . '

'; - if((! intval(get_config('system','block_public'))) && (! local_channel()) && (! remote_channel())) { - // If there's nothing special happening, just spit out a login box - $loginbox = get_config('system','login_on_homepage'); - if(intval($loginbox) || $loginbox === false) - $o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); - } + $loginbox = get_config('system','login_on_homepage'); + if(intval($loginbox) || $loginbox === false) + $o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); return $o; -- cgit v1.2.3 From a31fdd3fbb0d068f91cc56daa052282f91adf2a2 Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Wed, 10 Jun 2015 15:37:10 -0300 Subject: correctly fix attachment permissions from private mentions by postponing code that removes the attachment tag from the body --- mod/item.php | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/mod/item.php b/mod/item.php index a9c6ea65b..3ff286268 100644 --- a/mod/item.php +++ b/mod/item.php @@ -586,27 +586,6 @@ function item_post(&$a) { } } - $attachments = ''; - $match = false; - - if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) { - $attachments = array(); - foreach($match[2] as $mtch) { - $hash = substr($mtch,0,strpos($mtch,',')); - $rev = intval(substr($mtch,strpos($mtch,','))); - $r = attach_by_hash_nodata($hash,$rev); - if($r['success']) { - $attachments[] = array( - 'href' => $a->get_baseurl() . '/attach/' . $r['data']['hash'], - 'length' => $r['data']['filesize'], - 'type' => $r['data']['filetype'], - 'title' => urlencode($r['data']['filename']), - 'revision' => $r['data']['revision'] - ); - } - $body = str_replace($match[1],'',$body); - } - } /** * @@ -643,6 +622,29 @@ function item_post(&$a) { } + + $attachments = ''; + $match = false; + + if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) { + $attachments = array(); + foreach($match[2] as $mtch) { + $hash = substr($mtch,0,strpos($mtch,',')); + $rev = intval(substr($mtch,strpos($mtch,','))); + $r = attach_by_hash_nodata($hash,$rev); + if($r['success']) { + $attachments[] = array( + 'href' => $a->get_baseurl() . '/attach/' . $r['data']['hash'], + 'length' => $r['data']['filesize'], + 'type' => $r['data']['filetype'], + 'title' => urlencode($r['data']['filename']), + 'revision' => $r['data']['revision'] + ); + } + $body = str_replace($match[1],'',$body); + } + } + } // BBCODE end alert -- cgit v1.2.3