Typofix



git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5371 7882d7ee-46e0-0310-a255-a28a61b628e4
Reverting commit 5074

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5372 7882d7ee-46e0-0310-a255-a28a61b628e4
Adding some missing files in trunk, when merging changes from 2.7-fixes , this was forgotten

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5373 7882d7ee-46e0-0310-a255-a28a61b628e4
- Broader check for Apache
- typofix in step6 for files dir check that fails in some configurations



git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5374 7882d7ee-46e0-0310-a255-a28a61b628e4
Fixed classnames



git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5375 7882d7ee-46e0-0310-a255-a28a61b628e4
Added option to convert colorspace



git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5376 7882d7ee-46e0-0310-a255-a28a61b628e4
More checks for conflicted files, prevents conflicted files from going empty.



git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5377 7882d7ee-46e0-0310-a255-a28a61b628e4
Adding public/protected on the functions and missing properties

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5378 7882d7ee-46e0-0310-a255-a28a61b628e4
Shuffle code, and remove proxystore support

place the password removal earlier in the initialisation
remove proxy store support, just keep the object for compatibility

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5379 7882d7ee-46e0-0310-a255-a28a61b628e4
Deleted stores no longer supported

MSsql  and oracle are not tested or developed in a long time.
Removing as it is now legacy code

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5380 7882d7ee-46e0-0310-a255-a28a61b628e4
Removing proxystore legacy

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5381 7882d7ee-46e0-0310-a255-a28a61b628e4
added al public/protected keywords in the filestore

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5382 7882d7ee-46e0-0310-a255-a28a61b628e4
Adding tempfiles for writing out cache files
preventing that other clients could use the cacheimage before we are ready

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5383 7882d7ee-46e0-0310-a255-a28a61b628e4
show 404 when there is no view.html available

git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5384 7882d7ee-46e0-0310-a255-a28a61b628e4