wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into oc_error

Browse source
This commit is contained in:
Georg Ehrke 2012-06-23 19:54:20 +02:00
commit 51c5e7035e
15 changed files with 57 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/contacts/css/jquery.Jcrop.css
View file

@ -14,7 +14,7 @@
}
.jcrop-vline, .jcrop-hline {
background: white url('%webroot%/apps/contacts/img/Jcrop.gif') top left repeat;
background: white url('%appswebroot%/contacts/img/Jcrop.gif') top left repeat;
font-size: 0px;
position: absolute;
}

7
apps/files_texteditor/css/style.css
View file

@ -2,13 +2,10 @@
position: fixed;
display: block;
top: 6.8em;
left: 13.5em;
left: 12.5em;
z-index: 20;
}
#editor_save{
margin-left: 7px;
float: left;
}
#saving_icon{
margin-top: 3px;
float: left;
}

4
apps/files_versions/appinfo/app.php
View file

@ -1,6 +1,6 @@
<?php
require_once('apps/files_versions/versions.php');
require_once('files_versions/versions.php');
OCP\App::registerAdmin('files_versions', 'settings');
OCP\App::registerPersonal('files_versions','settings-personal');
@ -8,4 +8,4 @@ OCP\App::registerPersonal('files_versions','settings-personal');
OCP\Util::addscript('files_versions', 'versions');
// Listen to write signals
OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");

16
apps/gallery/appinfo/app.php
View file

@ -21,13 +21,13 @@
*
*/
OC::$CLASSPATH['OC_Gallery_Album'] = 'apps/gallery/lib/album.php';
OC::$CLASSPATH['OC_Gallery_Photo'] = 'apps/gallery/lib/photo.php';
OC::$CLASSPATH['OC_Gallery_Scanner'] = 'apps/gallery/lib/scanner.php';
OC::$CLASSPATH['OC_Gallery_Sharing'] = 'apps/gallery/lib/sharing.php';
OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'apps/gallery/lib/hooks_handlers.php';
OC::$CLASSPATH['Pictures_Managers'] = 'apps/gallery/lib/managers.php';
OC::$CLASSPATH['Pictures_Tiles'] = 'apps/gallery/lib/tiles.php';
OC::$CLASSPATH['OC_Gallery_Album'] = 'gallery/lib/album.php';
OC::$CLASSPATH['OC_Gallery_Photo'] = 'gallery/lib/photo.php';
OC::$CLASSPATH['OC_Gallery_Scanner'] = 'gallery/lib/scanner.php';
OC::$CLASSPATH['OC_Gallery_Sharing'] = 'gallery/lib/sharing.php';
OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'gallery/lib/hooks_handlers.php';
OC::$CLASSPATH['Pictures_Managers'] = 'gallery/lib/managers.php';
OC::$CLASSPATH['Pictures_Tiles'] = 'gallery/lib/tiles.php';
$l = OC_L10N::get('gallery');
@ -52,4 +52,4 @@ class OC_GallerySearchProvider extends OC_Search_Provider{
//OC_Search::registerProvider('OC_GallerySearchProvider');
require_once('apps/gallery/lib/hooks_handlers.php');
require_once('gallery/lib/hooks_handlers.php');

2
apps/gallery/index.php
View file

@ -31,7 +31,7 @@ OCP\Util::addStyle('files', 'files');
OCP\Util::addStyle('gallery', 'styles');
OCP\Util::addScript('gallery', 'pictures');
include('apps/gallery/lib/tiles.php');
include('gallery/lib/tiles.php');
$root = !empty($_GET['root']) ? $_GET['root'] : '/';
$images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);

2
apps/gallery/js/pictures.js
View file

@ -60,7 +60,7 @@ function deplode(element) {
}
function openNewGal(album_name) {
root = root + album_name + "/";
root = root + decodeURIComponent(album_name) + "/";
var url = window.location.toString().replace(window.location.search, '');
url = url + "?app=gallery&root="+encodeURIComponent(root);

2
apps/gallery/lib/tiles.php
View file

@ -168,7 +168,7 @@ class TileStack extends TileBase {
}
public function getOnClickAction() {
return 'javascript:openNewGal(\''.\OCP\Util::sanitizeHTML($this->stack_name).'\');';
return 'javascript:openNewGal(\''.rawurlencode($this->stack_name).'\');';
}
private $tiles_array;

6
apps/media/appinfo/app.php
View file

@ -22,9 +22,9 @@
$l=OC_L10N::get('media');
require_once('apps/media/lib_media.php');
require_once('apps/media/lib_collection.php');
require_once('apps/media/lib_scanner.php');
require_once('media/lib_media.php');
require_once('media/lib_collection.php');
require_once('media/lib_scanner.php');
OCP\Util::addscript('media','loader');
OCP\App::registerPersonal('media','settings');

21
apps/user_ldap/lib_ldap.php
View file

@ -471,11 +471,22 @@ class OC_LDAP {
if(!is_null($attr) && !is_array($attr)) {
$attr = array(strtolower($attr));
}
$sr = @ldap_search(self::getConnectionResource(), $base, $filter, $attr);
$findings = @ldap_get_entries(self::getConnectionResource(), $sr );
// if we're here, probably no connection ressource is returned.
// to make ownCloud behave nicely, we simply give back an empty array.
if(is_null($findings)) {
// See if we have a resource
$link_resource = self::getConnectionResource();
if($link_resource)
{
$sr = ldap_search($link_resource, $base, $filter, $attr);
$findings = ldap_get_entries($link_resource, $sr );
// if we're here, probably no connection resource is returned.
// to make ownCloud behave nicely, we simply give back an empty array.
if(is_null($findings)) {
return array();
}
} else
{
// Seems like we didn't find any resource.
// Return an empty array just like before.
return array();
}

6
lib/app.php
View file

@ -492,21 +492,21 @@ class OC_App{
* register a settings form to be shown
*/
public static function registerSettings($app,$page){
self::$settingsForms[]='apps/'.$app.'/'.$page.'.php';
self::$settingsForms[]= $app.'/'.$page.'.php';
}
/**
* register an admin form to be shown
*/
public static function registerAdmin($app,$page){
self::$adminForms[]='apps/'.$app.'/'.$page.'.php';
self::$adminForms[]= $app.'/'.$page.'.php';
}
/**
* register a personal form to be shown
*/
public static function registerPersonal($app,$page){
self::$personalForms[]='apps/'.$app.'/'.$page.'.php';
self::$personalForms[]= $app.'/'.$page.'.php';
}
/**

2
lib/config.php
View file

@ -157,7 +157,7 @@ class OC_Config{
// Create a php file ...
$content = "<?php\n\$CONFIG = ";
$content .= var_export(self::$cache, true);
$content .= ";\n?>\n";
$content .= ";\n";
$filename = OC::$SERVERROOT."/config/config.php";
// Write the file

2
lib/db.php
View file

@ -526,7 +526,7 @@ class OC_DB {
self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
foreach($apps as $app){
$path = OC::$SERVERROOT.'/apps/'.$app.'/appinfo/database.xml';
$path = self::getAppPath($app).'/appinfo/database.xml';
if(file_exists($path)){
self::removeDBStructure( $path );
}

23
lib/installer.php
View file

@ -287,22 +287,23 @@ class OC_Installer{
*/
public static function installShippedApps(){
foreach(OC::$APPSROOTS as $app_dir) {
$dir = opendir( $app_dir['path'] );
while( false !== ( $filename = readdir( $dir ))){
if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ){
if( file_exists( $app_dir['path']."/$filename/appinfo/app.php" )){
if(!OC_Installer::isInstalled($filename)){
$info=OC_App::getAppInfo($filename);
$enabled = isset($info['default_enable']);
if( $enabled ){
OC_Installer::installShippedApp($filename);
OC_Appconfig::setValue($filename,'enabled','yes');
if($dir = opendir( $app_dir['path'] )){
while( false !== ( $filename = readdir( $dir ))){
if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ){
if( file_exists( $app_dir['path']."/$filename/appinfo/app.php" )){
if(!OC_Installer::isInstalled($filename)){
$info=OC_App::getAppInfo($filename);
$enabled = isset($info['default_enable']);
if( $enabled ){
OC_Installer::installShippedApp($filename);
OC_Appconfig::setValue($filename,'enabled','yes');
}
}
}
}
}
closedir( $dir );
}
closedir( $dir );
}
}

8
lib/migrate.php
View file

@ -64,7 +64,7 @@ class OC_Migrate{
$apps = OC_App::getAllApps();
foreach($apps as $app){
$path = OC::$SERVERROOT . '/apps/' . $app . '/appinfo/migrate.php';
$path = self::getAppPath($app) . '/appinfo/migrate.php';
if( file_exists( $path ) ){
include( $path );
}
@ -398,7 +398,7 @@ class OC_Migrate{
if( OC_App::isEnabled( $provider->getID() ) ){
$success = true;
// Does this app use the database?
if( file_exists( OC::$SERVERROOT.'/apps/'.$provider->getID().'/appinfo/database.xml' ) ){
if( file_exists( self::getAppPath($provider->getID()).'/appinfo/database.xml' ) ){
// Create some app tables
$tables = self::createAppTables( $provider->getID() );
if( is_array( $tables ) ){
@ -539,7 +539,7 @@ class OC_Migrate{
}
// There is a database.xml file
$content = file_get_contents( OC::$SERVERROOT . '/apps/' . $appid . '/appinfo/database.xml' );
$content = file_get_contents(self::getAppPath($appid) . '/appinfo/database.xml' );
$file2 = 'static://db_scheme';
// TODO get the relative path to migration.db from the data dir
@ -608,7 +608,7 @@ class OC_Migrate{
static public function getApps(){
$allapps = OC_App::getAllApps();
foreach($allapps as $app){
$path = OC::$SERVERROOT . '/apps/' . $app . '/lib/migrate.php';
$path = self::getAppPath($app) . '/lib/migrate.php';
if( file_exists( $path ) ){
$supportsmigration[] = $app;
}

2
lib/minimizer/css.php
View file

@ -17,7 +17,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
$in_root = false;
foreach(OC::$APPSROOTS as $app_root) {
if(strpos($file, $app_root['path']) === 0) {
$in_root = $webroot.$app_root['url'];
$in_root = rtrim($webroot.$app_root['url'], '/');
break;
}
}