[commits] Horde branch develop updated. 741c4c4bbd56181890a9d2dbc58260a352d9090c
Michael M Slusarz
slusarz at horde.org
Fri Jun 8 20:44:09 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: 9b31a7c32147e5fd5798687e8f8e09d99bdb3b01
fc425e2 Rework javascript addition framework
0256f86 Move js files from Horde->Core
712056e Update package.xml
2f08a33 All Horde applications should share a single secret key.
741c4c4 Correctly regenerate secret key.
-----------------------------------------------------------------------
commit fc425e27ae7e5427c4bf8ca3db3821b47312f6a4
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 13:05:48 2012 -0600
Rework javascript addition framework
All script files added are now represented as a Horde_Script_File
object. Horde_PageOutput#addScriptFile() will do this automatically so
there is no need to change the current code.
Added Horde_Script_Package concept. Packages are collections of
javascript files/code needed to initialize the code on the browser.
ansel/lib/View/GalleryRenderer/Gallery.php | 8 +-
ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 21 +-
ansel/lib/View/Image.php | 14 +-
framework/Core/js/hordecore.js | 2 +-
framework/Core/lib/Horde.php | 2 +-
framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php | 3 +-
framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php | 3 +-
framework/Core/lib/Horde/Core/Editor/Ckeditor.php | 6 +-
framework/Core/lib/Horde/Core/Script/Package/Dialog.php | 34 +
framework/Core/lib/Horde/Core/Script/Package/Keynavlist.php | 27 +
framework/Core/lib/Horde/Core/Script/Package/Popup.php | 31 +
framework/Core/lib/Horde/Core/Tree/Renderer/Javascript.php | 16 +-
framework/Core/lib/Horde/PageOutput.php | 349 ++++++-----
framework/Core/lib/Horde/Script/File.php | 128 ++++
framework/Core/lib/Horde/Script/File/External.php | 70 ++
framework/Core/lib/Horde/Script/File/JsDir.php | 34 +
framework/Core/lib/Horde/Script/Files.php | 236 -------
framework/Core/lib/Horde/Script/List.php | 112 ++++
framework/Core/lib/Horde/Script/Package.php | 35 +
gollem/js/manager.js | 8 -
gollem/manager.php | 4 +-
gollem/templates/javascript_defs.php | 2 -
horde/js/dialog.js | 18 +-
imp/js/dimpbase.js | 10 -
imp/js/mailbox.js | 4 +-
imp/js/message.js | 2 -
imp/lib/Ajax/Imple/PassphraseDialog.php | 6 +-
imp/lib/Dynamic/Compose/Common.php | 3 +-
imp/lib/Dynamic/Mailbox.php | 5 +-
imp/lib/IMP.php | 2 +
imp/mailbox.php | 8 +-
imp/message.php | 3 +-
nag/task.php | 26 +-
33 files changed, 718 insertions(+), 514 deletions(-)
create mode 100644 framework/Core/lib/Horde/Core/Script/Package/Dialog.php
create mode 100644 framework/Core/lib/Horde/Core/Script/Package/Keynavlist.php
create mode 100644 framework/Core/lib/Horde/Core/Script/Package/Popup.php
create mode 100644 framework/Core/lib/Horde/Script/File.php
create mode 100644 framework/Core/lib/Horde/Script/File/External.php
create mode 100644 framework/Core/lib/Horde/Script/File/JsDir.php
delete mode 100644 framework/Core/lib/Horde/Script/Files.php
create mode 100644 framework/Core/lib/Horde/Script/List.php
create mode 100644 framework/Core/lib/Horde/Script/Package.php
http://git.horde.org/horde-git/-/commit/fc425e27ae7e5427c4bf8ca3db3821b47312f6a4
-----------------------------------------------------------------------
commit 0256f86df7a86dc3c7dbec40e6e5e19ca9a56f60
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 13:07:19 2012 -0600
Move js files from Horde->Core
Since these files are referenced in Core, they should live there.
framework/Core/js/accesskeys.js | 75 +
framework/Core/js/colorpicker.js | 453 +
framework/Core/js/dialog.js | 174 +
framework/Core/js/form_assign.js | 83 +
framework/Core/js/form_helpers.js | 202 +
framework/Core/js/growler-jquery.js | 84 +
framework/Core/js/growler.js | 277 +
framework/Core/js/horde-jquery.js | 123 +
framework/Core/js/horde.js | 210 +
framework/Core/js/image.js | 61 +
framework/Core/js/inplaceeditor.js | 464 +
framework/Core/js/jquery.mobile/images/ajax-loader.gif | Bin 0 -> 7825 bytes
framework/Core/js/jquery.mobile/images/ajax-loader.png | Bin 0 -> 340 bytes
framework/Core/js/jquery.mobile/images/icons-18-black.png | Bin 0 -> 1767 bytes
framework/Core/js/jquery.mobile/images/icons-18-white.png | Bin 0 -> 1806 bytes
framework/Core/js/jquery.mobile/images/icons-36-black.png | Bin 0 -> 3611 bytes
framework/Core/js/jquery.mobile/images/icons-36-white.png | Bin 0 -> 3648 bytes
framework/Core/js/jquery.mobile/jquery.js | 9266 +++++++++++++
framework/Core/js/jquery.mobile/jquery.min.js | 4 +
framework/Core/js/jquery.mobile/jquery.mobile.js | 7551 ++++++++++
framework/Core/js/jquery.mobile/jquery.mobile.min.css | 2 +
framework/Core/js/jquery.mobile/jquery.mobile.min.js | 177 +
framework/Core/js/keynavlist.js | 291 +
framework/Core/js/popup.js | 97 +
framework/Core/js/prototype.js | 7025 ++++++++++
framework/Core/js/redbox.js | 148 +
framework/Core/js/scriptaculous/builder.js | 136 +
framework/Core/js/scriptaculous/controls.js | 965 ++
framework/Core/js/scriptaculous/dragdrop.js | 974 ++
framework/Core/js/scriptaculous/effects.js | 1123 ++
framework/Core/js/scriptaculous/scriptaculous.js | 68 +
framework/Core/js/scriptaculous/slider.js | 275 +
framework/Core/js/scriptaculous/sound.js | 59 +
framework/Core/js/scriptaculous/unittest.js | 568 +
framework/Core/js/sorter.js | 111 +
framework/Core/js/tables.js | 262 +
horde/js/accesskeys.html | 31 -
horde/js/accesskeys.js | 75 -
horde/js/colorpicker.js | 453 -
horde/js/dialog.js | 174 -
horde/js/form_assign.js | 83 -
horde/js/form_helpers.js | 202 -
horde/js/growler-jquery.js | 84 -
horde/js/growler.js | 277 -
horde/js/horde-jquery.js | 123 -
horde/js/horde.js | 210 -
horde/js/image.js | 61 -
horde/js/inplaceeditor.js | 464 -
horde/js/jquery.mobile/images/ajax-loader.gif | Bin 7825 -> 0 bytes
horde/js/jquery.mobile/images/ajax-loader.png | Bin 340 -> 0 bytes
horde/js/jquery.mobile/images/icons-18-black.png | Bin 1767 -> 0 bytes
horde/js/jquery.mobile/images/icons-18-white.png | Bin 1806 -> 0 bytes
horde/js/jquery.mobile/images/icons-36-black.png | Bin 3611 -> 0 bytes
horde/js/jquery.mobile/images/icons-36-white.png | Bin 3648 -> 0 bytes
horde/js/jquery.mobile/jquery.js | 9266 -------------
horde/js/jquery.mobile/jquery.min.js | 4 -
horde/js/jquery.mobile/jquery.mobile.js | 7551 ----------
horde/js/jquery.mobile/jquery.mobile.min.css | 2 -
horde/js/jquery.mobile/jquery.mobile.min.js | 177 -
horde/js/keynavlist.js | 291 -
horde/js/popup.js | 97 -
horde/js/prototype.js | 7025 ----------
horde/js/redbox.js | 148 -
horde/js/scriptaculous/builder.js | 136 -
horde/js/scriptaculous/controls.js | 965 --
horde/js/scriptaculous/dragdrop.js | 974 --
horde/js/scriptaculous/effects.js | 1123 --
horde/js/scriptaculous/scriptaculous.js | 68 -
horde/js/scriptaculous/slider.js | 275 -
horde/js/scriptaculous/sound.js | 59 -
horde/js/scriptaculous/unittest.js | 568 -
horde/js/sorter.js | 111 -
horde/js/tables.js | 262 -
73 files changed, 31308 insertions(+), 31339 deletions(-)
create mode 100644 framework/Core/js/accesskeys.js
create mode 100644 framework/Core/js/colorpicker.js
create mode 100644 framework/Core/js/dialog.js
create mode 100644 framework/Core/js/form_assign.js
create mode 100644 framework/Core/js/form_helpers.js
create mode 100644 framework/Core/js/growler-jquery.js
create mode 100644 framework/Core/js/growler.js
create mode 100644 framework/Core/js/horde-jquery.js
create mode 100644 framework/Core/js/horde.js
create mode 100644 framework/Core/js/image.js
create mode 100644 framework/Core/js/inplaceeditor.js
create mode 100644 framework/Core/js/jquery.mobile/images/ajax-loader.gif
create mode 100644 framework/Core/js/jquery.mobile/images/ajax-loader.png
create mode 100644 framework/Core/js/jquery.mobile/images/icons-18-black.png
create mode 100644 framework/Core/js/jquery.mobile/images/icons-18-white.png
create mode 100644 framework/Core/js/jquery.mobile/images/icons-36-black.png
create mode 100644 framework/Core/js/jquery.mobile/images/icons-36-white.png
create mode 100644 framework/Core/js/jquery.mobile/jquery.js
create mode 100644 framework/Core/js/jquery.mobile/jquery.min.js
create mode 100644 framework/Core/js/jquery.mobile/jquery.mobile.js
create mode 100644 framework/Core/js/jquery.mobile/jquery.mobile.min.css
create mode 100644 framework/Core/js/jquery.mobile/jquery.mobile.min.js
create mode 100644 framework/Core/js/keynavlist.js
create mode 100644 framework/Core/js/popup.js
create mode 100644 framework/Core/js/prototype.js
create mode 100644 framework/Core/js/redbox.js
create mode 100644 framework/Core/js/scriptaculous/builder.js
create mode 100644 framework/Core/js/scriptaculous/controls.js
create mode 100644 framework/Core/js/scriptaculous/dragdrop.js
create mode 100644 framework/Core/js/scriptaculous/effects.js
create mode 100644 framework/Core/js/scriptaculous/scriptaculous.js
create mode 100644 framework/Core/js/scriptaculous/slider.js
create mode 100644 framework/Core/js/scriptaculous/sound.js
create mode 100644 framework/Core/js/scriptaculous/unittest.js
create mode 100644 framework/Core/js/sorter.js
create mode 100644 framework/Core/js/tables.js
delete mode 100644 horde/js/accesskeys.html
delete mode 100644 horde/js/accesskeys.js
delete mode 100644 horde/js/colorpicker.js
delete mode 100644 horde/js/dialog.js
delete mode 100644 horde/js/form_assign.js
delete mode 100644 horde/js/form_helpers.js
delete mode 100644 horde/js/growler-jquery.js
delete mode 100644 horde/js/growler.js
delete mode 100644 horde/js/horde-jquery.js
delete mode 100644 horde/js/horde.js
delete mode 100644 horde/js/image.js
delete mode 100644 horde/js/inplaceeditor.js
delete mode 100644 horde/js/jquery.mobile/images/ajax-loader.gif
delete mode 100644 horde/js/jquery.mobile/images/ajax-loader.png
delete mode 100644 horde/js/jquery.mobile/images/icons-18-black.png
delete mode 100644 horde/js/jquery.mobile/images/icons-18-white.png
delete mode 100644 horde/js/jquery.mobile/images/icons-36-black.png
delete mode 100644 horde/js/jquery.mobile/images/icons-36-white.png
delete mode 100644 horde/js/jquery.mobile/jquery.js
delete mode 100644 horde/js/jquery.mobile/jquery.min.js
delete mode 100644 horde/js/jquery.mobile/jquery.mobile.js
delete mode 100644 horde/js/jquery.mobile/jquery.mobile.min.css
delete mode 100644 horde/js/jquery.mobile/jquery.mobile.min.js
delete mode 100644 horde/js/keynavlist.js
delete mode 100644 horde/js/popup.js
delete mode 100644 horde/js/prototype.js
delete mode 100644 horde/js/redbox.js
delete mode 100644 horde/js/scriptaculous/builder.js
delete mode 100644 horde/js/scriptaculous/controls.js
delete mode 100644 horde/js/scriptaculous/dragdrop.js
delete mode 100644 horde/js/scriptaculous/effects.js
delete mode 100644 horde/js/scriptaculous/scriptaculous.js
delete mode 100644 horde/js/scriptaculous/slider.js
delete mode 100644 horde/js/scriptaculous/sound.js
delete mode 100644 horde/js/scriptaculous/unittest.js
delete mode 100644 horde/js/sorter.js
delete mode 100644 horde/js/tables.js
http://git.horde.org/horde-git/-/commit/0256f86df7a86dc3c7dbec40e6e5e19ca9a56f60
-----------------------------------------------------------------------
commit 712056e552d6caba8d21806fbcfe28b130d81f41
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 13:07:55 2012 -0600
Update package.xml
framework/Core/package.xml | 106 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 102 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/712056e552d6caba8d21806fbcfe28b130d81f41
-----------------------------------------------------------------------
commit 2f08a33963e958d43446ed841df1ba7a6ea5dd70
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 14:00:49 2012 -0600
All Horde applications should share a single secret key.
No reason to have separate secret keys. Also makes it easier to clear
the secret key when needed.
framework/Core/lib/Horde/Core/Factory/Secret.php | 2 +-
framework/Core/lib/Horde/Core/Factory/Token.php | 2 +-
framework/Core/lib/Horde/Core/Secret.php | 41 +++++++++++++++++
framework/Core/lib/Horde/Registry.php | 10 ++---
framework/Core/package.xml | 4 +-
framework/Kolab_Resource/lib/Horde/Kolab/Resource.php | 2 +-
gollem/lib/Auth.php | 9 ++--
gollem/lib/Factory/Vfs.php | 2 +-
horde/login.php | 2 +-
imp/lib/Auth.php | 4 +-
imp/lib/Crypt/Pgp.php | 4 +-
imp/lib/Crypt/Smime.php | 4 +-
imp/lib/Factory/AuthImap.php | 2 +-
imp/lib/Factory/Quota.php | 2 +-
imp/lib/Imap.php | 2 +-
mnemo/lib/Mnemo.php | 4 +-
16 files changed, 69 insertions(+), 27 deletions(-)
create mode 100644 framework/Core/lib/Horde/Core/Secret.php
http://git.horde.org/horde-git/-/commit/2f08a33963e958d43446ed841df1ba7a6ea5dd70
-----------------------------------------------------------------------
commit 741c4c4bbd56181890a9d2dbc58260a352d9090c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 14:23:08 2012 -0600
Correctly regenerate secret key.
Can't regenerate after authentication since password information will have
already been encrypted in the session. We should instead regenerate on
logout (in addition to initial visit to login page).
framework/Core/lib/Horde/Core/Auth/Application.php | 2 +-
framework/Core/lib/Horde/Registry.php | 17 -----------------
horde/login.php | 5 +++++
3 files changed, 6 insertions(+), 18 deletions(-)
http://git.horde.org/horde-git/-/commit/741c4c4bbd56181890a9d2dbc58260a352d9090c
More information about the commits
mailing list