From 365177f8b75f7149be86298a9336d609fbba8358 Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Wed, 15 Mar 2017 17:39:53 +0200
Subject: [PATCH] angular sinitize => cdn + user duplicate username

---
 app/library/App/Controllers/UserController.php | 5 ++---
 app/views/general/documentation.phtml          | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/library/App/Controllers/UserController.php b/app/library/App/Controllers/UserController.php
index f234111..1bd3851 100755
--- a/app/library/App/Controllers/UserController.php
+++ b/app/library/App/Controllers/UserController.php
@@ -110,16 +110,15 @@ class UserController extends CrudResourceController
 
     protected function postDataValid($data, $isUpdate)
     {
+        //проверка на регистрацию существующего username
         $input_name = $data['username'];
-        if (!empty($input_name))
+        if (!$isUpdate)
         {
-
             $same_user = User::find(["username = '".$input_name."'"]);
             if (isset($same_user[0]) && !empty($same_user[0]->username))
             {
                 return false;
             }
-
         }
 
         return true;
diff --git a/app/views/general/documentation.phtml b/app/views/general/documentation.phtml
index f3bda13..a5a9374 100755
--- a/app/views/general/documentation.phtml
+++ b/app/views/general/documentation.phtml
@@ -118,7 +118,9 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script>
-<script src="https://code.angularjs.org/1.4.8/angular-sanitize.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-sanitize/1.4.8/angular-sanitize.min.js"></script>
+<!--<script src="https://code.angularjs.org/1.4.8/angular-sanitize.min.js"></script>-->
+
 <script>
     var documentationPath = '<?php echo $documentationPath ?>';
     var app = angular.module('app', [
--
libgit2 0.21.4