From 01f21083a897b86bf148f1d2bb9c8edca4d3786a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 25 Jan 2019 23:15:08 +0100
Subject: Rename virtual folder to nixops

Fixes https://git.immae.eu/mantisbt/view.php?id=82
---
 .../websites/commons/spip/spip_ldap_patch.patch    | 60 ++++++++++++++++++++++
 .../websites/commons/spip/spip_mes_options.php     | 18 +++++++
 2 files changed, 78 insertions(+)
 create mode 100644 nixops/modules/websites/commons/spip/spip_ldap_patch.patch
 create mode 100644 nixops/modules/websites/commons/spip/spip_mes_options.php

(limited to 'nixops/modules/websites/commons/spip')

diff --git a/nixops/modules/websites/commons/spip/spip_ldap_patch.patch b/nixops/modules/websites/commons/spip/spip_ldap_patch.patch
new file mode 100644
index 0000000..653c909
--- /dev/null
+++ b/nixops/modules/websites/commons/spip/spip_ldap_patch.patch
@@ -0,0 +1,60 @@
+--- old/ecrire/auth/ldap.php	2017-06-08 21:58:17.000000000 +0200
++++ new/ecrire/auth/ldap.php	2017-06-10 02:54:02.687954143 +0200
+@@ -171,24 +171,41 @@
+ 	$desc = isset($ldap['attributes']) && $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'] ;
+ 
+ 	$logins = is_array($desc['login']) ? $desc['login'] : array($desc['login']);
++        if (isset($GLOBALS['ldap_search'])) {
++          $search_query = str_replace("%user%", $login_search, $GLOBALS['ldap_search']);
++          $result = @ldap_search($ldap_link, $ldap_base, $search_query, array("dn"));
++          $info = @ldap_get_entries($ldap_link, $result);
++          // Ne pas accepter les resultats si plus d'une entree
++          // (on veut un attribut unique)
+ 
+-	// Tenter une recherche pour essayer de retrouver le DN
+-	foreach ($logins as $att) {
+-		$result = @ldap_search($ldap_link, $ldap_base, "$att=$login_search", array("dn"));
+-		$info = @ldap_get_entries($ldap_link, $result);
+-		// Ne pas accepter les resultats si plus d'une entree
+-		// (on veut un attribut unique)
++          if (is_array($info) and $info['count'] == 1) {
++            $dn = $info[0]['dn'];
++            if (!$checkpass) {
++              return $dn;
++            }
++            if (@ldap_bind($ldap_link, $dn, $pass)) {
++              return $dn;
++            }
++          }
++        } else {
++          // Tenter une recherche pour essayer de retrouver le DN
++          foreach ($logins as $att) {
++                  $result = @ldap_search($ldap_link, $ldap_base, "$att=$login_search", array("dn"));
++                  $info = @ldap_get_entries($ldap_link, $result);
++                  // Ne pas accepter les resultats si plus d'une entree
++                  // (on veut un attribut unique)
+ 
+-		if (is_array($info) and $info['count'] == 1) {
+-			$dn = $info[0]['dn'];
+-			if (!$checkpass) {
+-				return $dn;
+-			}
+-			if (@ldap_bind($ldap_link, $dn, $pass)) {
+-				return $dn;
+-			}
+-		}
+-	}
++                  if (is_array($info) and $info['count'] == 1) {
++                          $dn = $info[0]['dn'];
++                          if (!$checkpass) {
++                                  return $dn;
++                          }
++                          if (@ldap_bind($ldap_link, $dn, $pass)) {
++                                  return $dn;
++                          }
++                  }
++          }
++        }
+ 
+ 	if ($checkpass and !isset($dn)) {
+ 		// Si echec, essayer de deviner le DN
diff --git a/nixops/modules/websites/commons/spip/spip_mes_options.php b/nixops/modules/websites/commons/spip/spip_mes_options.php
new file mode 100644
index 0000000..8db8389
--- /dev/null
+++ b/nixops/modules/websites/commons/spip/spip_mes_options.php
@@ -0,0 +1,18 @@
+<?php // /!\ Important: There must be no blank space before &lt;?php or after ?&gt;
+// This file was inspired from the spip contrib website
+// http://www.spip.net/fr_article3811.html
+
+$config_dir = getenv('SPIP_CONFIG_DIR') . '/';
+$var_dir = getenv('SPIP_VAR_DIR') . '/';
+
+$cookie_prefix = str_replace('.', '_', getenv("SPIP_SITE"));
+$table_prefix = 'spip';
+
+spip_initialisation(
+        $config_dir,
+        _DIR_RACINE . _NOM_PERMANENTS_ACCESSIBLES,
+        $var_dir . _NOM_TEMPORAIRES_INACCESSIBLES,
+        _DIR_RACINE . _NOM_TEMPORAIRES_ACCESSIBLES
+);
+
+?>
-- 
cgit v1.2.3