wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8948 commits 157 branches 562 tags 714 MiB
Commit graph

352 commits

Author SHA1 Message Date
Robin Appelman
2508f64efe set debug mode if an xdebug session is active 2012-09-01 20:52:13 +02:00
Robin Appelman
a7255181ad fix autoloader throwing errors for non-oc classes 2012-09-01 15:36:52 +02:00
Robin Appelman
3dacf149de allow configuring user backends in config.php 2012-09-01 02:50:27 +02:00
Robin Appelman
f67aef608f load authentication apps on login 2012-09-01 02:50:27 +02:00
Robin Appelman
ebd813ae95 don't throw errors in the autoloader when a class doesn't exist 2012-09-01 02:50:27 +02:00
Bart Visscher
b483f2aab8 Merge branch 'master' into routing 
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
 2012-08-30 21:49:28 +02:00
Bart Visscher
db18218a1b Space before tab fixes 2012-08-29 20:34:44 +02:00
Bart Visscher
52f2e7112e Whitespace fixes in lib 2012-08-29 20:28:45 +02:00
Bart Visscher
53e51fe46b Clean user cache on login 2012-08-28 23:07:28 +02:00
Bart Visscher
8a02a8852f Add background job for global file cache cleanup 2012-08-28 23:07:28 +02:00
Bart Visscher
63af75586b Merge branch 'master' into routing 2012-08-15 17:39:00 +02:00
Bart Visscher
db4111f6d5 Routing: Add some core routes 2012-08-12 16:52:36 +02:00
Bart Visscher
8c02494744 Routing: Prepare load funtions to be called from OC_Router 2012-08-12 16:16:22 +02:00
Lukas Reschke
0d8df3f55c Revert "Combine install checks in lib/base.php" 
This reverts commit aa9fbf6639.
 2012-08-11 17:07:35 +02:00
Michael Gapczynski
465767670b Check blacklist when renaming files 2012-08-11 11:04:04 -04:00
Bart Visscher
1025e451a7 Add router match to OC::handleRequest 2012-08-11 01:36:16 +02:00
Bart Visscher
c2160433cd Merge branch 'master' into routing 
Conflicts:
	lib/base.php
 2012-08-11 00:43:26 +02:00
Bart Visscher
72b2324b68 Move loading of routes to OC::getRouter function 2012-08-10 23:31:11 +02:00
Bart Visscher
3722928c46 Change access to router object to getter function 2012-08-10 23:30:04 +02:00
Bart Visscher
3e8b6e816a Create OC_Router in OC::init 2012-08-10 23:03:57 +02:00
Lukas Reschke
8ec45870a3 Validate cookie properly and prevent auth bypass 
BIG (!) thanks to Julien CAYSSOL
 2012-08-10 15:28:59 +02:00
Jakob Sack
0ea4fa298c Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed 2012-08-10 13:53:40 +02:00
Jakob Sack
81b997b56e Merge branch 'backgroundjobs' 2012-08-10 13:00:51 +02:00
Bart Visscher
82b10954e7 Simplify loading app php script files 2012-08-10 12:27:37 +02:00
Bart Visscher
5e7086adc9 Move login handling to OC class 2012-08-10 12:17:13 +02:00
Bart Visscher
83403784d1 Always load when the requested file is css 2012-08-10 11:43:04 +02:00
Bart Visscher
da07245f59 Move OC::loadfile and OC::loadapp next to OC::handleRequest 2012-08-10 11:43:04 +02:00
Bart Visscher
e3c732040b Make OC::loadfile and OC::loadapp protected, only used in OC::handleRequest 2012-08-10 11:43:04 +02:00
Bart Visscher
0973969386 Cleanup OC::loadfile 2012-08-10 11:43:04 +02:00
Bart Visscher
aa9fbf6639 Combine install checks in lib/base.php 2012-08-10 11:43:04 +02:00
Jakob Sack
889f0a1c6d rename appconfig keys for backgroundjobs 2012-08-09 10:40:39 +02:00
Jakob Sack
13a0818fec Be more precise regarding backgroundjobs mode 2012-08-09 01:02:05 +02:00
Bart Visscher
3387454094 Move login code from index.php to OC class 2012-08-08 22:42:51 +02:00
Bart Visscher
9156fb73fd Move handling request of index.php to OC class 2012-08-08 22:42:50 +02:00
Bart Visscher
7522a23693 Remove unused RUNTIME_NOSETUPFS var 2012-08-08 22:42:50 +02:00
Bart Visscher
99ce7ba1df Move serverHost and serverProtocol functions to OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher
6d0390dcca Fix rewriting GET parameters with ? in REQUESTEDAPP 2012-08-07 20:43:00 +02:00
Bart Visscher
d579defc66 Merge branch 'master' into routing 2012-07-25 17:51:36 +02:00
Arthur Schiwon
57c375ea24 Support for OCA namespace 2012-07-25 12:56:08 +02:00
Bart Visscher
d0cae6a99a Very basic conversion of ocs to Symfony Routing Component 2012-07-21 19:43:50 +02:00
Robin Appelman
33b8de91ea allow a more flexible way of using user backends 2012-07-19 16:31:55 +02:00
Bart Visscher
621b83df72 Remove referer check, this is unreliable. The header doesnt need te exist, or can be wrong 2012-07-04 17:51:07 +02:00
Robin Appelman
12f7cb8767 fix running tests from cli 2012-06-27 13:21:45 +02:00
Bart Visscher
2f0b4983e9 Move app upgrade check to loading of apps 2012-06-27 01:05:12 +02:00
Brice Maron
09a9f5400e Trim url and path of appsroot to have and standart type of path fix oc-1107 2012-06-25 15:50:27 +02:00
Brice Maron
df60d6d5d2 Fixes for multi app dir : 
Url should be given as relative path (to webroot)
Correct link construction from js
 2012-06-22 12:24:56 +02:00
Brice Maron
b5953e7a83 Provide solution for smoother migration for apps to multi-app dir 2012-06-21 22:22:36 +00:00
Brice Maron
e5c56b2433 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
 2012-06-21 17:15:35 +00:00
Bart Visscher
6404476bec Delay setup of FS until OC_Filesystem is used 2012-06-20 17:10:49 +02:00
Bart Visscher
f54ef5a464 Remove OC::$CONFIG_DATADIRECTORY, not used 2012-06-19 22:54:14 +02:00
Bart Visscher
332603a263 Move formfactor code to OC_Template 2012-06-18 15:40:48 +02:00
Bart Visscher
977cd0df6b Fix errors for minimizer 2012-06-18 11:33:24 +02:00
Bart Visscher
6e9cd63fa1 Only check for apps owncloud version requirment when there is a new owncloud version 2012-06-16 20:52:10 +02:00
Bart Visscher
6d3ae575b6 Remove $DOCUMENTROOT, not used 2012-06-16 00:11:36 +02:00
Brice Maron
4753cc3ebd Merge branch 'master' into multi_app_dir 
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
 2012-06-14 21:16:59 +00:00
Brice Maron
6da5a2fdd4 Add possibility to choose the installation folder 2012-06-14 21:00:02 +00:00
Robin Appelman
76de92477f fix infinite redirect during setup for windows hosts 2012-06-09 14:38:05 +02:00
Georg Ehrke
bdd12df4a2 fix loading of OC::$REQUESTEDAPP if WTFE the app parameter is given but empty aka /?app 2012-06-08 22:31:44 +02:00
Brice Maron
9ec68c819b Change parameter 'web' to 'url' and take array of array in config instead of : separated values 2012-06-07 20:36:55 +00:00
Bart Visscher
4260dce826 Better handling of core.css and core.js 
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
 2012-06-07 21:35:40 +02:00
Brice Maron
0f7fdd4148 ReAdd possibility to load existing app folders 2012-06-07 19:15:31 +00:00
Brice Maron
e8447e0bda Rework to fit with minizer 2012-06-06 21:11:15 +00:00
Brice Maron
cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Brice Maron
b6c5ca126b First almost working version 2012-06-06 20:23:17 +00:00
Arthur Schiwon
6ca2b49292 avoid too-early database access and thus make owncloud installable again 2012-06-06 17:29:57 +02:00
Bart Visscher
57326ea1f8 Move setting remote_core.* to after setup of OC, also check if it is not set yet 2012-06-05 17:51:52 +02:00
Frank Karlitschek
e747fd794e fix login for hosts running on port 80 2012-06-05 15:26:31 +02:00
Frank Karlitschek
e3031ae28b more reliable host detection for reverse proxy servers 2012-06-05 12:52:23 +02:00
Bart Visscher
4a5973662c Merge branch 'unstable' 
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
 2012-06-04 23:02:05 +02:00
Frank Karlitschek
75d56f24f2 try to switch magic quotes off. 
it´s evil and deprecated
 2012-06-01 12:41:38 +02:00
Frank Karlitschek
24d14783d7 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 10:38:44 +02:00
Michael Gapczynski
fbe58755e5 Restrict requested app to apps directory 2012-05-29 12:31:47 -04:00
Frank Karlitschek
a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Frank Karlitschek
24318354f2 changed the default from Berlin to UTC. 
Greetings form Berlin by the way ;-)
 2012-05-24 00:49:21 +02:00
Robin Appelman
60fdc13ae6 enable running unit tests from cli 2012-05-22 20:22:53 +02:00
Robin Appelman
b096fd9ed8 log upgrades 2012-05-19 01:55:20 +02:00
Bart Visscher
ce1e4425c2 Combine and minimize core and default app js files 2012-05-16 18:53:46 +02:00
Bart Visscher
f71fec8cdc Combine and minimize core and default app css files 2012-05-16 18:53:46 +02:00
Bart Visscher
5d72681d10 Better place to check caching headers 2012-05-16 18:52:40 +02:00
Robin Appelman
9eb91a111d update to jquery 1.7.2 2012-05-12 00:37:19 +02:00
Bart Visscher
919681f3e6 Make processed css files cachable 2012-05-11 21:33:02 +02:00
Bart Visscher
97233b77cd Remove DOCUMENTROOT static var, and make SUBURI var private 2012-05-11 21:31:51 +02:00
Georg Ehrke
8f2217ca2e make default app choosable 2012-05-11 13:56:52 +02:00
Michael Gapczynski
de95bf62a2 Prevent any null bytes related exploits, thanks to Lukas Reschke 2012-05-10 11:44:06 -04:00
Bart Visscher
c2230580c1 Remove unused OC static variable CONFIG_DATADIRECTORY_ROOT 2012-05-10 09:14:27 +02:00
Georg Ehrke
d032345191 fix validation of getfile parameter - i hate this bloody merge conflicts 2012-05-07 13:23:55 +02:00
Georg Ehrke
da03d05700 create folder 'remote' for the remote services like caldav, carddav and webdav 2012-05-02 16:41:23 +02:00
Georg Ehrke
3aedbc5f95 remove debug message 2012-04-27 22:22:58 +02:00
Georg Ehrke
06e9ac8591 fix parsing of app parameter and fix external app 2012-04-27 22:22:03 +02:00
Georg Ehrke
993d655aad Merge branch 'master' into movable_apps_2 2012-04-27 10:30:50 +02:00
Frank Karlitschek
ee0cb68f5e some csrf fixes. needs testing 2012-04-27 01:18:21 +02:00
Georg Ehrke
5483c1be42 hide fails 2012-04-26 21:58:43 +02:00
Georg Ehrke
5fda0e4b3b make *DAV work with movable apps 2012-04-26 21:56:29 +02:00
Georg Ehrke
2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Georg Ehrke
3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Georg Ehrke
476043ecb9 add a proper 404 2012-04-25 10:17:20 +02:00
Georg Ehrke
fb84d0aff8 fix php fail 2012-04-24 21:37:19 +02:00
Georg Ehrke
9b29bc96de remove debug message 2012-04-24 21:36:54 +02:00
Georg Ehrke
95c220a246 remove debug code in lib base 2012-04-23 20:31:03 +02:00
Georg Ehrke
19109afa79 fix bug in lib base 2012-04-23 20:11:21 +02:00
Georg Ehrke
42a570788b Merge branch 'master' into movable_apps 2012-04-23 19:56:07 +02:00
Georg Ehrke
6d92ebca45 use native functions of php to parse the string into the Var 2012-04-23 17:09:28 +02:00
Georg Ehrke
9226cb7a6a rename var file to getfile to prevent fails in files app 2012-04-23 16:36:24 +02:00
Frank Karlitschek
f5c9fe9ece first step to an public api of ownCloud for the apps. In the future they shouldn´t call internall classes, functions or session variables because this will change and break in upcoming versions. Apps should only call this public interface that we will kepp stable over different releases. The namespace is OCP for ownCloud public. This is just the first step. more coming soon 2012-04-23 15:50:30 +02:00
Georg Ehrke
99a473bd62 support file calls with parameter 2012-04-20 22:33:30 +02:00
Georg Ehrke
2e85313701 optimize code 2012-04-19 22:26:36 +02:00
Georg Ehrke
909282c81e remove parameters in file var before call require once 2012-04-19 22:25:21 +02:00
Georg Ehrke
85019887df add loading of files 2012-04-19 16:44:49 +02:00
Georg Ehrke
3e0e6e35f4 open app thru index.php 2012-04-18 08:20:51 +02:00
Robin Appelman
1d8fdf52d5 allow multiply group backends 2012-04-13 01:59:05 +02:00
Grundik
7e7de25710 UTF8 locale by default 2012-04-12 17:54:20 +02:00
Tom Needham
acdce2b1e0 Check blacklist before saving to filesystem 2012-04-03 22:31:34 +00:00
Frank Karlitschek
b758725bf7 Try to configure php to enable big file uploads. 
This doesn´t work always depending on the webserver and php configuration.
Let´s try to overwrite some defaults anyways
 2012-04-01 17:02:32 +02:00
Bart Visscher
3300d6ea53 checkUpgrade has to be after template initialization 
The error path of checkUpgrade uses the template
 2012-03-30 23:41:54 +02:00
Bart Visscher
a7438189f3 Move more from base init to separate functions 2012-03-30 23:41:53 +02:00
Robin Appelman
523fdda399 add the option to only load apps of a specific type 2012-03-30 14:39:07 +02:00
Robin Appelman
109d806617 make sure we can load OC_Config when we need it 2012-03-23 18:55:26 +01:00
Bart Visscher
3d8a09b147 Split the init function in lib/base.php a bit 2012-03-19 21:56:55 +01:00
Jakob Sack
90e2962c91 Remove the link between the principals table and the sabre principals connector. 2012-03-02 20:37:49 +01:00
Robin Appelman
48fe85d9bd add streamwrapper that provides a callback on stream close 2012-03-02 18:42:57 +01:00
Bart Visscher
d1dcd7893c Search: Change provider registration to class name, for lazy loading of search providers 2012-03-01 22:59:35 +01:00
Bart Visscher
3d3190309f Simplify stripping the last part off WEBROOT and SERVERROOT for 3rdparty and app dir 2012-03-01 22:59:35 +01:00
Bart Visscher
5dcd9e20d0 Small cleanups 2012-03-01 21:00:23 +01:00
Robin Appelman
6ecbaf0041 load streamwrappers earlier 2012-03-01 18:44:33 +01:00
Frank Karlitschek
0b4607321f Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-03-01 15:21:12 +01:00
Frank Karlitschek
d29a02a65a undo the change of the webroot detection. seams to be buggy 2012-03-01 15:19:44 +01:00
Bartek Przybylski
2754cac21f dialogs library for apps 2012-02-28 23:02:30 +01:00
Frank Karlitschek
0a9b0ee382 change the detection of the webroot. it is simpler now and also works for app directories outside the owncloud folder. works for me and hopefully for everybody else too 2012-02-28 18:21:23 +01:00
Robin Appelman
a829ce69c5 make sure the streamwrappers are registered early 2012-02-28 17:25:15 +01:00
Robin Appelman
77b51f03e3 add temporary file managment 2012-02-28 11:16:19 +01:00
Frank Karlitschek
ab96fa67c8 first part of the abstraction work of the apps folder. more to come 2012-02-26 18:26:41 +01:00
Robin Appelman
d4d09b06f8 merge master into encryption 2012-02-26 14:21:06 +01:00
Robin Appelman
6c501f90bb hopefully a fix for webroot detection 2012-02-26 04:09:48 +01:00
Robin Appelman
ea8f71a19c Merge branch 'master' into encryption 2012-02-25 16:36:58 +01:00
Robin Appelman
8b93a9a237 add javascript bindings for OC_AppConfig 2012-02-25 16:35:40 +01:00
Frank Karlitschek
a62e109e8c make the location of the 3rdparty folder flexible. 
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
 2012-02-23 15:37:38 +01:00
Robin Appelman
2e05bd69f5 add javascript bindings for OC_AppConfig 2012-02-22 22:20:11 +01:00
Robin Appelman
325858e9e2 add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper 2012-02-21 20:48:48 +01:00
Robin Appelman
e53e7990c4 improve get_temp_dir() implementation 2012-02-21 20:48:48 +01:00
Bart Visscher
1fa05894d5 Move config.php writable test to update path 
This should make it possible to use owncloud with a read-only config.php
 2012-02-17 22:10:03 +01:00
Robin Appelman
3579446930 use SimpleTest for unit testing 
includes some tests for storage providers, more to come
 2012-02-12 18:07:58 +01:00
Michael Gapczynski
6929652e14 Redirect to installer if not installed 2012-02-11 17:37:47 -05:00
Robin Appelman
4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Robin Appelman
45038af948 provide small wrapper around server side events and provide a fallback for IE 2012-01-30 20:21:16 +01:00
Robin Appelman
96e2f15d8a merge master into filesystem 2012-01-16 03:06:11 +01:00
Robin Appelman
907dd4d24d some aditional feedback during database upgrade 2012-01-16 01:15:43 +01:00
Robin Appelman
6e0ea7aaae use absolute path for db_structure.xml when updating 2012-01-13 20:05:24 +01:00
Robin Appelman
ccc43f0ea0 merge master into filesystem 2012-01-08 18:01:33 +01:00
Tom Needham
e5d3666280 Merge branch 'master' of gitorious.org:owncloud/owncloud into jqueryui 2012-01-08 16:45:28 +00:00