mirror of
https://github.com/YunoHost-Apps/dotclear2_ynh.git
synced 2024-09-03 18:26:29 +02:00
Merge pull request #58 from YunoHost-Apps/ci-auto-update-v2.24.1
Upgrade to version 2.24.1
This commit is contained in:
Kayou
GitHub
commit
2ee5eb169b
5 changed files with 21 additions and 23 deletions
|
|
@ -5,7 +5,7 @@ It shall NOT be edited by hand.
|
|||
|
||||
# DotClear 2 for YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
*[Lire ce readme en français.](./README_fr.md)*
|
||||
|
|
@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
|
||||
Blog publishing application
|
||||
|
||||
**Shipped version:** 2.23.1~ynh1
|
||||
|
||||
**Shipped version:** 2.24.1~ynh1
|
||||
|
||||
**Demo:** https://www.softaculous.com/demos/Dotclear
|
||||
|
||||
|
|
|
|||
23
README_fr.md
23
README_fr.md
|
|
@ -5,26 +5,25 @@ It shall NOT be edited by hand.
|
|||
|
||||
# DotClear 2 pour YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
*[Read this readme in english.](./README.md)*
|
||||
|
||||
> *Ce package vous permet d'installer DotClear 2 rapidement et simplement sur un serveur YunoHost.
|
||||
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
|
||||
> *Ce package vous permet d’installer DotClear 2 rapidement et simplement sur un serveur YunoHost.
|
||||
Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.*
|
||||
|
||||
## Vue d'ensemble
|
||||
## Vue d’ensemble
|
||||
|
||||
Moteur de blog
|
||||
|
||||
**Version incluse :** 2.23.1~ynh1
|
||||
|
||||
**Version incluse :** 2.24.1~ynh1
|
||||
|
||||
**Démo :** https://www.softaculous.com/demos/Dotclear
|
||||
|
||||
## Captures d'écran
|
||||
## Captures d’écran
|
||||
|
||||
|
||||
|
||||
|
||||
## Avertissements / informations importantes
|
||||
|
||||
|
|
@ -40,9 +39,9 @@ Can the app be used by multiple users? **Yes**
|
|||
|
||||
## Documentations et ressources
|
||||
|
||||
* Site officiel de l'app : <https://dotclear.org>
|
||||
* Documentation officielle de l'admin : <https://dotclear.org/documentation/2.0>
|
||||
* Dépôt de code officiel de l'app : <https://git.dotclear.org/dev/dotclear>
|
||||
* Site officiel de l’app : <https://dotclear.org>
|
||||
* Documentation officielle de l’admin : <https://dotclear.org/documentation/2.0>
|
||||
* Dépôt de code officiel de l’app : <https://git.dotclear.org/dev/dotclear>
|
||||
* Documentation YunoHost pour cette app : <https://yunohost.org/app_dotclear2>
|
||||
* Signaler un bug : <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
|
||||
|
||||
|
|
@ -58,4 +57,4 @@ ou
|
|||
sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
|
||||
```
|
||||
|
||||
**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
|
||||
**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.23.1.zip
|
||||
SOURCE_SUM=cf41664920e6023c4a25185d723d71ef524c021d93c774ab9c4b9d28bf024d4d
|
||||
SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.24.1.zip
|
||||
SOURCE_SUM=7d6c75d0b0d5c6f6aefaf663a32a6d0df24f9a915f96327676ba4157329a3390
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=zip
|
||||
SOURCE_IN_SUBDIR=true
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ class ldapDcAuth extends dcAuth
|
|||
private $port = "389";
|
||||
private $base = "dc=yunohost,dc=org";
|
||||
|
||||
public function checkUser($user_id, $pwd=null, $user_key=null, $check_blog=true)
|
||||
public function checkUser(string $user_id, ?string $pwd = NULL, ?string $user_key = NULL, bool $check_blog = true): bool
|
||||
{
|
||||
if ($pwd == '') {
|
||||
return parent::checkUser($user_id, null, $user_key, $check_blog);
|
||||
|
|
@ -56,9 +56,9 @@ class ldapDcAuth extends dcAuth
|
|||
}
|
||||
|
||||
# If the user exist, then we just update his password.
|
||||
if ($this->core->userExists($user_id))
|
||||
if (dcCore::app()->userExists($user_id))
|
||||
{
|
||||
$this->sudo(array($this->core, 'updUser'), $user_id, $cur);
|
||||
$this->sudo(array(dcCore::app(), 'updUser'), $user_id, $cur);
|
||||
}
|
||||
# If not, we create him.
|
||||
# In order for him to connect,
|
||||
|
|
@ -69,7 +69,7 @@ class ldapDcAuth extends dcAuth
|
|||
$cur->user_lang = 'fr'; # Can change this, PR are welcome
|
||||
$cur->user_tz = 'Europe/Paris'; # Can change this, PR are welcome
|
||||
$cur->user_default_blog = 'default'; # Can change this, PR are welcome
|
||||
$this->sudo(array($this->core,'addUser'), $cur);
|
||||
$this->sudo(array(dcCore::app(),'addUser'), $cur);
|
||||
# Possible roles:
|
||||
# admin "administrator"
|
||||
# contentadmin "manage all entries and comments"
|
||||
|
|
@ -100,7 +100,7 @@ class ldapDcAuth extends dcAuth
|
|||
$set_perms[$perm_id] = true;
|
||||
}
|
||||
}
|
||||
$this->sudo(array($this->core, 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true);
|
||||
$this->sudo(array(dcCore::app(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true);
|
||||
}
|
||||
|
||||
$this->con->commit();
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Blog publishing application",
|
||||
"fr": "Moteur de blog"
|
||||
},
|
||||
"version": "2.23.1~ynh1",
|
||||
"version": "2.24.1~ynh1",
|
||||
"license": "GPL-2.0-or-later",
|
||||
"url": "https://dotclear.org/",
|
||||
"upstream": {
|
||||
|
|
|
|||
Loading…
Reference in a new issue