wesmiler před 6 roky
rodič
revize
a2a0abd3e3

+ 2 - 0
public/themes/default/index/login/test.html

@@ -9,10 +9,12 @@
             e = 0,
             r = window.crypto || window.msCrypto;
         r && r.getRandomValues && (n = r.getRandomValues(new Uint8Array(31)));
+        console.log(n);
         for (var o, i = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx", a = "", s = 0; s < i.length; s++) o = i[s], "x" === o ? a += t().toString(16) : "y" === o ? (o = 3 & t() | 8, a += o.toString(16)) : a += o;
         return a
     }
 
+    console.log(new Uint8Array(31));
     console.log(r());
 </script>
 <script src="__TMPL__/index/public/assets/js/test.js?v={$version}" type="text/javascript"></script>

+ 4 - 4
vendor/thinkcmf/cmf/src/common.php

@@ -2550,7 +2550,7 @@ function jsonParse($data){
  */
 function makeRandomUid(){
     $v8js = new V8Js();
-   /* $jsStr = <<< ETO
+   $jsStr = <<< ETO
    function r() {
         function t() {
             return n ? 15 & n[e++] : 16 * Math.random() | 0
@@ -2563,8 +2563,8 @@ function makeRandomUid(){
         return a
     }
     r();
-ETO;*/
-    $jsStr = <<< ETO
+ETO;
+    /*$jsStr = <<< ETO
    function r() {
         function t() {
             return n ? 15 & n[e++] : 16 * Math.random() | 0
@@ -2573,7 +2573,7 @@ ETO;*/
         return t();
     }
     r();
-ETO;
+ETO;*/
   try {
      $uuid = $v8js->executeString($jsStr, 'uuid.js');
      echo $uuid.'++';