fix

helper/jCryption.lnk.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * @file jCryption.lnk.php
+ * @date 2018-09-30
+ * @author Go Namhyeon <gnh1201@gmail.com>
+ * @brief jCryption (alternative HTTPS on javascript) Helper
+ */
+
+if(!check_function_exists("jCryption_load")) {
+    function jCryption_load() {
+        $required_files = array(
+            "jCryption/sqAES",
+            "jCryption/JCryption"
+        );
+        foreach($required_files as $file) {
+            $inc_file = get_current_working_dir() . "/vendor/_dist/" . $file . ".php";
+            if(file_exists($inc_file)) {
+                include($inc_file);
+            }
+        }
+    }
+}
+
+if(!check_function_exists("jCryption_get")) {
+    function jCryption_get($idx, $selector="") {
+        $s = array();
+        $s[] = "JCryption::decrypt();";
+        $s[] = sprintf("$(function(){$(\"%s\").jCryption(); });", $selector);
+        $s[] = sprintf("%s/vendor/_dist/jCryption/js/jquery.jcryption.3.1.0.js", base_url());
+        return $s[$idx];
+    }
+}

helper/jcryption.lnk.php

@@ -1,42 +0,0 @@
-<?php
-/**
- * @file jcryption.lnk.php
- * @date 2018-09-30
- * @author Go Namhyeon <gnh1201@gmail.com>
- * @brief jCryption (alternative HTTPS on javascript) Helper
- */
-    
-if(!check_function_exists("jcryption_load")) {
-    function jcryption_load() {
-        $required_files = array(
-            "jCryption/sqAES",
-            "jCryption/JCryption"
-        );
-        foreach($required_files as $file) {
-            $inc_file = get_current_working_dir() . "/vendor/_default/" . $file . ".php";
-            if(file_exists($inc_file)) {
-                include($inc_file);
-            }
-        }
-    }
-}
-
-if(!check_function_exists("jcryption_get_code")) {
-    function jcryption_get_code() {
-        return "JCryption::decrypt();";
-    }
-}
-
-if(!check_function_exists("jcryption_get_jscode")) {
-    function jcryption_get_jscode($selector) {
-        return "$(function() { $(" . $selector . ").jCryption(); });";
-    }
-}
-
-if(!check_function_exists("jcryption_get_js_url")) {
-    function jcryption_get_js_url() {
-        return "JCryption::decrypt();";
-    }
-        return base_url() . "vendor/_default/jCryption/js/jquery.jcryption.3.1.0.js";
-    }
-}

helper/spreadsheet-reader.lnk.php

@@ -19,7 +19,7 @@ if(!check_function_exists("parse_excel_file")) {
             //"spreadsheet-reader/SpreadsheetReader_ODS"
         );
         foreach($required_files as $file) {
-            include("./vendor/_default/" . $file . ".php"); 
+            include("./vendor/_dist/" . $file . ".php");
         }
 
         $spreadsheet = false;
@@ -52,7 +52,7 @@ if(!check_function_exists("parse_excel_file")) {
                         if((count($columnNames) - 1) > $i) {
                             $cols[$columnNames[$i]] = $col;
                         } else {
-                            $cols[] = $col;    
+                            $cols[] = $col;
                         }
                         $i++;
                     }

system/uri.php

@@ -52,13 +52,14 @@ if(!check_function_exists("read_route")) {
 
 if(!check_function_exists("read_requests")) {
     function read_requests($options=array()) {
-        // process http encryption
         $config = get_config();
-        $httpencrypt = strtolower(get_value_in_array("httpencrypt", $config, ""));
+
-        if($httpencrypt == "jcryption") {
+        // alternative to HTTPS
-            if(loadHelper("jcryption.lnk")) {
+        $https = strtolower(get_value_in_array("https", $config, ""));
-                jcryption_load();
+        if(strtoupper($https) == "JCRYPTION") {
-                eval(jcryption_get_code());
+            if(loadHelper("jCryption.lnk")) {
+                jCryption_load();
+                eval(jCryption_get(0));
             }
         }
 

vendor/_dist/PHP-MetaParser/MetaParser.class.php

@@ -578,7 +578,7 @@
                 'openGraph' => $this->getOpenGraph(),
                 'social' => $this->getSocial(),
                 'title' => $this->getTitle(),
-                'url' => $this->getUrl()
+                'url' => $this->getURL()
             );
         }
 
@@ -708,12 +708,12 @@
         }
 
         /**
-         * getUrl
+         * getURL
          * 
          * @access public
          * @return string
          */
-        public function getUrl()
+        public function getURL()
         {
             return $this->_url;
         }