From 6430a232f88ed214997d7704c18aead873094a0f Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 14 Jun 2016 19:55:31 -0400 Subject: [PATCH 1/4] Add Italian wiki context help translation --- doc/context/it/wiki/help.html | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/context/it/wiki/help.html diff --git a/doc/context/it/wiki/help.html b/doc/context/it/wiki/help.html new file mode 100644 index 000000000..e93e18eb4 --- /dev/null +++ b/doc/context/it/wiki/help.html @@ -0,0 +1,10 @@ +
+
General
+
Ogni wiki è una raccolta di pagine, composta di file di testo formattati con Markdown.
+
Elenco dei Wiki
+
I Wiki del canale che sei abilitato a vedere sono elencati nel pannello laterale.
+
Cronologia della pagina
+
Le revisioni di ogni pagina vengono salvate per rendere possibile un ripristino veloce. Fai click sulla tab Cronologia per vedere l'elenco delle revisioni, con autore e data delle stesse. Il bottone di ripristino riporterà alla revisione selezionata, senza salvare automaticamente la pagina.
+
Pagine
+
L'elenco delle pagine del wiki si trova nel pannello Pagine del wiki. Prima di salvare le modifiche con il menu a discela Pagina, puoi inserire un messaggio che verrà visualizzato nella visualizzazione della storia della pagina insieme alla revisione.
+
\ No newline at end of file From e5a919c32eae5c04d44e1e60ddadf95a63f9deb3 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 14 Jun 2016 19:58:33 -0400 Subject: [PATCH 2/4] Fix Spanish wiki translation --- doc/context/es-es/wiki/help.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/context/es-es/wiki/help.html b/doc/context/es-es/wiki/help.html index fc1f45997..fdae1f095 100644 --- a/doc/context/es-es/wiki/help.html +++ b/doc/context/es-es/wiki/help.html @@ -6,5 +6,5 @@
Historial de la página
Cada revisión de una página se salva para permitir su rápida recuperación. Pulsar en la pestaña Historial para ver las revisiones de la página, incluyendo la fecha y el autor de cada una. El botón de reversión cargará la revisión seleccionada, pero no salvará automáticamente la página.
Páginas
-
La lista de páginas en el wiki aparece en el panel Páginas del wiki. Antes de salvar las páginas editadas usando el control Página en el menú desplegable, puede escribir un mensaje personalizado que se verá en el visor Historial de la página junto con la revisión.
+
La lista de páginas en el wiki aparece en el panel Páginas del wiki. Antes de salvar las páginas editadas usando el control Página en el menú desplegable, puede escribir un mensaje personalizado que se verá en el visor Historial de la página junto con la revisión.
From ccfd028919ee06611ebe0525a0a701830bd77516 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jun 2016 17:04:29 -0700 Subject: [PATCH 3/4] readme for the module directory, also provide an undocumented way to reset the timestamp on connection photos to force a refresh without messing with the database directly. --- Zotlabs/Module/Connedit.php | 22 ++++++---- Zotlabs/Module/README.md | 80 +++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 Zotlabs/Module/README.md diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 33deac4c8..3feba5370 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -16,14 +16,14 @@ require_once('include/zot.php'); require_once('include/widgets.php'); require_once('include/photos.php'); -/* @brief Initialize the connection-editor - * - * - */ - class Connedit extends \Zotlabs\Web\Controller { + /* @brief Initialize the connection-editor + * + * + */ + function init() { if(! local_channel()) @@ -51,7 +51,7 @@ class Connedit extends \Zotlabs\Web\Controller { * */ - function post() { + function post() { if(! local_channel()) return; @@ -357,7 +357,7 @@ class Connedit extends \Zotlabs\Web\Controller { * */ - function get() { + function get() { $sort_type = 0; $o = ''; @@ -418,7 +418,13 @@ class Connedit extends \Zotlabs\Web\Controller { goaway(z_root() . '/connedit/' . $contact_id); } - + if($cmd === 'resetphoto') { + q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s' limit 1", + dbesc($orig_record[0]['xchan_hash']) + ); + $cmd = 'refresh'; + } + if($cmd === 'refresh') { if($orig_record[0]['xchan_network'] === 'zot') { if(! zot_refresh($orig_record[0],\App::get_channel())) diff --git a/Zotlabs/Module/README.md b/Zotlabs/Module/README.md new file mode 100644 index 000000000..3b870dd7b --- /dev/null +++ b/Zotlabs/Module/README.md @@ -0,0 +1,80 @@ +Zotlabs/Module +============== + + +This directory contains controller modules for handling web requests. The +lowercase class name indicates the head of the URL path which this module +handles. There are other methods of attaching (routing) URL paths to +controllers, but this is the primary method used in this project. + +Module controllers MUST reside in this directory and namespace to be +autoloaded (unless other specific routing methods are employed). They +typically use and extend the class definition in Zotlabs/Web/Controller +as a template. + +Template: + + Date: Tue, 14 Jun 2016 20:30:34 -0700 Subject: [PATCH 4/4] support cookie auth in Sabre DAV --- Zotlabs/Storage/BasicAuth.php | 53 +++++++++++++++++++++++++++++++++++ Zotlabs/Web/Controller.php | 3 +- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index 121a9c3a1..60fc2c988 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -3,6 +3,8 @@ namespace Zotlabs\Storage; use Sabre\DAV; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; /** * @brief Authentication backend class for DAV. @@ -145,6 +147,57 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { return true; } + /** + * When this method is called, the backend must check if authentication was + * successful. + * + * The returned value must be one of the following + * + * [true, "principals/username"] + * [false, "reason for failure"] + * + * If authentication was successful, it's expected that the authentication + * backend returns a so-called principal url. + * + * Examples of a principal url: + * + * principals/admin + * principals/user1 + * principals/users/joe + * principals/uid/123457 + * + * If you don't use WebDAV ACL (RFC3744) we recommend that you simply + * return a string such as: + * + * principals/users/[username] + * + * @param RequestInterface $request + * @param ResponseInterface $response + * @return array + */ + function check(RequestInterface $request, ResponseInterface $response) { + + if(local_channel()) { + return [ true, $this->principalPrefix . $this->channel_name ]; + } + + $auth = new \Sabre\HTTP\Auth\Basic( + $this->realm, + $request, + $response + ); + + $userpass = $auth->getCredentials(); + if (!$userpass) { + return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"]; + } + if (!$this->validateUserPass($userpass[0], $userpass[1])) { + return [false, "Username or password was incorrect"]; + } + return [true, $this->principalPrefix . $userpass[0]]; + + } + protected function check_module_access($channel_id) { if($channel_id && \App::$module === 'cdav') { $x = get_pconfig($channel_id,'cdav','enabled'); diff --git a/Zotlabs/Web/Controller.php b/Zotlabs/Web/Controller.php index ac835e008..2d0f58891 100644 --- a/Zotlabs/Web/Controller.php +++ b/Zotlabs/Web/Controller.php @@ -9,4 +9,5 @@ class Controller { function post() {} function get() {} -} \ No newline at end of file +} +