HotFix: Captcha

.gitignore

@@ -2,4 +2,5 @@ project.json
 *.db
 .idea/
 *.sql
-vendor/
+vendor/
+.vs

Source/assets/html/loginregister.twig

@@ -79,6 +79,10 @@
                     <input type="checkbox"  required="required" name="tos" id="tos">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="control-label col-sm-2" for="captcha"></label>
+                <div class="col-sm-10 g-recaptcha" data-sitekey="6Ld-C3cUAAAAADjyFgwdcVuLJqfCr0F3s2p1mE86"></div>
+            </div>
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-10">
                     <button type="submit" class="btn btn-success">Submit</button>

Source/composer.lock

@@ -1,7 +1,7 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
     "content-hash": "1d57e016803e2095db2110462e070da3",

Source/doc/ROLES

@@ -1,5 +0,0 @@
-User's roles
-0: Normal user
-1: Normal user with ban
-2: Moderator
-3: Administrator

Source/src/app.php

@@ -193,6 +193,11 @@ function loginOrRegister($state,$request){
                 return loginRegister("login",'BAD_CREDENTIAL');
             }
         case 2:
+            $captcha = checkCaptcha($request->get("g-recaptcha-response"));
+            if(!$captcha){
+                return "CAPTCHA_FAIL";
+            }
+
             $state = register($request->get('emailre'),$request->get('emailre-re'),
             $request->get('pwdre'),  $request->get('pwdre-re'),$request->get('nick'),$app['data']);
             if ($state == '') 
@@ -268,7 +273,7 @@ function HTTPError($code){
     return array("text"=>$text,"number"=>$code);
 }
 
-$app->error(function (\Exception $e,$request, $code = 500) use ($app) {
+$app->error(function (\Exception $e,$request) use ($app) {
     $user = null;
     try{
         $user = getUser($app);
@@ -277,16 +282,18 @@ $app->error(function (\Exception $e,$request, $code = 500) use ($app) {
     }
     if ($app['debug']) {
         return;
-    }else{
+    }else {
-        
+        $code=500;
-        $error = HTTPError($code);
+        if($e instanceof \Symfony\Component\HttpKernel\Exception\HttpException)
-        return $app['twig']->render($app['fronthtml'].'/error.twig', Array(
+            $error = HTTPError($e->getStatusCode());
-            'page' => array("title"=>$code),
+
-            'error' => $error,
-            'user' => $user,
-        ));
         
     }
+    return $app['twig']->render($app['fronthtml'].'/error.twig', Array(
+        'page' => array("title"=>$code),
+        'error' => $error,
+        'user' => $user,
+    ));
 });
 
 

Source/src/functions.php

@@ -81,15 +81,19 @@ function groupByCategory($supported){
 
 function checkCaptcha($response){
     $url = "https://www.google.com/recaptcha/api/siteverify";
-    $post = 'secret='.'6Lc7gXAUAAAAAOTbo2u3IXoSB6KlhtVmUHTzpcGY&response='. $response;
+    //$post = 'secret='.'6Ld-C3cUAAAAAC6NhPw-rn4LsdM2PjKg255H6j0o&response='. $response;
+    $post = array('secret'   => "6Ld-C3cUAAAAAC6NhPw-rn4LsdM2PjKg255H6j0o",
+                  'response' => $response);
 
-    $ch = curl_init( $url );
+    $options = array(
-    curl_setopt( $ch, CURLOPT_POST, 1);
+        'http' => array(
-    curl_setopt( $ch, CURLOPT_POSTFIELDS, $post);
+            "header" => "Content-type: application/x-www-form-urlencoded\r\n",
-    curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1);
+            "method" => 'POST',
-    curl_setopt( $ch, CURLOPT_HEADER, 0);
+            'content'=> http_build_query($post)
-    curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1);
+        )
+    );
+    $context = stream_context_create($options);
+    $response = file_get_contents($url,false,$context);
 
-    $response = curl_exec( $ch );
+    return json_decode($response,true)["success"];
-    return json_decode($response)["success"];
 }