Remove is_empty()
This commit is contained in:
parent
3b6df75195
commit
59ace4fa05
32
action.php
32
action.php
@ -43,13 +43,13 @@ switch ($VARS['action']) {
|
||||
if (!$user->hasPermission("SITEWRITER") && !$user->hasPermission("SITEWRITER_EDIT")) {
|
||||
returnToSender("no_permission");
|
||||
}
|
||||
if (is_empty($VARS['siteid']) || !$database->has("sites", ["siteid" => $VARS['siteid']])) {
|
||||
if (empty($VARS['siteid']) || !$database->has("sites", ["siteid" => $VARS['siteid']])) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
if (is_empty($VARS['title'])) {
|
||||
if (empty($VARS['title'])) {
|
||||
returnToSender("invalid_parameters", $VARS['siteid']);
|
||||
}
|
||||
if (!is_empty($VARS['slug'])) {
|
||||
if (!empty($VARS['slug'])) {
|
||||
$slug = strtolower($VARS['slug']);
|
||||
$slug = preg_replace("/[^[:alnum:][:space:]]/u", '', $slug);
|
||||
$slug = preg_replace("/[[:space:]]/u", '-', $slug);
|
||||
@ -70,7 +70,7 @@ switch ($VARS['action']) {
|
||||
}
|
||||
}
|
||||
$template = "default";
|
||||
if (!is_empty($VARS['template'])) {
|
||||
if (!empty($VARS['template'])) {
|
||||
$template = preg_replace("/[^A-Za-z0-9]/", '', $VARS['template']);
|
||||
}
|
||||
$theme = $database->get("sites", "theme", ["siteid" => $VARS['siteid']]);
|
||||
@ -84,21 +84,21 @@ switch ($VARS['action']) {
|
||||
if (!$user->hasPermission("SITEWRITER")) {
|
||||
returnToSender("no_permission");
|
||||
}
|
||||
if (is_empty($VARS['siteid']) || !$database->has("sites", ["siteid" => $VARS['siteid']])) {
|
||||
if (empty($VARS['siteid']) || !$database->has("sites", ["siteid" => $VARS['siteid']])) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
if (is_empty($VARS['pageid']) || !$database->has("pages", ["AND" => ["pageid" => $VARS['pageid'], "siteid" => $VARS['siteid']]])) {
|
||||
if (empty($VARS['pageid']) || !$database->has("pages", ["AND" => ["pageid" => $VARS['pageid'], "siteid" => $VARS['siteid']]])) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
if (is_empty($VARS['title'])) {
|
||||
if (empty($VARS['title'])) {
|
||||
returnToSender("invalid_parameters", $VARS['siteid']);
|
||||
}
|
||||
if (is_empty($VARS['template'])) {
|
||||
if (empty($VARS['template'])) {
|
||||
returnToSender("invalid_parameters", $VARS['siteid']);
|
||||
}
|
||||
$nav = null;
|
||||
if ($VARS['innavbar'] == 1) {
|
||||
if (is_empty($VARS['navbartitle'])) {
|
||||
if (empty($VARS['navbartitle'])) {
|
||||
returnToSender("invalid_parameters", $VARS['siteid']);
|
||||
}
|
||||
$nav = $VARS['navbartitle'];
|
||||
@ -123,7 +123,7 @@ switch ($VARS['action']) {
|
||||
"pageid" => $VARS['pageid']
|
||||
]
|
||||
]);
|
||||
if (!is_empty($VARS['navorder']) && preg_match("/^[0-9]+([0-9|]*([0-9])|[0-9])$/", $VARS['navorder'])) {
|
||||
if (!empty($VARS['navorder']) && preg_match("/^[0-9]+([0-9|]*([0-9])|[0-9])$/", $VARS['navorder'])) {
|
||||
$pages = explode("|", preg_replace("/[|]{2,}/", "", $VARS['navorder']));
|
||||
for ($i = 0; $i < count($pages); $i++) {
|
||||
$database->update("pages", [
|
||||
@ -142,21 +142,21 @@ switch ($VARS['action']) {
|
||||
if (!$user->hasPermission("SITEWRITER")) {
|
||||
returnToSender("no_permission");
|
||||
}
|
||||
if (!is_empty($VARS['siteid'])) {
|
||||
if (!empty($VARS['siteid'])) {
|
||||
if (!$database->has("sites", ["siteid" => $VARS['siteid']])) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
}
|
||||
if (is_empty($VARS['name'])) {
|
||||
if (empty($VARS['name'])) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
if (is_empty($VARS['url'])) {
|
||||
if (empty($VARS['url'])) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
if (is_empty($VARS['theme'])) {
|
||||
if (empty($VARS['theme'])) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
if (is_empty($VARS['color'])) {
|
||||
if (empty($VARS['color'])) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
$url = formatsiteurl($VARS['url']);
|
||||
@ -168,7 +168,7 @@ switch ($VARS['action']) {
|
||||
if ($color != "default" && !file_exists(__DIR__ . "/public/themes/$theme/colors/$color")) {
|
||||
returnToSender("invalid_parameters");
|
||||
}
|
||||
if (is_empty($VARS['siteid'])) {
|
||||
if (empty($VARS['siteid'])) {
|
||||
$database->insert('sites', ["sitename" => $VARS['name'], "url" => $url, "theme" => $theme, "color" => $color]);
|
||||
$siteid = $database->id();
|
||||
$template = (file_exists(__DIR__ . "/public/themes/$theme/home.php") ? "home" : "default");
|
||||
|
@ -18,18 +18,18 @@ if (!$user->hasPermission("SITEWRITER") && !$user->hasPermission("SITEWRITER_ANA
|
||||
|
||||
$select_filter = [];
|
||||
|
||||
if (isset($VARS['siteid']) && !is_empty($VARS['siteid'])) {
|
||||
if (!empty($VARS['siteid'])) {
|
||||
if ($database->has('sites', ['siteid' => $VARS['siteid']])) {
|
||||
$select_filter["analytics.siteid"] = $VARS['siteid'];
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($VARS['after']) && !is_empty($VARS['after'])) {
|
||||
if (!empty($VARS['after'])) {
|
||||
if (strtotime($VARS['after']) !== FALSE) {
|
||||
$select_filter["time[>]"] = date("Y-m-d H:i:s", strtotime($VARS['after']));
|
||||
}
|
||||
}
|
||||
if (isset($VARS['before']) && !is_empty($VARS['before'])) {
|
||||
if (!empty($VARS['before'])) {
|
||||
if (strtotime($VARS['before']) !== FALSE) {
|
||||
$select_filter["time[<]"] = date("Y-m-d H:i:s", strtotime($VARS['before']));
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ if (!$user->hasPermission("SITEWRITER") && !$user->hasPermission("SITEWRITER_EDI
|
||||
die();
|
||||
}
|
||||
|
||||
if (isset($VARS['arg']) && !is_empty($VARS['arg'])) {
|
||||
if (!empty($VARS['arg'])) {
|
||||
// Allow action.php to do a better redirect
|
||||
$VARS['siteid'] = $VARS['arg'];
|
||||
if (strpos($VARS['arg'], "|") !== FALSE) {
|
||||
@ -28,7 +28,7 @@ if (isset($VARS['arg']) && !is_empty($VARS['arg'])) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_empty($VARS['siteid'])) {
|
||||
if (!empty($VARS['siteid'])) {
|
||||
if ($database->has('sites', ['siteid' => $VARS['siteid']])) {
|
||||
$sitedata = $database->get(
|
||||
'sites', [
|
||||
@ -138,7 +138,7 @@ if (!is_empty($VARS['siteid'])) {
|
||||
<div class="form-group">
|
||||
<label><i class="fas fa-bars"></i> <?php $Strings->get("navbar options"); ?></label>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="checkbox" name="innavbar" id="innavbarCheckbox" value="1" <?php echo (is_empty($thispage['nav']) ? "" : "checked") ?> />
|
||||
<input class="form-check-input" type="checkbox" name="innavbar" id="innavbarCheckbox" value="1" <?php echo (empty($thispage['nav']) ? "" : "checked") ?> />
|
||||
<label class="form-check-label" for="innavbarCheckbox">
|
||||
<?php $Strings->get("in navbar"); ?>
|
||||
</label>
|
||||
@ -152,14 +152,14 @@ if (!is_empty($VARS['siteid'])) {
|
||||
<div class="input-group-prepend">
|
||||
<label class="input-group-text" for="navbarTitle"><?php $Strings->get("navbar title"); ?></label>
|
||||
</div>
|
||||
<input type="text" id="navbarTitle" name="navbartitle" class="form-control" required="required" minlength="1" maxlength="200" value="<?php echo (is_empty($thispage['nav']) ? $thispage['title'] : $thispage['nav']); ?>" />
|
||||
<input type="text" id="navbarTitle" name="navbartitle" class="form-control" required="required" minlength="1" maxlength="200" value="<?php echo (empty($thispage['nav']) ? $thispage['title'] : $thispage['nav']); ?>" />
|
||||
</div>
|
||||
|
||||
<label class="mb-0 pb-0"><?php $Strings->get("navbar position"); ?></label>
|
||||
<div class="list-group py-3" id="navbar-order-list">
|
||||
<?php
|
||||
foreach ($pagedata as $page) {
|
||||
if (is_empty($page['nav'])) {
|
||||
if (empty($page['nav'])) {
|
||||
continue;
|
||||
}
|
||||
?>
|
||||
|
@ -28,7 +28,7 @@ $sitedata = [
|
||||
];
|
||||
$settings = [];
|
||||
|
||||
if (isset($VARS['siteid']) && !is_empty($VARS['siteid'])) {
|
||||
if (!empty($VARS['siteid'])) {
|
||||
if ($database->has('sites', ['siteid' => $VARS['siteid']])) {
|
||||
$siteid = $VARS['siteid'];
|
||||
$sitedata = $database->select(
|
||||
|
Loading…
x
Reference in New Issue
Block a user