Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
DisableKeyBindings in change password modal
Browse files Browse the repository at this point in the history
Update "About" action style & content
In Auth.multi, if there is a $regexp, search in all drivers
Recursive search: search with regexp
  • Loading branch information
cdujeu committed Jan 18, 2014
1 parent 8ce4a4b commit a609f72
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 14 deletions.
27 changes: 21 additions & 6 deletions core/src/core/doc/CREDITS.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
<img src="plugins/gui.ajax/PydioLogo250.png"/>
<div style="padding-left:10px;">Version __AJXP_VERSION__ - __AJXP_VERSION_DATE__

Copyright 2007-2013 Abstrium SAS
<div style="padding-left:10px;"><div style="font-size:0.8em;">Version __AJXP_VERSION__ - __AJXP_VERSION_DATE__
Copyright 2007-2014 Abstrium SAS
The latest code can be found at http://pyd.io/.
</div>
++ Getting Help ++
Pydio is an open source software distributed without warranties and 'as is'. If you are encountering a bug or unexpected behavior, a great community is ready to help, given you respect some basic guidelines.

[Configuration and Installation problems]
The most complete Administrator Guide can be found on http://pyd.io/administrator/. It covers most configuration topics, and is handfully completed with a detailed set of How-To's describing more specific problems : http://pyd.io/knowledge-base-2/knowledge-base/.

[Forum Help]
If you can't find your answers in the standards docs, you can post to the forum. PLEASE read the rules below to make sure we keep the forum readable and organized, and to ensure you a proper response time.
<ul>
<li>The STFF rule : Search The Forum First. There is a high probability that you answer is already there. Please, do not repost ten times the same question.</li><li>Gather as much data as possible about your environment: server OS, client OS, browser, Pydio version, PHP version, etc.</li><li>If you see an error in the interface, set the server in debug mode (see bootstrap_context.php) and use the Chrome Developer Tools to copy/paste the full error</li><li>Describe precisely what's happening, how one can reproduce it, etc.</li>
</ul>
Finally, with all that info gathered, post a topic with a clear and describing subject: avoid "I need help on Pydio", it's useless. Instead use "Upload problem with IE7 on Linux2.3". Please don't post issues directly in GitHub, unless you are invited to by a forum member.

[Pro Support]
As Pydio instances are often deployed in the enterprise world, we do provide a Professional Support offer based on annual subscription. Please go http://pydio.com/ to learn more.

++ LICENSE ++
++ License ++
Pydio is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
Expand All @@ -19,7 +34,7 @@ You should have received a copy of the GNU Affero General Public License
along with Pydio. If not, see <http://www.gnu.org/licenses/>.


++ CONTRIBUTORS ++
++ Contributors ++
Cyril Russo : public links generation
Panni (support for folder upload using jumploader, support for contextmenu in Opera)
German : panzaeron
Expand All @@ -28,7 +43,7 @@ Other translators : see mention in translation files
Shorten.multi plugin by Miguelon
Ultreia many fixes

++ THIRD PARTY LIBRARIES ++
++ Third Party Library ++
[Amazon S3]
S3 Stream Wrapper is released under the BSD license, Copyright 2011 P'unk Avenue LLC http://punkave.com/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@ public function recursiveSearchGroups($baseGroup, $term)
if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
echo AJXP_XMLWriter::renderNode($nodeKey, $groupLabel, false, $meta, true, false);
}
$this->recursiveSearchGroups(rtrim($baseGroup, "/")."/".$groupId, $term);
$this->recursiveSearchGroups(rtrim($baseGroup, "/")."/".ltrim($groupId, "/"), $term);

}

$users = AuthService::listUsers($baseGroup, $term);
$users = AuthService::listUsers($baseGroup, "^".$term);
foreach ($users as $userId => $userObject) {

$nodeKey = "/data/users/".trim($userObject->getGroupPath(),"/")."/".$userId;
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/auth.multi/class.multiAuthDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public function supportsUsersPagination()
// $baseGroup = "/"
public function listUsersPaginated($baseGroup, $regexp, $offset, $limit)
{
if (!empty($this->baseName)) {
if (!empty($this->baseName) && $regexp == null) {
return $this->drivers[$this->baseName]->listUsersPaginated($baseGroup, $regexp, $offset, $limit);
} else {
$keys = array_keys($this->drivers);
Expand Down
5 changes: 5 additions & 0 deletions core/src/plugins/editor.ajxp_role/class.RoleEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,11 @@ Class.create("RoleEditor", AbstractEditor, {
var passEl2 = passEl1.cloneNode(true);passEl2.down("div").update(MessageHash["ajxp_role_editor.30"] + ": "); passEl2.down("input").setAttribute("name", "pass_confirm");
pane.insert(passEl2);
pane.insert('<div class="SF_element" id="pwd_strength_container"></div>');
pane.select('input').invoke('observe', 'focus', function(){
ajaxplorer.disableAllKeyBindings();
}).invoke('observe', 'blur', function(){
ajaxplorer.enableAllKeyBindings();
});
modal.showSimpleModal(this.element.down("#pane-infos"),pane, function(){
var p1 = passEl1.down("input").getValue();
var p2 = passEl2.down("input").getValue();
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/ajxpclient_actions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
true, true);
]]></clientCallback>
<clientForm id="splash_form"><![CDATA[
<div id="splash_form" box_width="455" box_padding="0">
<div id="docDiv" style="padding:5px;overflow:auto;height:300px;">
<div id="splash_form" box_width="600" box_padding="0">
<div id="docDiv" style="padding: 5px;overflow: auto;height: 410px;font-size: 12px;line-height: 16px;">
<div class="dialogButtons" style="text-align:right;padding-right:6px;"><input type="image" src="AJXP_THEME_FOLDER/images/actions/22/dialog_close.png" width="16" height="16" class="dialogButton"/></div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4272,8 +4272,13 @@ div.menuActions img{
#docDiv div.subtitle
{
color: #5E7C90;
font-size:12px;
font-weight: bold;
font-size:25px;
}

#docDiv a
{
color: #39C0BE !important;
text-decoration: underline;
}

/********************************************/
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/themes/vision/css/allz.css

Large diffs are not rendered by default.

0 comments on commit a609f72

Please sign in to comment.