| Commit message (Collapse) | Author | Age |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This merge fixes all conflicts but is otherwise untested and might break
funktionality in the auth system somewhere. It NEEDS MAJOR TESTING!
Some refactoring of the auth plugins is still needed:
* move to PHP5 style
* fix comments
* add plugin.info.txt
* janschumann/master:
Refactored auth system: All auth methods are now introduced as plugins.
Bugfix: auth types are now correcty added
Setup auth system from plugins
Added Auth-Plugin-Prototype to autoload
Load auth types from plugins in settings_authtype class
Added prototype for Auth-Plugins
added plugin type 'auth'
Conflicts:
inc/auth.php
inc/auth/pgsql.class.php
inc/init.php
inc/load.php
lib/plugins/auth.php
lib/plugins/authad/auth.php
lib/plugins/authldap/auth.php
lib/plugins/authmysql/auth.php
lib/plugins/authplain/auth.php
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* multiad:
lowercase groups
make AD utilitiy functions public
add user's domain to the list of groups
fixed domain handling in user names
some code cleanup/PHP5ization
use UTF-8 aware lower casing
Better support for multi domain AD setups
Conflicts:
inc/auth/ad.class.php
|
| | | |
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
* master:
allow selects in block forms
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This changes how the AD auth backend handles multiple domains. It is now
possible to configure multiple authentication domains even when not
using SSO. USers can provide a domain in NTLM- and Kerberos-Style
(prepended with a backslash, appended with a @-char).
IMPORTANT: If you used AD auth before, you will need to adjust your ACLs
and $conf['superuser'] settings.
This patch changes how user names are cleaned. Spaces and other special chars
are no longer removed. The only adjustment is lowercasing the username
and streamlining the domain handling.
User's login names will now contain the domain name in Kerberos style
(user@yourdomain.com) when they logged in a non-default domain. You need
to make sure your ACLs are setup accordingly.
Domain names are always lowercased and need to be specified lowercased
in the config.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* adldap4:
make use of adLDAP 4.0.4 in AD backend
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The new version of adLDAP improves the speed in handling recursive group
memberships dramatically
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
|/ / / / |
|
| | | |
| | | |
| | | |
| | | | |
This prevents buffering of the cache file output.
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes several problems:
- the CSS cache was only updated when either the CSS files for all media
types or one of the global files was modified
- when only the screen CSS was changed, the screen CSS was regenerated
but then the cache was printed which either caused duplicated screen
CSS output when gzip output was disabled or invalid output with gzip
enabled as first the plain text screen CSS and then the
gzip-compressed cache file was printed
Now first all CSS files are collected, then the cache is checked once
and only after this the CSS content is collected.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
this is a temporary and somewhat ugly fix. digest subscriptions should
make use of the inline format just as the 'every' subscriptions do.
But it makes sense to implement it correctly in the subscription branch
instead and not introduce new code in the RC.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The link doesn't exist in the English version and it doesn't work
anymore because appending a parameter to a link doesn't work when the
link is not just a URL but an HTML link
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes error messages about invalid plugin names for directories in
the plugin directory which didn't contain any plugin. Now the message is
only displayed for plugins which couldn't be loaded because of the
invalid name.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This simplifies a while loop in the js_compress() code. The
functionality of the new code is completely identical to the old code
but it uses less comparisons and according to FS#2593 it is thus a lot
faster.
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
According to the documentation the function was removed in PHP 5.4.0
though it still seems to exist in my PHP 5.4.6 installation.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes the problem that media items in the feed got the title of the
previous item when useheading was enabled as no metadata is loaded for
media entries and thus the previous metadata was used again. This also
fixes dates for media files.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
(How the hell did they get back in?)
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The height handling code was triggered before the width handling code
and thus the right pane was below the other panes during the height
calculations which caused strange effects. Now the height handling code
is called again after adjusting the width of the right pane.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes the section edit highlighting when the start marker (normally
a heading) is inside other HTML elements like a div from the wrap
plugin.
|
| | | |
| | | |
| | | |
| | | | |
old default template's description
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The problem with using include is that when the file that is loaded
does not contain the plugin class (e.g. because the directory name is
wrong), the file could be loaded again when the plugin class is
requested a second time which will lead to a fatal error because of
class redeclaration.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This partially reverts de50cad65ae679a602e71adddffdd74df7ea3fbb as the
strict check breaks existing plugins and this shouldn't be changed
without prior discussion and a warning for plugin authors with some time
to adjust their plugins. Now all characters that are valid in PHP class
names except "_" are allowed.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This adds more tolerance to the width calculations of the media manager
panes which avoids that the right pane is displayed below the other
panes.
|