Overview
Comment:Fix local_login with automatic user id
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA1: a302e98a8ef13b142a86bc49b7d298588c5f7373
User & Date: bohwaz on 2020-11-30 21:08:12
Other Links: branch diff | manifest | tags
Context
2020-12-02
00:01
Use autocomplete="new-password" for password change check-in: ab3d150448 user: bohwaz tags: dev
2020-11-30
21:08
Fix local_login with automatic user id check-in: a302e98a8e user: bohwaz tags: dev
17:00
Give a type to transfers, debts and credits when migrating (if possible) check-in: c347cd4a83 user: bohwaz tags: dev, 1.0.0-rc3
Changes

Modified src/include/lib/Garradin/Membres/Session.php from [055409d884] to [db8cb5f1d1].

137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
	{
		$logged = parent::isLogged();

		if (!$disable_local_login && defined('\Garradin\LOCAL_LOGIN'))
		{
			$login_id = \Garradin\LOCAL_LOGIN;

			// On va chercher le premier membre avec le droit de gérer les membres
			if (-1 === $login_id) {
				$login_id = $this->db->firstColumn('SELECT id FROM membres
					WHERE id_categorie = (SELECT id FROM membres_categories WHERE droit_membres = ? LIMIT 1)
					LIMIT 1', Membres::DROIT_ADMIN);
			}

			if ($login_id > 0 && (!$logged || ($logged && $this->user->id != $login_id)))
			{
				$logged = $this->create($login_id);
			}







|


|







137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
	{
		$logged = parent::isLogged();

		if (!$disable_local_login && defined('\Garradin\LOCAL_LOGIN'))
		{
			$login_id = \Garradin\LOCAL_LOGIN;

			// On va chercher le premier membre avec le droit de gérer la config
			if (-1 === $login_id) {
				$login_id = $this->db->firstColumn('SELECT id FROM membres
					WHERE id_categorie IN (SELECT id FROM membres_categories WHERE droit_config = ?)
					LIMIT 1', Membres::DROIT_ADMIN);
			}

			if ($login_id > 0 && (!$logged || ($logged && $this->user->id != $login_id)))
			{
				$logged = $this->create($login_id);
			}