From 3e629a13415391e70e4e915f7706f3828912da20 Mon Sep 17 00:00:00 2001
From: Thomas Lange <code@nerdmind.de>
Date: Fri, 7 Jul 2017 22:30:05 +0200
Subject: The function "makeSlugURL" has been renamed to "generateSlug" because
the name was misleading because the function did not generate a complete URL,
but only a partial string (the slug) for the final URL. By the way, some
improvements were made to the code.
---
admin/page/insert.php | 6 +++---
admin/page/update.php | 6 +++---
admin/post/insert.php | 6 +++---
admin/post/update.php | 6 +++---
admin/user/insert.php | 6 +++---
admin/user/update.php | 6 +++---
6 files changed, 18 insertions(+), 18 deletions(-)
(limited to 'admin')
diff --git a/admin/page/insert.php b/admin/page/insert.php
index a360c1b..b550434 100644
--- a/admin/page/insert.php
+++ b/admin/page/insert.php
@@ -15,12 +15,12 @@ $Attribute = new Page\Attribute();
if(HTTP::issetPOST('id', 'user', 'slug', 'name', 'body', 'argv', 'time_insert', 'time_update', 'insert')) {
$Attribute->set('id', HTTP::POST('id') ? HTTP::POST('id') : FALSE);
$Attribute->set('user', HTTP::POST('user'));
- $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : makeSlugURL(HTTP::POST('name')));
+ $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('name')));
$Attribute->set('name', HTTP::POST('name') ? HTTP::POST('name') : NULL);
$Attribute->set('body', HTTP::POST('body') ? HTTP::POST('body') : NULL);
$Attribute->set('argv', HTTP::POST('argv') ? HTTP::POST('argv') : NULL);
- $Attribute->set('time_insert', HTTP::POST('time_insert') ? HTTP::POST('time_insert') : date('Y-m-d H:i:s'));
- $Attribute->set('time_update', HTTP::POST('time_update') ? HTTP::POST('time_update') : date('Y-m-d H:i:s'));
+ $Attribute->set('time_insert', HTTP::POST('time_insert') ?: date('Y-m-d H:i:s'));
+ $Attribute->set('time_update', HTTP::POST('time_update') ?: date('Y-m-d H:i:s'));
if(HTTP::issetPOST(['token' => Application::getSecurityToken()])) {
try {
diff --git a/admin/page/update.php b/admin/page/update.php
index 18c9785..f8d790a 100644
--- a/admin/page/update.php
+++ b/admin/page/update.php
@@ -19,12 +19,12 @@ try {
if(HTTP::issetPOST('user', 'slug', 'name', 'body', 'argv', 'time_insert', 'time_update', 'update')) {
$Attribute->set('user', HTTP::POST('user'));
- $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : makeSlugURL(HTTP::POST('name')));
+ $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('name')));
$Attribute->set('name', HTTP::POST('name') ? HTTP::POST('name') : NULL);
$Attribute->set('body', HTTP::POST('body') ? HTTP::POST('body') : NULL);
$Attribute->set('argv', HTTP::POST('argv') ? HTTP::POST('argv') : NULL);
- $Attribute->set('time_insert', HTTP::POST('time_insert') ? HTTP::POST('time_insert') : date('Y-m-d H:i:s'));
- $Attribute->set('time_update', HTTP::POST('time_update') ? HTTP::POST('time_update') : date('Y-m-d H:i:s'));
+ $Attribute->set('time_insert', HTTP::POST('time_insert') ?: date('Y-m-d H:i:s'));
+ $Attribute->set('time_update', HTTP::POST('time_update') ?: date('Y-m-d H:i:s'));
if(HTTP::issetPOST(['token' => Application::getSecurityToken()])) {
try {
diff --git a/admin/post/insert.php b/admin/post/insert.php
index 8e08fb3..d3e1b96 100644
--- a/admin/post/insert.php
+++ b/admin/post/insert.php
@@ -15,12 +15,12 @@ $Attribute = new Post\Attribute();
if(HTTP::issetPOST('id', 'user', 'slug', 'name', 'body', 'argv', 'time_insert', 'time_update', 'insert')) {
$Attribute->set('id', HTTP::POST('id') ? HTTP::POST('id') : FALSE);
$Attribute->set('user', HTTP::POST('user'));
- $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : makeSlugURL(HTTP::POST('name')));
+ $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('name')));
$Attribute->set('name', HTTP::POST('name') ? HTTP::POST('name') : NULL);
$Attribute->set('body', HTTP::POST('body') ? HTTP::POST('body') : NULL);
$Attribute->set('argv', HTTP::POST('argv') ? HTTP::POST('argv') : NULL);
- $Attribute->set('time_insert', HTTP::POST('time_insert') ? HTTP::POST('time_insert') : date('Y-m-d H:i:s'));
- $Attribute->set('time_update', HTTP::POST('time_update') ? HTTP::POST('time_update') : date('Y-m-d H:i:s'));
+ $Attribute->set('time_insert', HTTP::POST('time_insert') ?: date('Y-m-d H:i:s'));
+ $Attribute->set('time_update', HTTP::POST('time_update') ?: date('Y-m-d H:i:s'));
if(HTTP::issetPOST(['token' => Application::getSecurityToken()])) {
try {
diff --git a/admin/post/update.php b/admin/post/update.php
index af26835..c21b96e 100644
--- a/admin/post/update.php
+++ b/admin/post/update.php
@@ -19,12 +19,12 @@ try {
if(HTTP::issetPOST('user', 'slug', 'name', 'body', 'argv', 'time_insert', 'time_update', 'update')) {
$Attribute->set('user', HTTP::POST('user'));
- $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : makeSlugURL(HTTP::POST('name')));
+ $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('name')));
$Attribute->set('name', HTTP::POST('name') ? HTTP::POST('name') : NULL);
$Attribute->set('body', HTTP::POST('body') ? HTTP::POST('body') : NULL);
$Attribute->set('argv', HTTP::POST('argv') ? HTTP::POST('argv') : NULL);
- $Attribute->set('time_insert', HTTP::POST('time_insert') ? HTTP::POST('time_insert') : date('Y-m-d H:i:s'));
- $Attribute->set('time_update', HTTP::POST('time_update') ? HTTP::POST('time_update') : date('Y-m-d H:i:s'));
+ $Attribute->set('time_insert', HTTP::POST('time_insert') ?: date('Y-m-d H:i:s'));
+ $Attribute->set('time_update', HTTP::POST('time_update') ?: date('Y-m-d H:i:s'));
if(HTTP::issetPOST(['token' => Application::getSecurityToken()])) {
try {
diff --git a/admin/user/insert.php b/admin/user/insert.php
index 2d49322..14b1f13 100644
--- a/admin/user/insert.php
+++ b/admin/user/insert.php
@@ -14,15 +14,15 @@ $Attribute = new User\Attribute();
if(HTTP::issetPOST('id', 'slug', 'username', 'password', 'fullname', 'mailaddr', 'body', 'argv', 'time_insert', 'time_update', 'insert')) {
$Attribute->set('id', HTTP::POST('id') ? HTTP::POST('id') : FALSE);
- $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : makeSlugURL(HTTP::POST('username')));
+ $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('username')));
$Attribute->set('username', HTTP::POST('username') ? HTTP::POST('username') : NULL);
$Attribute->set('password', HTTP::POST('password') ? password_hash(HTTP::POST('password'), PASSWORD_BCRYPT, ['cost' => 10]) : FALSE);
$Attribute->set('fullname', HTTP::POST('fullname') ? HTTP::POST('fullname') : NULL);
$Attribute->set('mailaddr', HTTP::POST('mailaddr') ? HTTP::POST('mailaddr') : NULL);
$Attribute->set('body', HTTP::POST('body') ? HTTP::POST('body') : NULL);
$Attribute->set('argv', HTTP::POST('argv') ? HTTP::POST('argv') : NULL);
- $Attribute->set('time_insert', HTTP::POST('time_insert') ? HTTP::POST('time_insert') : date('Y-m-d H:i:s'));
- $Attribute->set('time_update', HTTP::POST('time_update') ? HTTP::POST('time_update') : date('Y-m-d H:i:s'));
+ $Attribute->set('time_insert', HTTP::POST('time_insert') ?: date('Y-m-d H:i:s'));
+ $Attribute->set('time_update', HTTP::POST('time_update') ?: date('Y-m-d H:i:s'));
if(HTTP::issetPOST(['token' => Application::getSecurityToken()])) {
try {
diff --git a/admin/user/update.php b/admin/user/update.php
index 3ba6df8..9e6ce01 100644
--- a/admin/user/update.php
+++ b/admin/user/update.php
@@ -18,15 +18,15 @@ try {
$Attribute = $User->getAttribute();
if(HTTP::issetPOST('slug', 'username', 'password', 'fullname', 'mailaddr', 'body', 'argv', 'time_insert', 'time_update', 'update')) {
- $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : makeSlugURL(HTTP::POST('username')));
+ $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('username')));
$Attribute->set('username', HTTP::POST('username') ? HTTP::POST('username') : NULL);
$Attribute->set('password', HTTP::POST('password') ? password_hash(HTTP::POST('password'), PASSWORD_BCRYPT, ['cost' => 10]) : FALSE);
$Attribute->set('fullname', HTTP::POST('fullname') ? HTTP::POST('fullname') : NULL);
$Attribute->set('mailaddr', HTTP::POST('mailaddr') ? HTTP::POST('mailaddr') : NULL);
$Attribute->set('body', HTTP::POST('body') ? HTTP::POST('body') : NULL);
$Attribute->set('argv', HTTP::POST('argv') ? HTTP::POST('argv') : NULL);
- $Attribute->set('time_insert', HTTP::POST('time_insert') ? HTTP::POST('time_insert') : date('Y-m-d H:i:s'));
- $Attribute->set('time_update', HTTP::POST('time_update') ? HTTP::POST('time_update') : date('Y-m-d H:i:s'));
+ $Attribute->set('time_insert', HTTP::POST('time_insert') ?: date('Y-m-d H:i:s'));
+ $Attribute->set('time_update', HTTP::POST('time_update') ?: date('Y-m-d H:i:s'));
if(HTTP::issetPOST(['token' => Application::getSecurityToken()])) {
try {
--
cgit v1.2.3