From 1fd3c5fbc0b76fd6513670445e3358b94231d41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 17 Sep 2012 14:50:17 +0300
Subject: [PATCH 1/4] $l was undefined

---
 settings/ajax/enableapp.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 1075a9a433..c3b3491db9 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -10,5 +10,6 @@ $appid = OC_App::enable($_POST['appid']);
 if($appid !== false) {
 	OC_JSON::success(array('data' => array('appid' => $appid)));
 } else {
+	$l = OC_L10N::get('settings');	
 	OC_JSON::error(array("data" => array( "message" => $l->t("Could not enable app. ") )));
 }

From f85b709fae1869f684a4c91067b6a38b4e629163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 17 Sep 2012 15:00:22 +0300
Subject: [PATCH 2/4] Use correct translation file

every translation within the sub folder 'settings' need to use 'settings' on OC_L10N::get
---
 settings/ajax/apps/ocs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 71cb046fc8..b47a67c13b 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -11,7 +11,7 @@ require_once '../../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 
-$l = OC_L10N::get('core');
+$l = OC_L10N::get('settings');
 
 if(OC_Config::getValue('appstoreenabled', true)==false) {
 	OCP\JSON::success(array('type' => 'external', 'data' => array()));

From 9da150cd3b12208a0e6b26acd4156215a7df5f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 17 Sep 2012 16:32:24 +0200
Subject: [PATCH 3/4] use user name as db name for oracle connection made with
 service name

---
 lib/db.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/db.php b/lib/db.php
index 4d8e5a1a86..9c10512350 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -232,6 +232,7 @@ class OC_DB {
 						$dsn['database'] = $name;
 					} else { // use dbname for hostspec
 						$dsn['hostspec'] = $name;
+						$dsn['database'] = $user;
 					}
 					break;
 			}

From c790a0c476a763383c49f43ceb1a366efe5d6a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 17 Sep 2012 16:35:31 +0200
Subject: [PATCH 4/4] fix default values: 1. remove whitespace, don't use
 emptystring for int, remove empty default for nullable columns to use NULL as
 default

---
 db_structure.xml | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 2256dff943..d04c838d7c 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -76,8 +76,7 @@
    <field>
 	   <name>parent</name>
 	   <type>integer</type>
-	   <default>
-	   </default>
+	   <default>0</default>
 	   <notnull>true</notnull>
 	   <length>8</length>
    </field>
@@ -85,8 +84,7 @@
    <field>
 	   <name>name</name>
 	   <type>text</type>
-	   <default>
-	   </default>
+	   <default></default>
 	   <notnull>true</notnull>
 	   <length>300</length>
    </field>
@@ -94,8 +92,7 @@
    <field>
 	   <name>user</name>
 	   <type>text</type>
-	   <default>
-	   </default>
+	   <default></default>
 	   <notnull>true</notnull>
 	   <length>64</length>
    </field>
@@ -103,7 +100,7 @@
    <field>
     <name>size</name>
     <type>integer</type>
-    <default></default>
+    <default>0</default>
     <notnull>true</notnull>
     <length>8</length>
    </field>
@@ -111,8 +108,7 @@
    <field>
 	   <name>ctime</name>
 	   <type>integer</type>
-	   <default>
-	   </default>
+	   <default>0</default>
 	   <notnull>true</notnull>
 	   <length>8</length>
    </field>
@@ -120,8 +116,7 @@
    <field>
 	   <name>mtime</name>
 	   <type>integer</type>
-	   <default>
-	   </default>
+	   <default>0</default>
 	   <notnull>true</notnull>
 	   <length>8</length>
    </field>
@@ -129,8 +124,7 @@
    <field>
 	   <name>mimetype</name>
 	   <type>text</type>
-	   <default>
-	   </default>
+	   <default></default>
 	   <notnull>true</notnull>
 	   <length>96</length>
    </field>
@@ -138,8 +132,7 @@
    <field>
 	   <name>mimepart</name>
 	   <type>text</type>
-	   <default>
-	   </default>
+	   <default></default>
 	   <notnull>true</notnull>
 	   <length>32</length>
    </field>
@@ -322,7 +315,6 @@
    <field>
     <name>timeout</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <unsigned>true</unsigned>
     <length>4</length>
@@ -331,7 +323,6 @@
    <field>
     <name>created</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>8</length>
    </field>
@@ -347,7 +338,6 @@
    <field>
     <name>scope</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>1</length>
    </field>
@@ -355,7 +345,6 @@
    <field>
     <name>depth</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>1</length>
    </field>
@@ -469,7 +458,7 @@
    <field>
     <name>share_type</name>
     <type>integer</type>
-    <default></default>
+    <default>0</default>
     <notnull>true</notnull>
     <length>1</length>
    </field>
@@ -493,7 +482,6 @@
    <field>
     <name>parent</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>4</length>
    </field>
@@ -525,7 +513,6 @@
    <field>
     <name>file_source</name>
     <type>integer</type>
-    <default></default>
     <notnull>false</notnull>
     <length>4</length>
    </field>
@@ -541,7 +528,7 @@
    <field>
     <name>permissions</name>
     <type>integer</type>
-    <default></default>
+    <default>0</default>
     <notnull>true</notnull>
     <length>1</length>
    </field>
@@ -549,7 +536,7 @@
    <field>
     <name>stime</name>
     <type>integer</type>
-    <default></default>
+    <default>0</default>
     <notnull>true</notnull>
     <length>8</length>
    </field>
@@ -565,7 +552,6 @@
    <field>
     <name>expiration</name>
     <type>timestamp</type>
-    <default></default>
     <notnull>false</notnull>
    </field>