@@ -653,7 +653,7 @@ |
||
| 653 | 653 | ], |
| 654 | 654 | ], // EXISTS OR |
| 655 | 655 | ], |
| 656 | - ]; // global OR |
|
| 656 | + ]; // global OR |
|
| 657 | 657 | } |
| 658 | 658 | |
| 659 | 659 | /** |
@@ -62,10 +62,10 @@ |
||
| 62 | 62 | */ |
| 63 | 63 | public function ObjectUriProvider() { |
| 64 | 64 | return [ |
| 65 | - ['1234.ics', '.ics', '1234'], // ok, cut .ics |
|
| 66 | - ['5678AF.vcf', '.vcf', '5678AF'], // ok, cut .vcf |
|
| 67 | - ['123400.vcf', '.ics', '123400.vcf'], // different extension, return as is |
|
| 68 | - ['1234.ics', '.vcf', '1234.ics'], // different extension, return as is |
|
| 65 | + ['1234.ics', '.ics', '1234'], // ok, cut .ics |
|
| 66 | + ['5678AF.vcf', '.vcf', '5678AF'], // ok, cut .vcf |
|
| 67 | + ['123400.vcf', '.ics', '123400.vcf'], // different extension, return as is |
|
| 68 | + ['1234.ics', '.vcf', '1234.ics'], // different extension, return as is |
|
| 69 | 69 | ]; |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -14,12 +14,10 @@ |
||
| 14 | 14 | |
| 15 | 15 | class AuthApache extends Apache { |
| 16 | 16 | protected $stored_realm; |
| 17 | - public function setRealm($r) |
|
| 18 | - { |
|
| 17 | + public function setRealm($r) { |
|
| 19 | 18 | $stored_realm = $r; |
| 20 | 19 | } |
| 21 | - public function challenge(RequestInterface $rq, ResponseInterface $rs) |
|
| 22 | - { |
|
| 20 | + public function challenge(RequestInterface $rq, ResponseInterface $rs) { |
|
| 23 | 21 | $rs->addHeader("WWW-Authenticate", "Basic realm=$stored_realm"); |
| 24 | 22 | } |
| 25 | 23 | } |
@@ -38,7 +38,8 @@ |
||
| 38 | 38 | $gdavBackend = new GrommunioDavBackend(new GLogger('dav')); |
| 39 | 39 | if (defined("SABRE_AUTH_BACKEND") && strcmp(SABRE_AUTH_BACKEND, "apache") == 0) { |
| 40 | 40 | $authBackend = new AuthApache; |
| 41 | -} else { |
|
| 41 | +} |
|
| 42 | +else { |
|
| 42 | 43 | $authBackend = new AuthBasicBackend($gdavBackend); |
| 43 | 44 | } |
| 44 | 45 | $authBackend->setRealm(SABRE_AUTH_REALM); |