From 9c4532ba8712f0a95a16bb649884836cc26692eb Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Mon, 31 Dec 2018 18:17:54 +0800
Subject: [PATCH] Fix #5620 - hide /admin.php and index.php

---
 DataObjects/Core_setting.php | 37 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 05816c4e..97ec8bd3 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -112,49 +112,48 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         $key_dir = "{$this->getKeyDirectory()}/pub.key";
         
         if(!file_exists($key_dir)) {
-            print_r("Cannot find {$key_dir}");
-            exit;
+            return false;
         }
         
         $pub_key = file_get_contents($key_dir);
         if(!$pub_key) {
-            return;
+            return false;
         }
         openssl_public_encrypt($v, $ciphertext, $pub_key);
         return $ciphertext;
     }
     
-    function getDecryptVal()
+    function decrypt($v)
     {
-        $dir = $this->getKeyDirectory();
+        $key_dir = "{$this->getKeyDirectory()}/pri.key";
         
-        if(!$dir) {
+        if(!file_exists($key_dir)) {
             return false;
         }
         
-        if(empty($this->val)) {
+        $pri_key = file_get_contents($key_dir);
+        
+        if(!$pri_key) {
             return false;
         }
         
-        if(empty($this->is_encrypt)) {
-            return $this->val;
-        }
+        openssl_private_decrypt($v, $plaintext, $pri_key);
         
-        $key_dir = "{$dir}/pri.key";
+        return $plaintext;
+    }
+    
+    function getDecryptVal()
+    {
         
-        if(!file_exists($key_dir)) {
+        if(empty($this->val)) {
             return false;
         }
         
-        $pri_key = file_get_contents($key_dir);
-        
-        if(!$pri_key) {
-            return false;
+        if(empty($this->is_encrypt)) {
+            return $this->val;
         }
         
-        openssl_private_decrypt($this->val, $plaintext, $pri_key);
-        
-        return $plaintext;
+        return $this->decrypt($this->val);
     }
     
 }
-- 
2.39.2