Commit 581bc6a2 authored by Kjartan's avatar Kjartan

- more coding style fixes.

parent b81d3d93
......@@ -513,7 +513,7 @@ function format_interval($timestamp) {
function format_date($timestamp, $type = "medium", $format = "") {
global $user;
// $timestamp += ($user->timezone) ? $user->timezone - date("Z") : 0;
$timestamp += ($user->timezone) ? $user->timezone - date("Z") : 0;
switch ($type) {
case "small":
......
......@@ -47,11 +47,11 @@ function cloud_update($site) {
** Check whether the site is properly configured:
*/
if (!ereg("^http://|https://|ftp://", $site[link])) {
if (!ereg("^http://|https://|ftp://", $site["link"])) {
watchdog("warning", "cloud: invalid or missing URL for '". $site["name"] ."'");
}
if (!ereg("^http://|https://|ftp://", $site[feed])) {
if (!ereg("^http://|https://|ftp://", $site["feed"])) {
watchdog("warning", "cloud: invalid or missing URL to monitor for '". $site["name"] ."'");
}
......
......@@ -570,19 +570,23 @@ function taxonomy_admin() {
switch ($op) {
case "add":
if ($type == "vocabulary")
if ($type == "vocabulary") {
print taxonomy_form_vocabulary();
else
}
else {
print taxonomy_form_term();
}
break;
case "edit":
if ($type == "vocabulary")
if ($type == "vocabulary") {
print taxonomy_form_vocabulary(object2array(taxonomy_get_vocabulary($id)));
else
}
else {
print taxonomy_form_term(object2array(taxonomy_get_term($id)));
}
break;
case "preview":
print taxonomy_form($id);
print taxonomy_form($id);
break;
case "help":
print taxonomy_help();
......@@ -591,10 +595,12 @@ function taxonomy_admin() {
$edit["name"] = 0;
// fall through:
case "Submit":
if ($type == "vocabulary")
if ($type == "vocabulary") {
print status(taxonomy_save_vocabulary($edit));
else
}
else {
print status(taxonomy_save_term($edit));
}
// fall through:
default:
print taxonomy_overview();
......
......@@ -570,19 +570,23 @@ function taxonomy_admin() {
switch ($op) {
case "add":
if ($type == "vocabulary")
if ($type == "vocabulary") {
print taxonomy_form_vocabulary();
else
}
else {
print taxonomy_form_term();
}
break;
case "edit":
if ($type == "vocabulary")
if ($type == "vocabulary") {
print taxonomy_form_vocabulary(object2array(taxonomy_get_vocabulary($id)));
else
}
else {
print taxonomy_form_term(object2array(taxonomy_get_term($id)));
}
break;
case "preview":
print taxonomy_form($id);
print taxonomy_form($id);
break;
case "help":
print taxonomy_help();
......@@ -591,10 +595,12 @@ function taxonomy_admin() {
$edit["name"] = 0;
// fall through:
case "Submit":
if ($type == "vocabulary")
if ($type == "vocabulary") {
print status(taxonomy_save_vocabulary($edit));
else
}
else {
print status(taxonomy_save_term($edit));
}
// fall through:
default:
print taxonomy_overview();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment