get rid of the oc_require and friends

9 files changed, 76 insertions, 40 deletions

diff --git a/plugins/ldap/lib_ldap.php b/plugins/ldap/lib_ldap.php
index 383e7f7ab0a..d2095a022ff 100644
--- a/plugins/ldap/lib_ldap.php
+++ b/plugins/ldap/lib_ldap.php
@@ -21,7 +21,7 @@
 * 
 */
 
-oc_require_once('inc/User/backend.php');
+require_once('inc/User/backend.php');
 
 
 
diff --git a/plugins/textviewer/syntaxhighlighter/compass/shThemeDefault.scss b/plugins/textviewer/syntaxhighlighter/compass/shThemeDefault.scss
index 1574dae8053..6ff829ef321 100644
--- a/plugins/textviewer/syntaxhighlighter/compass/shThemeDefault.scss
+++ b/plugins/textviewer/syntaxhighlighter/compass/shThemeDefault.scss
@@ -3,5 +3,7 @@
 @import "_theme_template.scss";
 
 .syntaxhighlighter {
-	.keyword { font-weight: bold !important; }
+.keyword { font-weight:
+        bold !important;
+    }
 }
diff --git a/plugins/textviewer/syntaxhighlighter/compass/shThemeDjango.scss b/plugins/textviewer/syntaxhighlighter/compass/shThemeDjango.scss
index 8e95c567aeb..45e3f0917c3 100644
--- a/plugins/textviewer/syntaxhighlighter/compass/shThemeDjango.scss
+++ b/plugins/textviewer/syntaxhighlighter/compass/shThemeDjango.scss
@@ -3,7 +3,8 @@
 $background:					#0a2b1d !default;
 
 $line_highlighted_background:	#233729 !default;
-$line_highlighted_number:		white !default;
+$line_highlighted_number:
+white !default;
 
 $gutter_text:					#497958 !default;
 $gutter_border_color:			#41a83e !default;
@@ -31,6 +32,10 @@ $code_color3:					#edef7d !default;
 @import "_theme_template.scss";
 
 .syntaxhighlighter {
-	.comments { font-style: italic !important; }
-	.keyword { font-weight: bold !important; } 
+.comments { font-style:
+        italic !important;
+    }
+.keyword { font-weight:
+               bold !important;
+             }
 }
diff --git a/plugins/textviewer/syntaxhighlighter/compass/shThemeEclipse.scss b/plugins/textviewer/syntaxhighlighter/compass/shThemeEclipse.scss
index 193fb1d877a..33cf5a3cac1 100644
--- a/plugins/textviewer/syntaxhighlighter/compass/shThemeEclipse.scss
+++ b/plugins/textviewer/syntaxhighlighter/compass/shThemeEclipse.scss
@@ -15,9 +15,11 @@ $toolbar_collapsed_a_hover:		#aa7700 !default;
 $toolbar_collapsed_background:	#fff !default;
 
 $toolbar_a:						#a0a0a0 !default;
-$toolbar_a_hover:				red !default;
+$toolbar_a_hover:
+red !default;
 
-$code_plain:					black !default;
+$code_plain:
+black !default;
 $code_comments:					#3f5fbf !default;
 $code_string:					#2a00ff !default;
 $code_keyword:					#7f0055 !default;
@@ -26,23 +28,30 @@ $code_variable:					#aa7700 !default;
 $code_value:					#009900 !default;
 $code_functions:				#ff1493 !default;
 $code_constants:				#0066cc !default;
-$code_color1:					gray !default;
+$code_color1:
+gray !default;
 $code_color2:					#ff1493 !default;
-$code_color3:					red !default;
+$code_color3:
+red !default;
 
 @import "_theme_template.scss";
 
 .syntaxhighlighter {
-	.keyword { font-weight: bold !important; }
-	
-	.xml {
-		.keyword {
-			color: #3f7f7f !important;
-			font-weight: normal !important; }
-		.color1, .color1 a { color: #7f007f !important; }
-		.string {
-			font-style: italic !important;
-			color: #2a00ff !important; 
-		} 
-	} 
+.keyword { font-weight:
+        bold !important;
+    }
+
+    .xml {
+        .keyword {
+color: #3f7f7f !important;
+font-weight:
+            normal !important;
+        }
+.color1, .color1 a { color: #7f007f !important; }
+        .string {
+font-style:
+            italic !important;
+color: #2a00ff !important;
+        }
+    }
 }
diff --git a/plugins/textviewer/syntaxhighlighter/compass/shThemeEmacs.scss b/plugins/textviewer/syntaxhighlighter/compass/shThemeEmacs.scss
index 11c9deb4d08..2589374f5be 100644
--- a/plugins/textviewer/syntaxhighlighter/compass/shThemeEmacs.scss
+++ b/plugins/textviewer/syntaxhighlighter/compass/shThemeEmacs.scss
@@ -1,17 +1,20 @@
 // Emacs SyntaxHighlighter theme based on theme by Joshua Emmons
 // http://www.skia.net/
 
-$background:					black !default;
+$background:
+black !default;
 
 $line_highlighted_background:	#2A3133 !default;
-$line_highlighted_number:		white !default;
+$line_highlighted_number:
+white !default;
 
 $gutter_text:					#d3d3d3 !default;
 $gutter_border_color:			#990000 !default;
 
 $toolbar_collapsed_a:			#ebdb8d !default;
 $toolbar_collapsed_a_hover:		#ff7d27 !default;
-$toolbar_collapsed_background:	black !default;
+$toolbar_collapsed_background:
+black !default;
 
 $toolbar_a:						#fff !default;
 $toolbar_a_hover:				#9ccff4 !default;
@@ -19,7 +22,8 @@ $toolbar_a_hover:				#9ccff4 !default;
 $code_plain:					#d3d3d3 !default;
 $code_comments:					#ff7d27 !default;
 $code_string:					#ff9e7b !default;
-$code_keyword:					aqua !default;
+$code_keyword:
+aqua !default;
 $code_preprocessor:				#aec4de !default;
 $code_variable:					#ffaa3e !default;
 $code_value:					#009900 !default;
diff --git a/plugins/textviewer/syntaxhighlighter/compass/shThemeFadeToGrey.scss b/plugins/textviewer/syntaxhighlighter/compass/shThemeFadeToGrey.scss
index 7963814952f..3ec13b18277 100644
--- a/plugins/textviewer/syntaxhighlighter/compass/shThemeFadeToGrey.scss
+++ b/plugins/textviewer/syntaxhighlighter/compass/shThemeFadeToGrey.scss
@@ -4,19 +4,22 @@
 $background:					#121212 !default;
 
 $line_highlighted_background:	#2C2C29 !default;
-$line_highlighted_number:		white !default;
+$line_highlighted_number:
+white !default;
 
 $gutter_text:					#afafaf !default;
 $gutter_border_color:			#3185b9 !default;
 
 $toolbar_collapsed_a:			#3185b9 !default;
 $toolbar_collapsed_a_hover:		#d01d33 !default;
-$toolbar_collapsed_background:	black !default;
+$toolbar_collapsed_background:
+black !default;
 
 $toolbar_a:						#fff !default;
 $toolbar_a_hover:				#96daff !default;
 
-$code_plain:					white !default;
+$code_plain:
+white !default;
 $code_comments:					#696854 !default;
 $code_string:					#e3e658 !default;
 $code_keyword:					#d01d33 !default;
@@ -32,5 +35,7 @@ $code_color3:					#96daff !default;
 @import "_theme_template.scss";
 
 .syntaxhighlighter {
-  .functions { font-weight: bold !important; }
+.functions { font-weight:
+        bold !important;
+    }
 }
diff --git a/plugins/textviewer/syntaxhighlighter/compass/shThemeMDUltra.scss b/plugins/textviewer/syntaxhighlighter/compass/shThemeMDUltra.scss
index 0356fa6c934..c09517bdc86 100644
--- a/plugins/textviewer/syntaxhighlighter/compass/shThemeMDUltra.scss
+++ b/plugins/textviewer/syntaxhighlighter/compass/shThemeMDUltra.scss
@@ -4,29 +4,38 @@
 $background:					#222222 !default;
 
 $line_highlighted_background:	#253e5a !default;
-$line_highlighted_number:		white !default;
+$line_highlighted_number:
+white !default;
 
 $gutter_text:					#38566f !default;
 $gutter_border_color:			#435a5f !default;
 
 $toolbar_collapsed_a:			#428bdd !default;
-$toolbar_collapsed_a_hover:		lime !default;
-$toolbar_collapsed_background:	black !default;
+$toolbar_collapsed_a_hover:
+lime !default;
+$toolbar_collapsed_background:
+black !default;
 
 $toolbar_a:						#aaaaff !default;
 $toolbar_a_hover:				#9ccff4 !default;
 
-$code_plain:					lime !default;
+$code_plain:
+lime !default;
 $code_comments:					#428bdd !default;
-$code_string:					lime !default;
+$code_string:
+lime !default;
 $code_keyword:					#aaaaff !default;
 $code_preprocessor:				#8aa6c1 !default;
-$code_variable:					aqua !default;
+$code_variable:
+aqua !default;
 $code_value:					#f7e741 !default;
 $code_functions:				#ff8000 !default;
-$code_constants:				yellow !default;
-$code_color1:					red !default;
-$code_color2:					yellow !default;
+$code_constants:
+yellow !default;
+$code_color1:
+red !default;
+$code_color2:
+yellow !default;
 $code_color3:					#ffaa3e !default;
 
 @import "_theme_template.scss";
diff --git a/plugins/textviewer/syntaxhighlighter/compass/shThemeMidnight.scss b/plugins/textviewer/syntaxhighlighter/compass/shThemeMidnight.scss
index a4dae02305f..55a630bb331 100644
--- a/plugins/textviewer/syntaxhighlighter/compass/shThemeMidnight.scss
+++ b/plugins/textviewer/syntaxhighlighter/compass/shThemeMidnight.scss
@@ -26,7 +26,8 @@ $code_value:					#f7e741 !default;
 $code_functions:				#ffaa3e !default;
 $code_constants:				#e0e8ff !default;
 $code_color1:					#f8bb00 !default;
-$code_color2:					white !default;
+$code_color2:
+white !default;
 $code_color3:					#ffaa3e !default;
 
 @import "_theme_template.scss";
diff --git a/plugins/textviewer/syntaxhighlighter/compass/shThemeRDark.scss b/plugins/textviewer/syntaxhighlighter/compass/shThemeRDark.scss
index 3b67b153721..f37acb25c42 100644
--- a/plugins/textviewer/syntaxhighlighter/compass/shThemeRDark.scss
+++ b/plugins/textviewer/syntaxhighlighter/compass/shThemeRDark.scss
@@ -26,7 +26,8 @@ $code_value:					#009900 !default;
 $code_functions:				#ffaa3e !default;
 $code_constants:				#e0e8ff !default;
 $code_color1:					#e0e8ff !default;
-$code_color2:					white !default;
+$code_color2:
+white !default;
 $code_color3:					#ffaa3e !default;
 
 @import "_theme_template.scss";