Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Added admin_auth_token parameter

givanz88404ac65cb8
diff --git a/admin/sql/mysqli/admin.sql b/admin/sql/mysqli/admin.sql
index ea06f5f..f11373e 100755
--- a/admin/sql/mysqli/admin.sql
+++ b/admin/sql/mysqli/admin.sql
@@ -64,6 +64,7 @@
IN username CHAR,
IN email CHAR,
IN token CHAR,
+ IN admin_auth_token CHAR,
IN admin_id INT,
IN status INT,
IN role_id INT,
@@ -73,7 +74,12 @@
SELECT _.*, role.name as role,role.permissions FROM admin AS _
LEFT JOIN role ON (_.role_id = role.role_id)
-
+
+ @IF isset(:admin_auth_token)
+ THEN
+ LEFT JOIN admin_auth_token ON (_.admin_id = admin_auth_token.admin_id)
+ END @IF
+
WHERE 1 = 1
@IF isset(:username) && !isset(:email)
@@ -105,7 +111,12 @@
THEN
AND _.token = :token
END @IF
-
+
+ @IF isset(:admin_auth_token)
+ THEN
+ AND admin_auth_token.token = :admin_auth_token
+ END @IF
+
@IF isset(:role_id)
THEN
AND _.role_id = :role_id
diff --git a/admin/sql/pgsql/admin.sql b/admin/sql/pgsql/admin.sql
index 8c39bf1..a01b3e6 100755
--- a/admin/sql/pgsql/admin.sql
+++ b/admin/sql/pgsql/admin.sql
@@ -64,6 +64,7 @@
IN username CHAR,
IN email CHAR,
IN token CHAR,
+ IN admin_auth_token CHAR,
IN admin_id INT,
IN status INT,
IN role_id INT,
@@ -74,6 +75,11 @@
SELECT _.*, role.name as role,role.permissions FROM admin AS _
LEFT JOIN role ON (_.role_id = role.role_id)
+ @IF isset(:admin_auth_token)
+ THEN
+ LEFT JOIN admin_auth_token ON (_.admin_id = admin_auth_token.admin_id)
+ END @IF
+
WHERE 1 = 1
@IF isset(:username) && !isset(:email)
@@ -106,6 +112,11 @@
AND _.token = :token
END @IF
+ @IF isset(:admin_auth_token)
+ THEN
+ AND admin_auth_token.token = :admin_auth_token
+ END @IF
+
@IF isset(:role_id)
THEN
AND _.role_id = :role_id
@@ -121,7 +132,7 @@
CREATE PROCEDURE add(
IN admin ARRAY,
- OUT fetch_one
+ OUT insert_id
)
BEGIN
diff --git a/admin/sql/sqlite/admin.sql b/admin/sql/sqlite/admin.sql
index 6ad8edb..458f08a 100755
--- a/admin/sql/sqlite/admin.sql
+++ b/admin/sql/sqlite/admin.sql
@@ -64,6 +64,7 @@
IN username CHAR,
IN email CHAR,
IN token CHAR,
+ IN admin_auth_token CHAR,
IN admin_id INT,
IN status INT,
IN role_id INT,
@@ -74,6 +75,11 @@
SELECT _.*, role.name as role,role.permissions FROM admin AS _
LEFT JOIN role ON (_.role_id = role.role_id)
+ @IF isset(:admin_auth_token)
+ THEN
+ LEFT JOIN admin_auth_token ON (_.admin_id = admin_auth_token.admin_id)
+ END @IF
+
WHERE 1 = 1
@IF isset(:username) && !isset(:email)
@@ -104,6 +110,11 @@
@IF isset(:token)
THEN
AND _.token = :token
+ END @IF
+
+ @IF isset(:admin_auth_token)
+ THEN
+ AND admin_auth_token.token = :admin_auth_token
END @IF
@IF isset(:role_id)