Merge pull request #235 from it-novum/development

3.0.8-2 Hotfix
it-novum · Aug 3, 2016 · 28c78dd · 28c78dd
2 parents a0e385a + 06b450a
commit 28c78dd
Show file tree

Hide file tree

Showing 18 changed files with 1,140 additions and 510 deletions.
diff --git a/app/Config/Schema/schema_itcockpit_26.php b/app/Config/Schema/schema_itcockpit_26.php
@@ -602,6 +602,7 @@ public function after($event = array()) {
 		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 10, 'collate' => 'utf8_swedish_ci', 'charset' => 'utf8'),
 		'value' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_swedish_ci', 'charset' => 'utf8'),
 		'description' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_swedish_ci', 'charset' => 'utf8'),
+        'password' => ['type' => 'integer', 'null' => false, 'default' => 0, 'length' => 1],
 		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
 		'modified' => array('type' => 'datetime', 'null' => false, 'default' => null),
 		'indexes' => array(

diff --git a/app/Config/email.php b/app/Config/email.php
@@ -4,8 +4,8 @@ class EmailConfig {
 		"transport" => "Smtp",
 		"host" => "127.0.0.1", 
 		"port" => 25,
-		"username" => "",
-		"password" => "",
+		"username" => null,
+		"password" => null,
 	);
 
 	public $fast = array(