mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get rid of the oc_require and friends

This commit is contained in:
Robin Appelman 2011-04-16 10:12:53 +02:00
parent 3d89b2caa4
commit 232654cb60
51 changed files with 149 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3dparty/Console/Getopt.php
View File

@ -18,7 +18,7 @@
//
// $Id: Getopt.php,v 1.21.4.7 2003/12/05 21:57:01 andrei Exp $
oc_require_once( 'PEAR.php');
require_once( 'PEAR.php');
/**
* Command-line options parsing class.

6
3dparty/HTTP/WebDAV/Server.php
View File

@ -33,9 +33,9 @@
+----------------------------------------------------------------------+
*/
oc_require_once("HTTP/WebDAV/Tools/_parse_propfind.php");
oc_require_once("HTTP/WebDAV/Tools/_parse_proppatch.php");
oc_require_once("HTTP/WebDAV/Tools/_parse_lockinfo.php");
require_once("HTTP/WebDAV/Tools/_parse_propfind.php");
require_once("HTTP/WebDAV/Tools/_parse_proppatch.php");
require_once("HTTP/WebDAV/Tools/_parse_lockinfo.php");
/**

6
3dparty/MDB2.php
View File

@ -52,7 +52,7 @@
* @author Lukas Smith <smith@pooteeweet.org>
*/
oc_require_once('PEAR.php');
require_once('PEAR.php');
// {{{ Error constants
@ -330,9 +330,9 @@ class MDB2
if (!MDB2::classExists($class_name)) {
$file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
if ($debug) {
$include = oc_include_once($file_name);
$include = include_once($file_name);
} else {
$include = oc_include_once($file_name);
$include = include_once($file_name);
}
if (!$include) {
if (!MDB2::fileExists($file_name)) {

2
3dparty/MDB2/Driver/Datatype/Common.php
View File

@ -44,7 +44,7 @@
//
// $Id: Common.php,v 1.139 2008/12/04 11:50:42 afz Exp $
oc_require_once('MDB2/LOB.php');
require_once('MDB2/LOB.php');
/**
* @package MDB2

2
3dparty/MDB2/Driver/Datatype/mysql.php
View File

@ -46,7 +46,7 @@
// $Id: mysql.php,v 1.65 2008/02/22 19:23:49 quipo Exp $
//
oc_require_once('MDB2/Driver/Datatype/Common.php');
require_once('MDB2/Driver/Datatype/Common.php');
/**
* MDB2 MySQL driver

2
3dparty/MDB2/Driver/Datatype/pgsql.php
View File

@ -44,7 +44,7 @@
//
// $Id: pgsql.php,v 1.93 2008/08/28 20:32:57 afz Exp $
oc_require_once('MDB2/Driver/Datatype/Common.php');
require_once('MDB2/Driver/Datatype/Common.php');
/**
* MDB2 PostGreSQL driver

2
3dparty/MDB2/Driver/Datatype/sqlite.php
View File

@ -46,7 +46,7 @@
// $Id: sqlite.php,v 1.67 2008/02/22 19:58:06 quipo Exp $
//
oc_require_once('MDB2/Driver/Datatype/Common.php');
require_once('MDB2/Driver/Datatype/Common.php');
/**
* MDB2 SQLite driver

2
3dparty/MDB2/Driver/Function/mysql.php
View File

@ -45,7 +45,7 @@
// $Id: mysql.php,v 1.12 2008/02/17 18:54:08 quipo Exp $
//
oc_require_once('MDB2/Driver/Function/Common.php');
require_once('MDB2/Driver/Function/Common.php');
/**
* MDB2 MySQL driver for the function modules

2
3dparty/MDB2/Driver/Function/pgsql.php
View File

@ -44,7 +44,7 @@
//
// $Id: pgsql.php,v 1.11 2008/11/09 19:46:50 quipo Exp $
oc_require_once('MDB2/Driver/Function/Common.php');
require_once('MDB2/Driver/Function/Common.php');
/**
* MDB2 MySQL driver for the function modules

2
3dparty/MDB2/Driver/Function/sqlite.php
View File

@ -45,7 +45,7 @@
// $Id: sqlite.php,v 1.10 2008/02/17 18:54:08 quipo Exp $
//
oc_require_once('MDB2/Driver/Function/Common.php');
require_once('MDB2/Driver/Function/Common.php');
/**
* MDB2 SQLite driver for the function modules

2
3dparty/MDB2/Driver/Manager/mysql.php
View File

@ -45,7 +45,7 @@
// $Id: mysql.php,v 1.113 2008/11/23 20:30:29 quipo Exp $
//
oc_require_once('MDB2/Driver/Manager/Common.php');
require_once('MDB2/Driver/Manager/Common.php');
/**
* MDB2 MySQL driver for the management modules

2
3dparty/MDB2/Driver/Manager/pgsql.php
View File

@ -44,7 +44,7 @@
//
// $Id: pgsql.php,v 1.87 2008/11/29 14:09:59 afz Exp $
oc_require_once('MDB2/Driver/Manager/Common.php');
require_once('MDB2/Driver/Manager/Common.php');
/**
* MDB2 MySQL driver for the management modules

2
3dparty/MDB2/Driver/Manager/sqlite.php
View File

@ -46,7 +46,7 @@
// $Id: sqlite.php,v 1.76 2008/05/31 11:48:48 quipo Exp $
//
oc_require_once('MDB2/Driver/Manager/Common.php');
require_once('MDB2/Driver/Manager/Common.php');
/**
* MDB2 SQLite driver for the management modules

2
3dparty/MDB2/Driver/Reverse/mysql.php
View File

@ -45,7 +45,7 @@
// $Id: mysql.php,v 1.80 2008/03/26 21:15:37 quipo Exp $
//
oc_require_once('MDB2/Driver/Reverse/Common.php');
require_once('MDB2/Driver/Reverse/Common.php');
/**
* MDB2 MySQL driver for the schema reverse engineering module

2
3dparty/MDB2/Driver/Reverse/pgsql.php
View File

@ -45,7 +45,7 @@
//
// $Id: pgsql.php,v 1.75 2008/08/22 16:36:20 quipo Exp $
oc_require_once('MDB2/Driver/Reverse/Common.php');
require_once('MDB2/Driver/Reverse/Common.php');
/**
* MDB2 PostGreSQL driver for the schema reverse engineering module

2
3dparty/MDB2/Driver/Reverse/sqlite.php
View File

@ -46,7 +46,7 @@
// $Id: sqlite.php,v 1.80 2008/05/03 10:30:14 quipo Exp $
//
oc_require_once('MDB2/Driver/Reverse/Common.php');
require_once('MDB2/Driver/Reverse/Common.php');
/**
* MDB2 SQlite driver for the schema reverse engineering module

2
3dparty/MDB2/LOB.php
View File

@ -50,7 +50,7 @@
* @author Lukas Smith <smith@pooteeweet.org>
*/
oc_require_once('MDB2.php');
require_once('MDB2.php');
/**
* MDB2_LOB: user land stream wrapper implementation for LOB support

4
3dparty/MDB2/Schema/Parser.php
View File

@ -54,8 +54,8 @@
*/
oc_require_once('XML/Parser.php');
oc_require_once('MDB2/Schema/Validate.php');
require_once('XML/Parser.php');
require_once('MDB2/Schema/Validate.php');
/**
* Parses an XML schema file

4
3dparty/System.php
View File

@ -19,8 +19,8 @@
// $Id: System.php,v 1.36 2004/06/15 16:33:46 pajoye Exp $
//
oc_require_once( 'PEAR.php');
oc_require_once( 'Console/Getopt.php');
require_once( 'PEAR.php');
require_once( 'Console/Getopt.php');
$GLOBALS['_System_temp_files'] = array();

2
3dparty/XML/Parser.php
View File

@ -36,7 +36,7 @@
/**
* uses PEAR's error handling
*/
oc_require_once('PEAR.php');
require_once('PEAR.php');
/**
* resource could not be created

2
admin/index.php
View File

@ -22,7 +22,7 @@
*/
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
header( "Location: ".OC_HELPER::linkTo( "index.php" ));
exit();

2
admin/plugins.php
View File

@ -22,7 +22,7 @@
*/
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
header( "Location: ".OC_HELPER::linkTo( "index.php" ));
exit();

2
admin/system.php
View File

@ -22,7 +22,7 @@
*/
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
header( "Location: ".OC_HELPER::linkTo( "index.php" ));
exit();

2
admin/users.php
View File

@ -22,7 +22,7 @@
*/
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
header( "Location: ".OC_HELPER::linkTo( "index.php" ));
exit();

2
files/admin.php
View File

@ -24,7 +24,7 @@
// Init owncloud
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
// Check if we are a user
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){

2
files/download.php
View File

@ -23,7 +23,7 @@
// Init owncloud
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
// Check if we are a user
if( !OC_USER::isLoggedIn()){

2
files/index.php
View File

@ -24,7 +24,7 @@
// Init owncloud
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
// Check if we are a user
if( !OC_USER::isLoggedIn()){

2
files/settings.php
View File

@ -24,7 +24,7 @@
// Init owncloud
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
// Check if we are a user
if( !OC_USER::isLoggedIn()){

2
files/webdav.php
View File

@ -23,7 +23,7 @@
require_once('../lib/base.php');
oc_require_once('HTTP/WebDAV/Server/Filesystem.php');
require_once('HTTP/WebDAV/Server/Filesystem.php');
ini_set('default_charset', 'UTF-8');

4
index.php
View File

@ -22,8 +22,8 @@
*/
require_once( 'lib/base.php' );
oc_require_once( 'appconfig.php' );
oc_require_once( 'template.php' );
require_once( 'appconfig.php' );
require_once( 'template.php' );
if( OC_USER::isLoggedIn()){
if( $_GET["logout"] ){
OC_USER::logout();

9
lib/Group/database.php
View File

@ -37,7 +37,7 @@
*
*/
oc_require_once( 'Group/backend.php' );
require_once( 'Group/backend.php' );
/**
* Class for group management in a SQL Database (e.g. MySQL, SQLite)
@ -75,7 +75,12 @@ class OC_GROUP_DATABASE extends OC_GROUP_BACKEND {
public static function inGroup( $username, $groupName ){
$query = OC_DB::prepare( "SELECT * FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` = ?" );
$result = $query->execute( array( $groupName, $username ));
if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$result->getDebugInfo().'<br />';
error_log( $entry );
die( $entry );
}
return $result->numRows() > 0 ? true : false;
}

4
lib/HTTP/WebDAV/Server/Filesystem.php
View File

@ -34,8 +34,8 @@
--- modified for ownCloud ---
*/
require_once("lib/base.php");
oc_require_once("HTTP/WebDAV/Server.php");
oc_require_once("System.php");
require_once("HTTP/WebDAV/Server.php");
require_once("System.php");
/**
* Filesystem access using WebDAV

2
lib/User/database.php
View File

@ -33,7 +33,7 @@
*
*/
oc_require_once('User/backend.php');
require_once('User/backend.php');
/**
* Class for user management in a SQL Database (e.g. MySQL, SQLite)

2
lib/app.php
View File

@ -54,7 +54,7 @@ class OC_APP{
while( false !== ( $filename = readdir( $dir ))){
if( substr( $filename, 0, 1 ) != '.' ){
if( file_exists( "$SERVERROOT/$filename/appinfo/app.php" )){
oc_require( "$filename/appinfo/app.php" );
require( "$filename/appinfo/app.php" );
}
}
}

154
lib/base.php
View File

@ -45,7 +45,7 @@ if($WEBROOT!='' and $WEBROOT[0]!=='/'){
}
// set the right include path
// set_include_path(get_include_path().PATH_SEPARATOR.$SERVERROOT.PATH_SEPARATOR.$SERVERROOT.'/inc'.PATH_SEPARATOR.$SERVERROOT.'/config');
set_include_path($SERVERROOT.'/lib'.PATH_SEPARATOR.$SERVERROOT.'/config'.PATH_SEPARATOR.$SERVERROOT.'/3dparty'.PATH_SEPARATOR.get_include_path().PATH_SEPARATOR.$SERVERROOT);
// define runtime variables - unless this already has been done
if( !isset( $RUNTIME_NOSETUPFS )){
@ -66,7 +66,6 @@ $CONFIG_FILESYSTEM=array();
// include the generated configfile
@include_once($SERVERROOT.'/config/config.php');
$CONFIG_DATADIRECTORY_ROOT=$CONFIG_DATADIRECTORY;// store this in a seperate variable so we can change the data directory to jail users.
// redirect to https site if configured
if(isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL){
@ -78,20 +77,20 @@ if(isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL){
}
// load core libs
oc_require_once('helper.php');
oc_require_once('app.php');
oc_require_once('files.php');
oc_require_once('filesystem.php');
oc_require_once('filestorage.php');
oc_require_once('fileobserver.php');
oc_require_once('log.php');
oc_require_once('config.php');
oc_require_once('user.php');
oc_require_once('group.php');
oc_require_once('ocs.php');
oc_require_once('connect.php');
oc_require_once('remotestorage.php');
oc_require_once('plugin.php');
require_once('helper.php');
require_once('app.php');
require_once('files.php');
require_once('filesystem.php');
require_once('filestorage.php');
require_once('fileobserver.php');
require_once('log.php');
require_once('config.php');
require_once('user.php');
require_once('group.php');
require_once('ocs.php');
require_once('connect.php');
require_once('remotestorage.php');
require_once('plugin.php');
OC_PLUGIN::loadPlugins( "" );
@ -113,13 +112,11 @@ OC_UTIL::addScript( "jquery-ui-1.8.10.custom.min" );
OC_UTIL::addScript( "js" );
OC_UTIL::addStyle( "jquery-ui-1.8.10.custom" );
OC_UTIL::addStyle( "styles" );
// Load Apps
OC_APP::loadApps();
// check if the server is correctly configured for ownCloud
OC_UTIL::checkserver();
/**
* Class for utility functions
*
@ -380,8 +377,8 @@ class OC_DB {
// do nothing if the connection already has been established
if(!self::$DBConnection){
// Require MDB2.php (TODO: why here not in head of file?)
@oc_require_once('MDB2.php');
// Require MDB2.php (not required in the head of the file so we only load it when needed)
require_once('MDB2.php');
// Prepare options array
$options = array(
@ -610,7 +607,7 @@ class OC_DB {
// Connect if this did not happen before
if(!self::$schema){
@oc_require_once('MDB2/Schema.php');
require_once('MDB2/Schema.php');
self::$schema=&MDB2_Schema::factory(self::$DBConnection);
}
@ -646,120 +643,6 @@ class OC_DB {
}
}
//custom require/include functions because not all hosts allow us to set the include path
function oc_require($file){
global $SERVERROOT;
global $DOCUMENTROOT;
global $WEBROOT;
global $CONFIG_DBNAME;
global $CONFIG_DBHOST;
global $CONFIG_DBUSER;
global $CONFIG_DBPASSWORD;
global $CONFIG_DBTYPE;
global $CONFIG_DATADIRECTORY;
global $CONFIG_HTTPFORCESSL;
global $CONFIG_DATEFORMAT;
global $CONFIG_INSTALLED;
if(is_file($file)){
return require($file);
}
elseif(is_file($SERVERROOT.'/'.$file)){
return require($SERVERROOT.'/'.$file);
}
elseif(is_file($SERVERROOT.'/lib/'.$file)){
return require($SERVERROOT.'/lib/'.$file);
}
elseif(is_file($SERVERROOT.'/3dparty/'.$file)){
return require($SERVERROOT.'/3dparty/'.$file);
}
}
function oc_require_once($file){
global $SERVERROOT;
global $DOCUMENTROOT;
global $WEBROOT;
global $CONFIG_DBNAME;
global $CONFIG_DBHOST;
global $CONFIG_DBUSER;
global $CONFIG_DBPASSWORD;
global $CONFIG_DBTYPE;
global $CONFIG_DATADIRECTORY;
global $CONFIG_HTTPFORCESSL;
global $CONFIG_DATEFORMAT;
global $CONFIG_INSTALLED;
if(is_file($file)){
return require_once($file);
}
elseif(is_file($SERVERROOT.'/'.$file)){
return require_once($SERVERROOT.'/'.$file);
}
elseif(is_file($SERVERROOT.'/lib/'.$file)){
return require_once($SERVERROOT.'/lib/'.$file);
}
elseif(is_file($SERVERROOT.'/3dparty/'.$file)){
return require_once($SERVERROOT.'/3dparty/'.$file);
}
}
function oc_include($file){
global $SERVERROOT;
global $DOCUMENTROOT;
global $WEBROOT;
global $CONFIG_DBNAME;
global $CONFIG_DBHOST;
global $CONFIG_DBUSER;
global $CONFIG_DBPASSWORD;
global $CONFIG_DBTYPE;
global $CONFIG_DATADIRECTORY;
global $CONFIG_HTTPFORCESSL;
global $CONFIG_DATEFORMAT;
global $CONFIG_INSTALLED;
if(is_file($file)){
return include($file);
}
elseif(is_file($SERVERROOT.'/'.$file)){
return include($SERVERROOT.'/'.$file);
}
elseif(is_file($SERVERROOT.'/lib/'.$file)){
return include($SERVERROOT.'/lib/'.$file);
}
elseif(is_file($SERVERROOT.'/3dparty/'.$file)){
return include($SERVERROOT.'/3dparty/'.$file);
}
}
function oc_include_once($file){
global $SERVERROOT;
global $DOCUMENTROOT;
global $WEBROOT;
global $CONFIG_DBNAME;
global $CONFIG_DBHOST;
global $CONFIG_DBUSER;
global $CONFIG_DBPASSWORD;
global $CONFIG_DBTYPE;
global $CONFIG_DATADIRECTORY;
global $CONFIG_HTTPFORCESSL;
global $CONFIG_DATEFORMAT;
global $CONFIG_INSTALLED;
if(is_file($file)){
return include_once($file);
}
elseif(is_file($SERVERROOT.'/'.$file)){
return include_once($SERVERROOT.'/'.$file);
}
elseif(is_file($SERVERROOT.'/lib/'.$file)){
return include_once($SERVERROOT.'/lib/'.$file);
}
elseif(is_file($SERVERROOT.'/3dparty/'.$file)){
return include_once($SERVERROOT.'/3dparty/'.$file);
}
}
function chmodr($path, $filemode) {
// echo "$path<br/>";
if (!is_dir($path))
@ -782,5 +665,4 @@ function chmodr($path, $filemode) {
else
return FALSE;
}
?>

2
lib/files.php
View File

@ -21,7 +21,7 @@
*
*/
oc_require_once("log.php");
require_once("log.php");
/**

2
lib/group.php
View File

@ -68,7 +68,7 @@ class OC_GROUP {
case 'database':
case 'mysql':
case 'sqlite':
oc_require_once('Group/database.php');
require_once('Group/database.php');
self::$_backend = new OC_GROUP_DATABASE();
break;
default:

2
lib/user.php
View File

@ -74,7 +74,7 @@ class OC_USER {
case 'database':
case 'mysql':
case 'sqlite':
oc_require_once('User/database.php');
require_once('User/database.php');
self::$_backend = new OC_USER_DATABASE();
break;
default:

2
log/index.php
View File

@ -24,7 +24,7 @@
//require_once('../../config/config.php');
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
if( !OC_USER::isLoggedIn()){
header( "Location: ".OC_HELPER::linkTo( "index.php" ));
exit();

2
plugins/ldap/lib_ldap.php
View File

@ -21,7 +21,7 @@
*
*/
oc_require_once('inc/User/backend.php');
require_once('inc/User/backend.php');

4
plugins/textviewer/syntaxhighlighter/compass/shThemeDefault.scss
View File

@ -3,5 +3,7 @@
@import "_theme_template.scss";
.syntaxhighlighter {
.keyword { font-weight: bold !important; }
.keyword { font-weight:
bold !important;
}
}

11
plugins/textviewer/syntaxhighlighter/compass/shThemeDjango.scss
View File

@ -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;
}
}

41
plugins/textviewer/syntaxhighlighter/compass/shThemeEclipse.scss
View File

@ -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;
}
}
}

12
plugins/textviewer/syntaxhighlighter/compass/shThemeEmacs.scss
View File

@ -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;

13
plugins/textviewer/syntaxhighlighter/compass/shThemeFadeToGrey.scss
View File

@ -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;
}
}

27
plugins/textviewer/syntaxhighlighter/compass/shThemeMDUltra.scss
View File

@ -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";

3
plugins/textviewer/syntaxhighlighter/compass/shThemeMidnight.scss
View File

@ -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";

3
plugins/textviewer/syntaxhighlighter/compass/shThemeRDark.scss
View File

@ -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";

2
settings/index.php
View File

@ -1,7 +1,7 @@
<?php
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
if( !OC_USER::isLoggedIn()){
header( "Location: ".OC_HELPER::linkTo( "index.php" ));
exit();

2
skeleton/admin.php
View File

@ -32,7 +32,7 @@ require_once('../lib/base.php');
OC_UTIL::setupFS();
// We load OC_TEMPLATE, too. This one is not loaded by base
oc_require( 'template.php' );
require( 'template.php' );
// The user should have admin rights. This is an admin page!
if( !OC_USER::isLoggedIn() || !OC_USER::ingroup( $_SESSION['username'], 'admin' )){

2
skeleton/index.php
View File

@ -24,7 +24,7 @@
// Init owncloud
require_once('../lib/base.php');
oc_require( 'template.php' );
require( 'template.php' );
// Check if we are a user
if( !OC_USER::isLoggedIn()){