From 8b77fbd38041f64d6ab692da0d1f333f17377b24 Mon Sep 17 00:00:00 2001
From: Spirit <spirit1431007@gmail.com>
Date: Thu, 26 Dec 2019 19:52:06 +0800
Subject: [PATCH] fix

---
 footer.php         | 1 -
 functions.php      | 2 +-
 inc/api.php        | 2 +-
 layouts/imgbox.php | 3 ---
 options.php        | 6 +++---
 style.css          | 6 ++++--
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/footer.php b/footer.php
index 4303f6fe..6f35a571 100644
--- a/footer.php
+++ b/footer.php
@@ -157,7 +157,6 @@ class="aplayer"
         data-fixed="true"
         data-theme="orange">
     </div>
-    <style>.skin-menu{left:auto;right:10px;}.changeSkin-gear{left:auto;right:5px;}</style>
 <?php endif; ?>
 </body>
 </html>
diff --git a/functions.php b/functions.php
index 3e8fb797..b192a8aa 100644
--- a/functions.php
+++ b/functions.php
@@ -1627,7 +1627,7 @@ function change_avatar($avatar){
                 preg_match('/:\"([^\"]*)\"/i',$qqavatar,$matches);
                 return '<img src="'.$matches[1].'" data-src="'.stripslashes($m[1]).'" class="lazyload avatar avatar-24 photo" alt="😀" width="24" height="24" onerror="imgError(this,1)">';
             }else{
-                $iv = SAKURA_VERSION;
+                $iv = str_repeat($sakura_privkey, 2);
                 $encrypted = openssl_encrypt($qq_number, 'aes-128-cbc', $sakura_privkey, 0, $iv);
                 $encrypted = urlencode(base64_encode($encrypted));
                 return '<img src="'.rest_url("sakura/v1/qqinfo/avatar").'?qq='.$encrypted.'"class="lazyload avatar avatar-24 photo" alt="😀" width="24" height="24" onerror="imgError(this,1)">';
diff --git a/inc/api.php b/inc/api.php
index 2205345b..0c1f8fd8 100644
--- a/inc/api.php
+++ b/inc/api.php
@@ -401,7 +401,7 @@ function get_qq_avatar(){
     global $sakura_privkey;
     $encrypted=$_GET["qq"];
     if(isset($encrypted)){
-        $iv = SAKURA_VERSION;
+        $iv = str_repeat($sakura_privkey, 2);
         $encrypted = urldecode(base64_decode($encrypted));
         $qq_number = openssl_decrypt($encrypted, 'aes-128-cbc', $sakura_privkey, 0, $iv);
         preg_match('/^\d{3,}$/', $qq_number, $matches);
diff --git a/layouts/imgbox.php b/layouts/imgbox.php
index 2393adf3..532b1812 100644
--- a/layouts/imgbox.php
+++ b/layouts/imgbox.php
@@ -58,9 +58,6 @@
                 <?php if (akina_option('facebook')){ ?>
                 <li><a href="<?php echo akina_option('facebook', ''); ?>" target="_blank" class="social-wangyiyun" title="Facebook"><img src="https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.9/img/Sakura/images/sns/facebook.png"/></a></li>
                 <?php } ?>	
-                <?php if (akina_option('googleplus')){ ?>
-                <li><a href="<?php echo akina_option('googleplus', ''); ?>" target="_blank" class="social-wangyiyun" title="Google+"><img src="https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.9/img/Sakura/images/sns/googleplus.png"/></a></li>
-                <?php } ?>
                 <?php if (akina_option('jianshu')){ ?>
                 <li><a href="<?php echo akina_option('jianshu', ''); ?>" target="_blank" class="social-wangyiyun" title="Jianshu"><img src="https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.9/img/Sakura/images/sns/jianshu.png"/></a></li>
                 <?php } ?>
diff --git a/options.php b/options.php
index a962c91f..56b8e4e1 100644
--- a/options.php
+++ b/options.php
@@ -689,14 +689,14 @@ function optionsframework_options() {
 		'id' => 'facebook',
 		'std' => '',
 		'type' => 'text');
-
+	/*
 	$options[] = array(
 		'name' => __('Google+', 'sakura'),
-		'desc' => __('G+ address', 'sakura'),/*G+地址*/
+		'desc' => __('G+ address', 'sakura'),
 		'id' => 'googleplus',
 		'std' => '',
 		'type' => 'text');
-
+	*/
 	$options[] = array(
 		'name' => __('Jianshu', 'sakura'),/*简书*/
 		'desc' => __('Jianshu address', 'sakura'),/*简书地址*/
diff --git a/style.css b/style.css
index 6da0bcc7..fcc9ce5d 100644
--- a/style.css
+++ b/style.css
@@ -6809,7 +6809,8 @@ input[type=radio]:checked:before {
 .changeSkin-gear {
     position: fixed;
     bottom: 0;
-    left: 5px;
+    left: auto;
+    right: 5px;
     width: auto;
     height: auto;
     z-index: 99;
@@ -8294,7 +8295,8 @@ td.hljs-ln-numbers {
 .skin-menu {
     position: fixed;
     bottom: 50px;
-    left: 10px;
+    left: auto;
+    right: 10px;
     height: auto;
     width: 220px;
     border-radius: 5px;