diff options
| -rw-r--r-- | .htaccess | 1 | ||||
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | doc/install/sample-lighttpd.conf | 2 | ||||
| -rw-r--r-- | include/photo/photo_driver.php | 2 | ||||
| -rw-r--r-- | install/update.php | 7 | ||||
| -rw-r--r-- | mod/cloud.php | 5 | ||||
| -rw-r--r-- | version.inc | 2 |
7 files changed, 15 insertions, 6 deletions
@@ -11,6 +11,7 @@ Deny from all RewriteEngine on # Protect repository directory from browsing RewriteRule "(^|/)\.git" - [F] + RewriteRule "(^|/)store" - [F] # Rewrite current-style URLs of the form 'index.php?q=x'. @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1091 ); +define ( 'DB_UPDATE_VERSION', 1092 ); define ( 'EOL', '<br />' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/doc/install/sample-lighttpd.conf b/doc/install/sample-lighttpd.conf index 213719ac9..721fa25ea 100644 --- a/doc/install/sample-lighttpd.conf +++ b/doc/install/sample-lighttpd.conf @@ -74,7 +74,7 @@ $HTTP["url"] =~ "\.(out|log|htaccess)$" { url.access-deny = ("") } -$HTTP["url"] =~ "(^|/)\.git" { +$HTTP["url"] =~ "(^|/)\.git|(^|/)store" { url.access-deny = ("") } diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index debe1bc38..ff92e5a0f 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -525,7 +525,7 @@ function import_profile_photo($photo,$xchan,$thing = false) { if($thing) $hash = photo_new_resource(); else { - $r = q("select resource_id from photo where xchan = '%s' and (photo_flags & %d ) scale = 4 limit 1", + $r = q("select resource_id from photo where xchan = '%s' and (photo_flags & %d ) and scale = 4 limit 1", dbesc($xchan), intval(PHOTO_XCHAN) ); diff --git a/install/update.php b/install/update.php index 022d7f0dc..3e5589820 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1091 ); +define( 'UPDATE_VERSION' , 1092 ); /** * @@ -994,3 +994,8 @@ ADD INDEX ( `menu_flags` )"); return UPDATE_FAILED; } +function update_r1091() { + @mkdir('store/[data]/smarty',STORAGE_DEFAULT_PERMISSIONS,true); + @file_put_contents('store/[data]/locks',''); + return UPDATE_SUCCESS; +}
\ No newline at end of file diff --git a/mod/cloud.php b/mod/cloud.php index 7413e1824..3332cf18c 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -32,6 +32,9 @@ function cloud_init(&$a) { require_once('include/reddav.php'); + if(! is_dir('store')) + mkdir('store',STORAGE_DEFAULT_PERMISSIONS,false); + $which = null; if(argc() > 1) $which = argv(1); @@ -74,7 +77,7 @@ function cloud_init(&$a) { $rootDirectory = new RedDirectory('/',$auth); $server = new DAV\Server($rootDirectory); - $lockBackend = new DAV\Locks\Backend\File('store/data/locks'); + $lockBackend = new DAV\Locks\Backend\File('store/[data]/locks'); $lockPlugin = new DAV\Locks\Plugin($lockBackend); $server->addPlugin($lockPlugin); diff --git a/version.inc b/version.inc index 1d3ba2799..02e793fcd 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-20.563 +2014-01-21.564 |