diff options
Diffstat (limited to 'inc/configmodule')
| -rw-r--r-- | inc/configmodule/adauth.inc.php | 1 | ||||
| -rw-r--r-- | inc/configmodule/branding.inc.php | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/inc/configmodule/adauth.inc.php b/inc/configmodule/adauth.inc.php index 06ac5460..828469c3 100644 --- a/inc/configmodule/adauth.inc.php +++ b/inc/configmodule/adauth.inc.php @@ -54,6 +54,7 @@ class ConfigModule_AdAuth extends ConfigModule */ public function event_serverIpChanged() { + error_log('Calling generate on ' . $this->title()); $this->generate(false); } diff --git a/inc/configmodule/branding.inc.php b/inc/configmodule/branding.inc.php index e8bd1da7..6e452a93 100644 --- a/inc/configmodule/branding.inc.php +++ b/inc/configmodule/branding.inc.php @@ -19,9 +19,7 @@ class ConfigModule_Branding extends ConfigModule protected function generateInternal($tgz, $parent) { if (!$this->validateConfig()) { - if ($this->archive() !== false && file_exists($this->archive())) - return true; // No new temp file given, old archive still exists, pretend it worked... - return false; + return $this->archive() !== false && file_exists($this->archive()); // No new temp file given, old archive still exists, pretend it worked... } $task = Taskmanager::submit('MoveFile', array( 'source' => $this->tmpFile, @@ -44,7 +42,7 @@ class ConfigModule_Branding extends ConfigModule public function setData($key, $value) { - if ($key !== 'tmpFile' || !file_exists($value)) + if ($key !== 'tmpFile' || !is_string($value) || !file_exists($value)) return false; $this->tmpFile = $value; } |