kolab.org/www
Torsten Grote
grote at kolabsys.com
Wed Jun 20 14:48:07 CEST 2012
dev/null |binary
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/CHANGELOG.txt | 1113 ----
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/LICENSE.txt | 274 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/README.txt | 107
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.info | 14
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.install | 54
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.module | 1331 -----
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_comment.inc | 176
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_forum_list.inc | 327 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_forums.inc | 55
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_node.inc | 225
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/core-overrides.inc | 186
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/mark-read.inc | 103
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/advanced_forum.pages_default.inc | 25
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_container.handler | 133
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_forum.handler | 199
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_top.handler | 157
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/plugins.inc | 128
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/settings.inc | 180
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/style.inc | 381 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/template_preprocess_advanced_forum_topic_list_view.inc | 162
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/theme.inc | 533 --
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum.views.inc | 118
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_active_topics.view | 743 --
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_group_topic_list.view | 638 --
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_handler_field_node_topic_icon.inc | 42
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_handler_field_node_topic_pager.inc | 47
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_new_topics.view | 704 --
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_plugin_style_forum_topic_list.inc | 80
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_search.view | 347 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_search_topic.view | 313 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_topic_list.view | 656 --
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_unanswered_topics.view | 449 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_user_posts.view | 774 --
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/js/advanced_forum.js | 120
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/access/forum_container.inc | 68
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/access/forum_id.inc | 101
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/arguments/forum_id.inc | 98
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_legend.inc | 61
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_list.inc | 83
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_mark_read.inc | 62
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_most_active_poster.inc | 202
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_node_create_list.inc | 61
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_search.inc | 61
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_statistics.inc | 61
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_tools.inc | 61
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_legend.inc | 61
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_list.inc | 76
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_list_sort.inc | 65
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/contexts/forum.inc | 107
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/tasks/forum.inc | 151
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/advanced_forum.blue_lagoon.images.css | 269 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/advanced_forum.blue_lagoon.style.css | 237
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/blue_lagoon.info | 12
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/advanced_forum.blue_lagoon_stacked.style.css | 22
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/blue_lagoon_stacked.info | 13
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/advanced_forum.cloudless_day.images.css | 62
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/advanced_forum.cloudless_day.style.css | 223
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/cloudless_day.info | 12
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/advanced_forum.cloudless_day_stacked.style.css | 6
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/cloudless_day_stacked.info | 13
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.active-poster.tpl.php | 41
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.author-pane.tpl.php | 135
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.comment-wrapper.tpl.php | 39
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forum-legend.tpl.php | 32
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forum-list.tpl.php | 157
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forums.tpl.php | 53
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.group-topic-list-outer-view.tpl.php | 95
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.images.css | 104
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-preview.tpl.php | 83
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-repeated.tpl.php | 17
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-teaser.tpl.php | 83
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post.tpl.php | 128
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-forum.tpl.php | 24
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-result.tpl.php | 40
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-topic.tpl.php | 26
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.statistics.tpl.php | 43
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.structure.css | 464 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.submitted.tpl.php | 56
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-header.tpl.php | 45
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-icon.tpl.php | 25
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-legend.tpl.php | 18
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-list-outer-view.tpl.php | 102
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-list-view.tpl.php | 59
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-navigation.tpl.php | 34
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/naked.info | 11
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/advanced_forum.naked_stacked.author-pane.tpl.php | 138
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/advanced_forum.naked_stacked.structure.css | 75
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/naked_stacked.info | 11
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/advanced_forum.silver_bells.images.css | 269 -
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/advanced_forum.silver_bells.style.css | 237
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/silver_bells.info | 12
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells_stacked/advanced_forum.silver_bells_stacked.style.css | 26
kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells_stacked/silver_bells_stacked.info | 14
kolab.org/www/drupal-6.26/sites/all/modules/oauth/CHANGELOG | 49
kolab.org/www/drupal-6.26/sites/all/modules/oauth/LICENSE.txt | 274 -
kolab.org/www/drupal-6.26/sites/all/modules/oauth/README | 5
kolab.org/www/drupal-6.26/sites/all/modules/oauth/css/admin.css | 22
kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthClient.inc | 397 -
kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthConsumer.inc | 214
kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthDataStore.inc | 141
kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthRequest.inc | 56
kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthServer.inc | 27
kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthToken.inc | 242
kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/OAuthSignatureMethod_HMAC.inc | 65
kolab.org/www/drupal-6.26/sites/all/modules/oauth/lib/LICENCE.txt | 3
kolab.org/www/drupal-6.26/sites/all/modules/oauth/lib/OAuth.php | 882 ---
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.admin.inc | 611 --
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.authorizations.inc | 254
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.consumers.inc | 241
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.inc | 123
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.info | 26
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.install | 438 -
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.module | 565 --
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.pages.inc | 376 -
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_auth_level.tpl.php | 32
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_providerui.info | 15
kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_providerui.module | 191
kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6001.inc | 43
kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6002.inc | 19
kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6003.inc | 34
kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6100.inc | 65
kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6200.inc | 96
kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6201.inc | 55
kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6202.inc | 45
kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6300.inc | 78
kolab.org/www/drupal-6.26/sites/all/modules/tagging/LICENSE.txt | 274 -
kolab.org/www/drupal-6.26/sites/all/modules/tagging/README.txt | 1
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_extractor.inc | 173
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.info | 14
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.module | 48
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/AlchemyAPI.php | 555 --
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/AlchemyAPIParams.php | 630 --
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/README | 8
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/tagging_alchemy_suggest.info | 17
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/tagging_alchemy_suggest.module | 97
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_opencalais_suggest/tagging_opencalais_suggest.info | 27
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_opencalais_suggest/tagging_opencalais_suggest.module | 20
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/extractor_ng.inc | 100
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.admin.inc | 27
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.info | 15
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.module | 103
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_suggest/tagging_vocab_suggest.info | 15
kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_suggest/tagging_vocab_suggest.module | 15
kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.admin.inc | 27
kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.css | 103
kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.info | 15
kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.init.js | 7
kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.install | 24
kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.module | 267 -
kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.plugin.js | 259 -
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/LICENSE.txt | 274 -
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/README.txt | 166
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/css/taxonomy_manager.css | 466 -
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/csv_export.js | 34
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/doubleTree.js | 182
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/hideForm.js | 53
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/termData.js | 291 -
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/tree.js | 453 -
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/updateWeight.js | 233
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.admin.inc | 2582 ----------
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.info | 12
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.install | 44
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.module | 1136 ----
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/de.po | 654 --
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/fr.po | 353 -
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/ja.po | 341 -
kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/taxonomy_manager.pot | 632 --
168 files changed, 32269 deletions(-)
New commits:
commit dbc90cd4f10d9bc3e346fc400b6268f2207ff551
Author: Torsten Grote <grote at kolabsys.com>
Date: Wed Jun 20 14:47:50 2012 +0200
removed unused modules
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/CHANGELOG.txt b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/CHANGELOG.txt
deleted file mode 100644
index 97203f7..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/CHANGELOG.txt
+++ /dev/null
@@ -1,1113 +0,0 @@
-
-****************************** DRUPAL 6 - 2.x BRANCH ********************************
-
-March 24, 2011
---------------
-#1044322 by rcurtin, Michelle: Fixed topic listing icon not showing new posts on brand new topics.
-
-March 23, 2011
---------------
-#720118 by a.ross: Fixed bad search/replace that led to bad link on sub-subcontainers.
-#1096984 by Magilla: Fixed typo in description of unanswered posts view.
-#1094542 by thedavidmeister: Added sanity check for edge case that shouldn't happen where views_post_render is called without a style plugin present.
-#1098542 by lasac, troky: Fixed js bug with collapsible containers that broke in IE.
-#1102510 by Michelle: Changed order of if tests in hook_link to put faster check first.
-
-March 22, 2011
---------------
-#1096090 by Michelle: Initialized items property of $tables to avoid notices when a container is empty.
-
-March 6, 2011
--------------
-#291084 by a.ross: Made collapsible containers work with new HTML and with core jquery version.
-#291084 by WorldFallz: Added slide option to collapsible effects.
-#291084 by Michelle: Moved collapsible containers option to correct fieldset and fixed capitalization.
-
-March 4, 2011
--------------
-#720118 by Michelle, Troky: Redid forum listing page to handle subcontainers and forums better. This required CSS changes that led to more changes and so there's more here than is strictly related to the issue including re-parenting Blue Lagoon to Naked.
-NOISSUE by Michelle: Coder clean up.
-
-February 18, 2011
------------------
-#291084 by WorldFallz: Made collapsible containers work with core jquery version.
-
-February 14, 2011
------------------
-#868942 by __Sander__, Michelle: Added CSS for missed icon on first unread link.
-
-February 11, 2011
------------------
-#291084 by WorldFallz: Fixed most issues with collapsible containers.
-
-Feburary 5, 2011
-----------------
-#868942 by Michelle: Changed forum-folder and forum-icon to forum-list-icon to reflect the fact that the icon is not necessarily a folder.
-#1012238 by Michelle: Removed undead boxy and boxy_stacked that came back to life.
-#868942 by Michelle: Fixed lack of background behind forum list icon legend.
-#868942 by __Sander__: Added Comment Mover node links to list affected by AF's buttonizing.
-#1041402 by troky: Fixed table display on wide resolutions.
-
-January 27, 2011
-----------------
-#992428 by Michelle: Fixed mark as read so it's not displayed on containers and also made jump list use existing function to ensure access control maintained.
-#1042664 by troky: Fixed wrong variable in statistics caching.
-#1031712 by troky: Improved CSS to give structure to empty forums.
-#1041426 by __Sander__: Wrapped forum tools menu items in t().
-
-January 25, 2011
-----------------
-#935778 by troky, Michelle: Remove 'views' column when statistics not enabled.
-NOISSUE by Michelle: Removed topic icon from unsanswered view as it caused notices and served no purposes.
-#1031712 by Michelle: Gave structure to topic list empty view div to avoid layout issues when there are no topics in a forum.
-#1001524 by Michelle: Created content types for forum tools and node create list.
-#935322 / #1001524 by Michelle Got PM version in sync with non PM version.
-
-January 15, 2011
-----------------
-#291084 by WorldFallz: More tweaks to collapsable containers.
-#982604 by Michelle: Made 'post-by-viewer' class work with caching.
-NOISSUE by Michelle: Changed edit by theming so the Reason label doesn't print when no reason given.
-#892248 by Michelle, rodrigoaguilera: Added class for new comments. Node Comments already handles this.
-NOISSUE by Michelle: Simplified 'new marker' handling in the template by moving the logic to the preprocess.
-#525194 by Michelle: Added a note about why AP's existence isn't checked for in the views cache token rendering.
-#492794 by Michelle: Added teaser template to be used when the setting to style teasers is on.
-#1015118 by paolomainardi: Fixed hardcoded column span that was incompatable with taxonomy image.
-#291084 by Michelle: Did some clean up of the forum list template.
-#291084 by Michelle: Found and fixed bug introduced by collapsible containers patch that killed subforums.
-
-January 14, 2011
-----------------
-#291084 by WorldFallz: Corrected wrong js file name.
-
-January 13, 2011
-----------------
-#291084 by WorldFallz: Collapsed containers patch.
-#868942 by Michelle: Fixed link alter to respect style teaser setting.
-
-January 12, 2011
-----------------
-NOISSUE by Michelle: Minor template changes to keep all three modules in synch.
-#654718 by Michelle: Check if Panels is enabled before trying to build the forum displays to avoid errors when Page Manager is used without Panels.
-#866562 by Michelle, vladgur: Don't show any create content links if Forum Access doesn't allow it.
-#1012238 by Michelle: Removed Boxy and Boxy stacked as they were too close to Silver Bells and not as nice.
-#1012238 by Michelle: Added stacked version of Silver Bells.
-#1012238 by Michelle: Updated Cloudless Day with new style changes.
-#1012238 by Michelle: Few more minor style tweaks.
-#1012238 by Michelle: Made Silver Bells the default style.
-
-January 1, 2011
----------------
-#868942 by Michelle: Copied new image handling to other styles.
-1012238 by Michelle: Re-parented Blue Lagoon and Cloudless Day and made CSS adjustments to compensate.
-NOISSUE by Michelle: Removed translations.
-
-December 25, 2010
------------------
-#1004738 by Zarabadoo: New bell icons for Silver Bells style.
-
-December 21, 2010
------------------
-NOISSUE by Michelle: Fixed bad AP call when rendering tokens.
-#1004738 by Michelle: Added new style 'Silver Bells'.
-NOISSUE by Michelle: Made a few changes to the AP template to accomodate new styling.
-#868942 by Michelle: Massive changes to image handling.
-
-December 17, 2010
------------------
-#559536 by Michelle: Fixed notice due to type not being passed from advanced_forum_link into check if object is styled.
-#995036 by Michelle: Moved new topics link to separate line and added 'View' in front to make it clearer what it links to.
-
-December 11, 2010
------------------
-#994842 by Michelle: Cleaned up and stripped down post preview template.
-#559536 by Michelle: Fixed a bunch of notices due to variables not being defined before use.
-#720118 by Michelle: Added more comments and did a little clean up to the forum list.
-
-December 7, 2010
-----------------
-#974840 by Michelle: Fixed CSS / HTML so topic header links aren't floating around messily.
-#974840 by Michelle: Fiddled a bit more with the CSS.
-#933862 by Michelle: Added new permission to view post edited message and excluded it from the NC cache.
-#982604 by Michelle: Added core signatures to cache avoiding tokens. Impossible to do with SfF because it needs too much node info.
-
-December 4, 2010
-----------------
-#982238 by Michelle: Forced 'New topic' to first in list of node creation links.
-#982238 by Michelle: Added ability to get nodes allowed in a particular vocabulary and set up stub for per term.
-#974840 by Michelle: Redid 'Post reply' link handling.
-NOISSUE by Michelle: Created new theme function theme_advanced_forum_l() to centralize link printing and give themers more control.
-NOISSUE by Michelle: Expanded statistics to show last 5 new users.
-#868942 by Michelle: Fixed node links to only buttonize specific ones so it doesn't try to buttonize the tags.
-NOISSUE by Michelle: Lots of cleanup, fixing, re-arranging, simplifying code.
-#961050 by designerbrent: Made forum 'folder' CSS more specific to avoid themes overriding it.
-#869006 by carlthuringer, Michelle: Changed @ to ! in topic navigation t() to avoid a second run through check_plain.
-#829540 by Michelle: Added sanity check on teaser split removal to avoid edge case error.
-
-December 2, 2010
-----------------
-#935322 by Michelle: Fixed node add links being relative.
-#935322 by Michelle: Fixed unclosed 'a' causing wonkiness.
-NOISSUE by Michelle: Fixed missing t() on View Forums tab.
-#868942 by Michelle, WorldFallz: Added CSS for image-less button to boxy. More of an example than anything at this point as it's likely to be changed.
-#868942 by Michelle: Removed all language dependent button images.
-#868942 by Michelle: Added small AF buttons to boxy CSS only example and made the colors a bit better.
-
-November 17, 2010
------------------
-#559536 by troky, Michelle: Fixed $vars/$variables mixup in the topic list view include and removed the extra <br> from the last author field rewrite that had been compensating.
-#831364 by Michelle, Heine: Reverted changing form alter paramater to pass by value that shouldn't have been done.
-
-November 16, 2010
------------------
-NOISSUE by Michelle: Removed unneeded CSS left over from before Views was a dependency.
-#868942 by Michelle: Changed new content links to use divs instead of a link and added button code.
-#935322 by Michelle: Moved what was 'secondary links' into a 'forum tools' jump menu.
-#935322 by Michelle: Switched tabs to being on by default.
-#868942 by Michelle: Changed to new HTML for buttonized links, removed old CSS, and replaced with skeleton CSS.
-#868942 by Michelle: Added jump to top button to the list of buttonized links.
-
-November 14, 2010
------------------
-#933862 by Michelle: Restored compatability with the Comment Edited module that was inadvertantly lost.
-
-October 14, 2010
-----------------
-#868942 by Michelle: Redid image handling on pseudo buttons to use background image with actual text on top instead of image replacement.
-
-October 8, 2010
----------------
-#933862 by Michelle: Added 'last edited' note based on node revisions. Changed Commented Edited integration to make use of new variable.
-NOISSUE by Michelle: Fixed missing print statement around unpublished post note.
-
-October 4, 2010
----------------
-#905860 by Michelle: Ensure advanced_forum_get_forum_types returns an array()
-#876294 by RedKing: Updated French translation.
-NOISSUE by Michelle: Made submit button IDs more specific on searching. Tangently related to #883452.
-#883452 by rodrigoaguilera: Added a specific ID to the topic list sort form.
-NOISSUE by Michelle: Changed 'search' buttons to 'search forum' and 'search topic'.
-NOISSUE by Michelle: Added message about unpublished post to post template.
-NOISSUE by Michelle: Fixed bug with new comment jump link on topic not working with nodecomment.
-
-September 23, 2010
-------------------
-#376039 by Michelle with thanks to NowPublic for code reference: Added 'in reply to' for core comments.
-#376039 by Michelle with thanks to NowPublic for code reference: Added 'in reply to' for node comments.
-#913822 by Michelle, meustrus: Changed sorting so updates only bump on the New & My views.
-NOISSUE by Michelle: Many tweaks to the included views.
-NOISSUE by Michelle: Added setting to turn on local tabs for the stand alone included views.
-
-September 22, 2010
-------------------
-#829456 by Michelle, meustrus: Added Permalink integration.
-NOISSUE by Michelle: Cleaned up node and comment preprocessing including starting #1 at the node, fixing bad logic in the class collection, re-arranging in display order, and more.
-#525194 by Michelle: Removed Author Pane dependency.
-#751890 by Michelle: Missed removing advanced_forum.naked.topic-list.tpl.php when Views was made a dependency.
-#725720 by ltwinner: Added variable for reply link to node preprocess.
-
-September 21, 2010
-------------------
-#868550 by enzipher, szantog: Added missing brackets in query.
-#872294 by merlinofchaos, jeckman: Fixed query part of link for forum views so they can take multiple forum arguments.
-#857982 by aenw: Checked if $added is empty rather than !$added.
-#908938 by Michelle: Changed how check for node's being displayed as a teaser works.
-
-August 26, 2010
--------------
-#850508 by Michelle: Updated Author Pane template.
-NOISSUE by Michelle: Author Pane tokenizing should not happen on topic starting node.
-
-July 11, 2010
--------------
-#768348 by Michelle: Fixed node comment incompatability with new link alter.
-
-July 9, 2010
-------------
-#571114 by Michelle: Added ability to disable the breadcrumb setting by AF to avoid incompatibility with custom breadcrumbs.
-#848964 by vladgur: Fixed 'My posts' view which wasn't showing replies to a topic started by another user.
-
-July 8, 2010
-------------
-#768348 by Michelle: Moved node/comment link handling to hook_link and hook_link_alter.
-#547824 by Michelle: When deleting a node from the node links, it now goes back to the front page like in core.
-#757804 by G-son, Michelle: Added back in code for 'new' markers on replies when using core comments that was accidentially removed when making it compatable with node comments.
-#831364 by Michelle, smerrill: Removed & from form_state paramater in form_alter to make php 5.3 happy.
-#559536 by Michelle: Fixed notices.
-#751890 by Michelle: Removed legacy code that was replaced by Views.
-#736802 by Michelle: Organized code.
-
-July 5, 2010 - ALPHA 3
-------------
-#821744 by Michelle: Updated Author Pane integration to work with beta 1.
-#830102 by merlinofchaos: Added setting for 'Inject hierarchy of first term into breadcrumb trail' to forum page.
-#832286 by Scyther: Allow users to see a signature in an input format they don't have access to.
-
-May 27, 2010
-------------
-#787454 by berdir, mikey_p, merlinofchaos, and Michelle: Fixed error in SQL that caused new posts to be counted twice if revisions were on when the node was moved to another forum.
-#801260 by dereine: advanced_forum_statistics_replies performance improved.
-
-May 24, 2010
-------------
-#807742 by Michelle: Started work on documenting the templates.
-
-May 11, 2010
-------------
-#793020 by Michelle: Fixed issue with no-style-name template file not being found.
-#793664 by crea: Fixed Author Pane not showing on nodecomment reply preview.
-#622670 by neclimdul: Fixed clipped folder icons when no posts in forum.
-
-May 10, 2010
-------------
-#697234 by ericduran, nenne: Fixed issue with ampersand encoding in subforum list.
-#791956 by friolator: Fixed missing closing bracked on comment anchor.
-#583674 by Michelle: Confirmed and fixed regression with views column and 0 views.
-#755940 by Michelle: Removed (hopefully!) unneeded a id forum-reply-NNN and removed suspected bad copy/paste line.
-#769954 by Michelle, gege2061: Make sure there is a body field before trying to form alter it. Silly poll. :P
-
-March 24, 2010
---------------
-#741902 by Michelle: Added "forum" as a default type to be styled if settings form has never been submitted.
-
-March 23, 2010
---------------
-#687196 by iva2k, merlinofchaos, SupermanScott: Changed loading of views to use require instead of require once and use the view name instead of the filename.
-#492794 by Michelle: Now themes the node preview for forum nodes.
-#492794 by Michelle: Fixed issue where $node->teaser in manually loaded node prevented comment previews from being themed when on their own page.
-#751890 by Michelle: Made Views a dependency.
-#738074 by yaslama: Adapted version of the core patch on [#113611].
-#702128 by Michelle: Added checks for nodecomment around search views as well as link to my posts view in secondary links.
-#692900 by Michelle, marcus0263: Fixed regression with #forum-topic-top link.
-
-March 8, 2010
--------------
-#736798 by Michelle: Added setting that will switch on a default local task for the main forum listing.
-NOISSUE by Michelle: Split out fetching the mark read link as its own function to make it easier to use independent of the secondary links.
-NOISSUE by Michelle: Added CTools content type for mark read.
-
-January 14, 2010
-----------------
-#655128 by sanduhrs: Fixed missed closing bracket.
-#658706 by ssm2017 Binder: Added missing t().
-
-November 16, 2009
------------------
-NOISSUE by Michelle: Small fixes to make nodecomment previews work better.
-
-November 9, 2009 -- ALPHA 2
------------------
-#627808 by Michelle: Account for insconsistancy in nodecomment's handling of the comment anchor link.
-
-October 25, 2009
------------------
-#492794 by Michelle: Rewrote code that determines what AF applies a style to.
-#586652 by Michelle: Removed modification to $submitted.
-
-October 21, 2009
------------------
-#568422 by Michelle: Removed 'My topics' view and made 'My posts' much better.
-#568422 by Michelle: Made 'My posts' view use forum topic list style
-
-September 6, 2009
------------------
-#561448 by Michelle: Fixed problem with active forum topics topic titles not linking.
-#542998 by Michelle: Moved user picture handling to Author Pane.
-
-September 3, 2009
------------------
-#561448 by Michelle: Cleaned up all the views except user topics/posts and the searches.
-
-August 28, 2009
----------------
-#510772 by Michelle: Added form alter so AF's OG topics view can be used as a group's RON.
-#561448 by Michelle: Made unanswered topics view make more sense.
-
-August 27, 2009
----------------
-#545590 by Michelle: Removed dependency in CSS on markup being within a #forum div.
-
-August 24, 2009
----------------
-#538344 by merlinofchaos: Added view of a user's topics.
-#537822 by Michelle, stephthegeek: Added forum-topic-title class to title in topic listing. Also fixed spacing on items in topic listing.
-
-August 22, 2009
----------------
-#551548 by Michelle, crea: Added check to make sure links array isn't empty before iterating through it.
-#537018 by bas.hr: Removed typo extra . in class name.
-
-August 10, 2009
----------------
-NOISSUE by merlinofchaos: Add a sort widget for the forum topic list that utilizes the tablesort headers.
-NOISSUE by merlinofchaos: Add a time period plus role exclusion to the most active poster pane.
-
-August 3, 2009
---------------
-NOISSUE by merlinofchaos: Add a "most active poster" block and a view of "My forum posts" to easily follow what a person has posted.
-
-August 2, 2009
---------------
-NOISSUE by Michelle: Fixed notices.
-#413494 by Michelle, snufkin: Added support for commend edited message in the post template.
-#479124 by Michelle: Merged some topic list preprocessing into advanced_forum_get_topics and cleaned up topic list when views is not enabled.
-
-August 1, 2009
---------------
-#528480 by Michelle: Added extra divs around topics / latest user on statistics for seperate styling.
-#436084 by MGParisi: Reduced size of some Blue Lagoon images.
-#537018 by Michelle: Indented subbody of statistics in Naked and removed indenting from Boxy/Cloudless Day
-#537018 by Michelle: Added a margin to the right of the post reply button on top of topics to Naked.
- Put padding around .forum-post-content and .forum-post-title in Naked.
- Added boxes around .forum-top-post-footer and .forum-topic-navigation in Boxy.
- Made post number white on Boxy and Blue Lagoon.
- Added odd/even table shading to Boxy as well as borders around the TDs.
-#537018 by Michelle: Added span around 'subforums' label so it can be styled.
- Made .forum-table a generic class for both types of tables and added .forum-table-forums and .forum-table-topics.
- Made classes in forum tables more specific.
-#518110 by Michelle: Documented the chunk of code in the post .tpl there to keep the new markers from being cached.
-
-July 31, 2009
--------------
-#524592 by Dave Reid: Added email to fake user object sent to Author Pane on comments for anon users.
-#534816 by Michelle: Made sure all classes / IDs were forum specific.
-NOISSUE by Michelle: Added a page preprocess to add a variable "forum_page" when a page is either the main forum/ pages or a node that can go in the forums.
-#497450 by Michelle: Fixed not working image replacement on node links.
-#537018 by Michelle: Made Cloudless Day Stacked the default style since it's the nicest one.
-
-July 30, 2009
--------------
-#525206 by Michelle: Fixed error with search results template not being found.
-#531572 by Michelle: Fixed error that caused incorrect 'new posts' amounts on forum overview.
-#267859 by Michelle: Bypassed core forum list preprocess to avoid running forum title thru check_plain twice and also remove redundant code.
-#502466 by neclimdul: Mark as read improvements.
-
-July 29, 2009
--------------
-#510772 by Michelle: Added group topic list view and outer template.
-#534816 by Michelle: Changed top anchor to forum-topic-top to avoid conflicts with some themes.
-#527020 by merlinofchaos: Panelize advanced forum. This introduces a "task" or a system page
- for Panels for the forum page. It introduces 3 default handlers
- for that page which cover the top page, a forum container page
- and a forum topic list page. It includes a bunch of panels/ctools
- plugins in order to cover all this content and makes it possible
- to change the layout and easily add/remove content to these pages.
-#533818 by merlinofchaos: Allow styles to use preprocesses.
-
-July 28, 2009
--------------
-#520758 by merlinofchaos: Allow forums not in containers to have a fake container so they still render okay.
-
-July 23, 2009
--------------
-#497450 by Michelle: More work on the text replacement images.
-
-July 21, 2009
--------------
-#523422 by Michelle: Fixed wrong location variable name.
-
-July 20, 2009
-------------
-#523942 by Michelle: Normalized table widths on forum listing.
-#520694 by Michelle: Improved layout on narrow themes.
-NOISSUE by Michelle: Many small changes to styles, fixing layout, markup and style, making Naked nakeder, etc.
-#523958 by merlinofchaos: Added new style Cloudless Day.
-#525460 by Michelle, robertdjung: Removed extra slash from CSS path.
-#523958 by Michelle, merlinofchaos: Small change to sats borders in CD.
-
-July 15, 2009 -- ALPHA 1
-------------
-#276577 by Michelle: Added taxonomy image support for main forum listing.
-NOISSUE by Michelle: Lost adding in $node_classes / $comment_classes when I restructured the $classes variable. Putting that back.
-
-July 14, 2009
-------------
-#497450 by Michelle: Changed topic legend classes to match classes in topic icons themselves. The names aren't as clear but it's more consistant.
-#497450 by Michelle: Cleaned up and re-organized image css, including removing all images from Naked's CSS except forum folder / topic icons.
-NOISSUE by Michelle: Cleaned up Author Pane of stacked styles.
-NOISSUE by Michelle: More cleaning up of blue lagoon stacked. Also made it the default style since it looks most like modern forums.
-
-July 13, 2009
-------------
-#500988 by Michelle: Now works without nodecomment.
-#500988 by Michelle: Some work on getting AF to work without NC.
-NOISSUE by Michelle: Various notice fixes.
-#497450 by Michelle: More work on Author Pane image conversion.
-#512222 by Michelle: Fixed typo preventing 'submitted' template from being found.
-#515966 by Michelle: Moved topic navigation out of node content and down to bottom of topic.
-NOISSUE by Michelle: Fixed post reply button incorrectly showing up at the bottom of topic when using nodecomment.
-NOISSUE by Michelle: Made the pager at the bottom of a topic look better in blue lagoon.
-#483544 by Michelle: Copied code from Nodecomment to remove the teaser splitter.
-NOISSUE by Michelle: Added functions to return node types that can be in a forum and tell if a given node type is in the forum.
-
-July 8, 2009
-------------
-#512222 by Michelle: Added in Naked as an automatic base theme for templates to avoid errors if a style does not include templates.
-#512222 by Michelle: Changed over to using style name in template files to avoid problems with styles defined by themes.
-
-July 5, 2009
-------------
-#383116 by Michelle: Added terms to post and added new top post footer to hold them.
-#268421 by Michelle: Added edit/delete links to nodes of types that can be in the forums. Thanks to nodecomment for some of the code.
-
-July 4, 2009
-------------
-NOISSUE by Michelle: Moved around the forum legend & link lists to reduce clutter and organize them better on the page.
-#509878 by Michelle: Fixed broken link on 'post reply' with help from marsilainen on IRC.
-NOISSUE by Michelle: Switched order of links div and search div to line them up better on the main forums page.
-#509716 by Michelle, merlinofchaos: Fixed problem with views not getting style applied.
-#497450 by Michelle: Made translated images work. Moved all images into new directories.
-NOISSUE by Michelle: Cleaned up the id/class printing on post template.
-#497450 by Michelle: Added the language class to the topic header and comment wrapper.
-
-July 3, 2009
-------------
-#497450 by Michelle: More fixes for link lists including some renaming and repositioning.
-#497450 by Michelle: Removed setting options for images since this is all handled via# CSS now.
-
-July 1, 2009
-------------
-#497450 by Michelle: Changed to a better image replacement technique that works if images are disabled.
-
-June 25, 2009
--------------
-#497450 by Michelle: reply, edit, delete node links now working.
-#501616 by Michelle, neclimlap: Stripped the tags from the teaser for the title popup.
-#501616 by Michelle, neclimlap, merlinofchaos: More fixes for the title popup.
-#501616 by merlinofchaos, Michelle: Changed over to doing the whole popup in the view. Left old way in as an alternate.
-#502370 by neclimdul: E-ALL fixes.
-#470202 by tom_o_t, merlinofchaos: Changed mark all read to look at node changed instead of node created to fix weird edge cases.
-
-June 24, 2009
--------------
-NOISSUE by merlinofchaos: Made blue lagoon pager smaller and italic.
-#500978 by Michelle: Got topic list icons working. The reports of their functionality have been greatly exaggerated.
-NOISSUE by Michelle: Put the functions in theme.inc into a more logical order so I can find things.
-#497450 by Michelle: Changed how forum links are handled. Split core links and added links into two and removed theme_links from reply button.
-#497450 by Michelle: More work on the image replacement. Node links are still not right.
-#290327 by merlinofchaos: Add "active topics" view (only for all forums), add "Forum" column to unread, unanswered and active views, and make unread only visible to logged in users.
-
-June 23, 2009
--------------
-#497450 by Michelle: Images on the forum list page converted to CSS.
-#497450 by Michelle: Topic list page images converted.
-NOISSUE by merlinofchaos: Fix a bug causing Views to think default Views are in the database.
-#290327 by merlinofchaos: Add views and links for unread and unanswered posts
-NOISSUE by merlinofchaos: pager on top and bottom of topic list view
-
-June 22, 2009
--------------
-#497474 by Michelle: Rewrite of the style system that adds a dependency on CTools as well as substyles. Adjusted all included styles to take advantage of that.
-
-June 21, 2009
--------------
-#219549 by Michelle: Made subforum list generation into a theme function.
-NOISSUE by Michelle: Small style fixes.
-
-June 20, 2009
--------------
-#303544 by Michelle: Added popup preview of post in topic list.
-#462502 by Michelle: Seperated each container on the forum list into its own table.
-#219549 by Michelle: Moved subforums into comma seperated list.
-#312958 by Michelle: Show container description on container pages.
-
-June 18, 2009
--------------
-#484052 by merlinofchaos: Made forum topic list view work with new forum topic list style and also added sticky and shadow post changes.
-#484052 by Michelle: Fixed up the topic list pager & the #new.
-#484052 by Michelle: Moved topic list view preprocess to its own .inc
-#484052 by Michelle: Improved shadow topics including adding a new theme function for them.
-#484052 by Michelle: Added "Sticky:" label and changed background color.
-
-June 17, 2009
--------------
-#494642 by merlinofchaos: Integrate better with new Views post rendering
-NOISSUE by merlinofchaos, Michelle: Fixed two typos with _advanced_forum_preprocess_forum_topic_list.
-#474552 by webchick: Default forum menu link to enabled.
-
-June 16, 2009
--------------
-#492922 by conchur: Fixed typo in comment preprocess.
-
-June 15, 2009
--------------
-#489044 by Michelle: Split code up into smaller files both to reduce memory requirements and to make it easier to navigate the code.
-#491692 by neclimdul: Removed typo'd backslash.
-#472736 by Michelle, merlinofchaos: Made jump to last post work with nodecomment.
-NOISSUE by Michelle: Code clean up, more comments added.
-#472736 by Michelle: Made topic icon recognize new posts in nodecomment.
-NOISSUE by Michelle: Added update to set AF's weight to 15. This is needed for the views to work and was missed on earlier commits.
-#492590 by merlinofchaos: Wrench comment wrapper back from the clutches of the evil Garland.
-#483408 by neclimdul: Notices cleanup.
-
-June 14, 2009
--------------
-#484052 by Michelle: Prevent original topic list page from being created when views is enabled.
-
-June 9, 2009
-------------
-#484052 by Michelle, merlinofchaos: Created view for topic lists.
-#484052 by Michelle: Added topic pager.
-
-June 8, 2009
-------------
-NOISSUE by Michelle: Some cleanup on the node/comment preprocesses.
-#472736 by Michelle, merlinofchaos: Made "new posts in forum" work with nodecomment and also made comment version more efficient.
-
-June 7, 2009
-------------
-#460734 by MGParisi: Removed typo'd extra space.
-#473336 by Michelle: Changed to custom version of comment_new_page_count to make it easier to use the NC version when it is ready.
-
-June 5, 2009
-------------
-#481278 by merlinofchaos: Added search views to forums and individual topics.
-
-June 4, 2009
-------------
-#473336 by Michelle: Made post count in statistics work with nodecomment and also added caching.
-
-June 3, 2009
-------------
-#473336 by Michelle: Made post topic button on top/bottom work properly.
-
-June 1, 2009
-------------
-#473336 by Michelle, merlinofchaos: Made new replies counting compatable with nodecomment.
-#472736 by Michelle: Recognize nodecomment reply posts as "comments".
-
-May 29, 2009 -- START OF 2.x BRANCH
-------------
-NOISSUE by Michelle: Synched up with changes made to 1.x since branching.
-NOISSUE by Michelle: Renamed templates and other instances of advf- and advforum to use the proper name.
-
-April 4, 2009
--------------
-#422652 by NeoID: Closed tag on break in advanced_forum-forum-legend.tpl.php
-
-March 31, 2009 -- 6.x-1.0
---------------
-#419782 by Michelle: Fixed wording on time ago/actual date option as it was backwards.
-
-March 30, 2009
---------------
-#412906 by Michelle: Fixed typo in the author pane template and cleaned up comments.
-
-March 21, 2009
---------------
-#402352 by Michelle: Removed logic to print user title image. Variable is still there.
-#408006, #397860 by Michelle: Changed online/offline default to be small icon plus words.
-#365578 by joostvdl: Added ability to have language specific image directories.
-
-March 4, 2009
--------------
-#384180 by Michelle: Switched file format to UTF-8 [This failed to update in CVS]
-#373371 by Michelle: Synched up Author Pane template and updated CSS for Author Pane.
-
-March 3, 2009 -- RC 3
--------------
-#375187 by nbz: Fixed switched variable name that caused fallback to Garland rather than the default theme.
-#388504 by pebosi: Updated German translation.
-
-February 26, 2009
------------------
-NOISSUE by Michelle: Fleshed out the readme.txt file more.
-#373371 by Michelle: Syncing up Author Pane.
-
-February 25, 2009 -- RC 2
------------------
-#375187 by Michelle: Fall back to default site theme when $theme not set.
-#374009 by rastatt at drupal.org: Updated German translation.
-#260397 by BlackNexus: Updated Spanish translation.
-#256174 by seals: Updated Swedish translation.
-
-February 20, 2009
------------------
-#376540 by Michelle: Passed all image file names through t() to make them translatable as suggested by klavs.
-
-February 11, 2009 -- RC 1
-----------------
-#303548 by Michelle: Added default avatar support to custom user picture function and also linked to profile.
-#361407 by black silence: Updated German translation.
-#310547 by Michelle: Organized and cleaned up settings page.
-
-February 9, 2009
-----------------
-#370422 by Michelle, merlinofchaos: Hopefully the last fix to get around path_to_theme's flakiness.
-#371859 by lamigo: Fixed postgress error.
-
-February 8, 2009 -- BETA 2
-----------------
-NOISSUE by Michelle: Check to make sure $links isn't empty before iterating thru it. Thanks to ghankstef for testing.
-
-February 7, 2009
-----------------
-#315972 by Michelle: Finished the reply link theming started yesterday.
-#369078 by lamigo: Fixed postgres errors.
-#370422 by Michelle: Replaced path_to_theme with my own function that always has the path to the actual site theme.
-#367496 by Michelle: Added check for link text when buttonifying.
-
-February 6, 2009
-----------------
-#315972 by Michelle: Separated out topic header into its own theme file and made the reply link a themeable function.
-
-February 4, 2009
-----------------
-#367481 by Michelle: Fixed up statistics including changing to use theme_username.
-
-February 3, 2009
-----------------
-#366301 by Michelle, ipwa: Fixed author pane layout on stacked styles.
-#365491 by Michelle, bouton: Cleaned up legend markup / css.
-
-January 27, 2009
-----------------
-#315972 by Michelle: Small fix to link to jump to last post.
-NOISSUE by Michelle: Making coder happy.
-NOISSUE by Michelle: Updated readme with Author Pane dependency.
-
-January 26, 2009
-----------------
-#102743 by yoroy: Updated topic icons.
-#363061 by Michelle, paulcouture: Eliminated duplicate users from statistics.
-Style clean up. Fixed #364385 and #360888 along the way.
-
-January 23, 2009
-----------------
-#303548 by Michelle: Added imagecache support for forum avatars.
-
-January 22, 2009
-----------------
-#360897 by RedKing: Added french translation.
-#352945 by Michelle, Heine: Added check that user is confirmed for last user in statistics.
-#351390 by Matafleur: Allow treat as forum post override to set item to _not_ be treated as a forum post.
-#328029 by Michelle: Added updated label in topic list.
-#328029 by Michelle: Added new label as well.
-
-January 18, 2009
-----------------
-#303564 by Psicomante, Michelle: Added legend for forum icons.
-
-January 16, 2009 -- BETA 1
-----------------
-#354704 by Michelle: Added check to be sure template is in use before adding the module path to it.
-#351395 by elfur: Added missing t() around link to top.
-#338722 by catch: Fixed bug in mark topics as read.
-NOISSUE by Michelle: Removed unneeded js file.
-#357361 by ron_s: Fixed created column class name.
-
-December 27, 2008
------------------
-NOISSUE by Michelle: Removed author pane preprocess and switched to passing the template in the theme call.
-NOISSUE by Michelle: Moved main author pane div from post template to author pane template & generally updated template.
-
-
-December 21, 2008
------------------
-#343853 by Michelle: Removed author pane code. This marks the start of dependency on the new author pane module.
-
-December 16, 2008
------------------
-#315972 by Michelle: Initial commit of jump to last post. Needs clean up and porting to D5.
-
-December 12, 2008 -- ALPHA 16
------------------
-#330000 and #328800 by Michelle: Redid image handling to ensure all images have alt text. Also made it possible for link images to be picked up automatically if they have a file name that matches the link key.
-#344697 by Michelle: Added permission to view statistics and also broke out statistics into its own template.
-
-December 11, 2008
------------------
-#345908 by Michelle: Fixed profile integration to account for change in core in D6.
-NOISSUE by Michelle: Fixed up author pane template comments and added facebook_status variable.
-#343848 by Michelle: Added variable for fasttoggle to author pane.
-
-December 9, 2008
-----------------
-NOISSUE by Michelle: Made 'naked' the base style so all other styles only need to include changed files.
-
-December 8, 2008
-----------------
-#320635 by Michelle: Added logic to 'treat as forum post' to account for reply pages. CSS is now loaded whenever AF determines the content is to be treated as a forum post.
-#320635 by Michelle: Improvements on theming reply pages, including using a seperate template for previews.
-#338268 by marcingy: Added option to set length of abbreviated topic title on forum overview.
-#338268 by Michelle: Added option to set 'time ago' cutoff.
-#303563 by Michelle: Clear readpath when marking read. (Outside module integration.)
-Redid table headers on topic list pages in an attempt to fix #334198 . Turned out not to be the problem but I like the new method better so am committing it anyway. Won't backport to D5, though.
-#339982 by Michelle: Fixed bug with comment wrapper template not loading.
-
-December 7, 2008
-----------------
-#339890 by Michelle: Fixed short script opener in advf-forum-repeat-post.tpl.php (500 errors on paged threads)
-
-November 26, 2008 -- ALPHA 15
------------------
-NOISSUE by Michelle: Stripped naked down to bare layout.
-NOISSUE by Michelle: Added boxy and boxy_stacked styles.
-#335770 by Michelle: Removed update that tried to clear up long unused variables as it was giving false fails.
-
-November 22, 2008
------------------
-#325675 by Morbus: Implemented min-height IE fix suggested by Morbus.
-#337457 by Dave Reid: Fixed code that creates links array for comments to match missed change in core.
-
-November 17, 2008 -- ALPHA 14
-
-November 11, 2008
-----------------
-NOISSUE by Michelle: Reverted changes to author pane auto file load patch.
-NOISSUE by Michelle: Code clean up.
-
-November 9, 2008
-----------------
-NOISSUE by Michelle: Simplified code for including author-pane.inc files.
-#331609 by Michelle, dvessel: Fixed problem with advf-author-user.tpl.php not being called from theme.
-NOISSUE by Michelle: advf-forum-repeat-post.tpl.php still had clearfix instead of clear-block.
-
-November 8, 2008
-----------------
-NOISSUE by Michelle: More style tweaking in naked and blue_lagoon. Still broken in IE.
-
-November 7, 2008
-----------------
-NOISSUE by Michelle: Changed naked_stacked to match recent changes to forum threads in naked.
-
-November 2, 2008
-----------------
-NOISSUE by Michelle: Contact link was using the D5 version of the l() function probably due to bad copy.
-NOISSUE by Michelle: Made sure all the icons in CVS matched my local copies.
-
-November 1, 2008
-----------------
-#326706 by Michelle: Changed query that calculates number of new comments to try and fix problem with old comments. Minimally tested.
-#327057 by Michelle: Refactored treat_as_forum_post() to add a hook and generally condense and clean up the code.
-#328617 by Michelle: If there are no new comments on a thread, don't put the # at the end of the URL on the link from the forum list page.
-
-October 27, 2008
----------------
-#326460 by Michelle: Changed included contrib modules to new format.
-
-October 22, 2008
----------------
-#266682 by Morbus, Michelle: Added forum statistics. Also a few minor fixes and extra docs that slipped in at the same time.
-
-October 20, 2008
----------------
-NOISSUE by Michelle: Added blue_lagoon_stacked style.
-NOISSUE by paris: Added blank icons for blue_lagoon and naked.
-
-October 20, 2008
----------------
-#323631 by Morbus: Style fixes for blue_lagoon. Removed need for background image.
-#323632 by Michelle: Removed member ID from naked & blue_lagoon templates as requested by Morbus.
-#323656 by Michelle: Removed override that set table row borders to 0.
-#319942 by Michelle: Thanks to Morbus for pointing out that Drupal code comes with a clearer. Changed over to using it.
-NOISSUE by Michelle: Small fixes to all styles based partially on Morbus' patch from #323631
-#323653 by Michelle: Set a minimum height for the author pane. Also some other minor fixes.
-#321590 by Morbus: Gets rid of div when forum description is empty.
-#321041 by derhasi, swill, Michelle: Fixed errors in Mark as Read functionality.
-#322125 by swill: Fixed bug with comment link array recreation.
-
-October 7, 2008 -- ALPHA 13
----------------
-#291084 by Michelle: Removed all collapsable container code as it caused too many issues. Many thanks to jmorahan for tracing the bizarre pagers to this code.
-#316525 by CompShack, samuelet: Minor CSS fixes to forum posts to fix IE 7 issues.
-#318303 by Michelle, waawaamilk: Added static variable to avoid making multiple trips to the cache per page.
-
-October 1, 2008 -- ALPHA 12
----------------
-#314205 by Michelle: More style cleanup.
-NOISSUE by Michelle: Code cleanup.
-
-September 30, 2008
-------------------
-#313693 by nigel: Sped up function to retrieve the count of new comments in a forum.
-#312958 by Michelle: Added $container_description to forum list template.
-NOISSUE by Michelle: Code cleanup.
-
-September 29, 2008
-------------------
-#314108 by Michelle: Fixed shadow post message.
-
-September 28, 2008
-------------------
-#314205 by Michelle, stephthegeek: Lots of style cleanup.
-#314186 by Michelle: Fixed broken comment numbering.
-NOISSUE by Michelle: Changed 'forum user' to 'author pane' for clarity.
-
-September 26, 2008
-------------------
-#303549 by Michelle: Cleaned up author info pane.
-#250112 by Michelle: Added userpoints categorization. Also added branding suggested by Vuds in #310460. Also fixed missing t()s.
-#314205 by Michelle: First round of style cleanup.
-
-September 25, 2008
-------------------
-#312602 by Michelle, merlinofchaos: Fixed broken query for counting the unread comments in a forum.
-#303740 by nigel, Michelle: Fixed lots of little bugs found with E_ALL warnings.
-
-September 24, 2008
-------------------
-#306633 by Michelle: Added more icons.
-#291084 by halkeye: Cleared options before collapsable container setting.
-NOISSUE by waawaamilk: Fixed bug with counting forums in forum list preprocess.
-#306633 by Michelle: Renamed most of the icons for a more consistant naming and replaced some.
-
-September 18, 2008
-------------------
-#310547 by Michelle: Added 'hidden options' to settings page as well as other work on the settings page. This also necessitated a change to the collapsable container code.
-NOISSUE by Michelle: Added check for css files in theme directory so they can be overridden.
-#309955 by Michelle: Comment wrapper preprocess was not checking that we are on a forum node.
-
-September 17, 2008
-------------------
-#291084 by cridenour: More work on the collapsable forum containers: setting initial state and remembering state.
-
-September 16, 2008
-------------------
-#309233 by merlinofchaos, Michelle: Adjusted theme registry manipulation to properly find .tpl files in themes and subthemes.
-NOISSUE by Michelle: Made killing of topic navigation optional since there are a few people out there who like it.
-#309066 by asxnot: Fixed PHP 4 issue with forum list icons.
-
-September 14, 2008
-------------------
-#291084 by grn, Michelle: More fixes for collapsable containers.
-#303542 by Michelle: Updated README.txt
-#299258 by Michelle: Documented icon sources.
-
-September 13, 2008
-------------------
-#291084 by grn: Added initial jquery to make collapsable containers work. Still rough but usable.
-#303556 by alpritt: Fixed no background showing in header on forum icon column.
-NOISSUE by Michelle: Changed jump to first reply on top of forum nodes to show total replies as well.
-#303556 by Michelle: Fixed issue with topic list header.
-
-September 10, 2008
-------------------
-#303816 by Michelle: Fixed post reply bug.
-#303556 by Michelle: Added blue_lagoon style.
-
-September 8, 2008
------------------
-#291084 by Michelle: Some preliminary work to set up the classes for collapsable containers.
-
-September 7, 2008
------------------
-NOISSUE by Michelle: Cleaned up user info .tpl and modules that feed it.
-#303799 by Michelle: Moved folder icons into their own column. Also cleaned up forum list tpl.
-#303799 by Michelle: Fixed issue with indenting when no containers.
-
-September 6, 2008
------------------
-#303553 by stephthegeek: Tweaks to naked style.
-#303740 by nigel, Michelle, neclimdul: Fixed some E_ALL warnings.
-#228557 by neclimdul: Collect extra user info variables via hook.
-
-September 2, 2008
------------------
-NOISSUE by Michelle: Fixed joined date to not use hardcoded format. Regex provided by Morbus.
-#274978 by Michelle: Fixed signatures so they work with and without signature for forums installed.
-NOISSUE by Michelle: Re-arranged functions and cleaned up some comments.
-#268684 by Michelle: Removed old themes directory.
-#268684 by Michelle: Added code to change forum icon when new posts.
-#268684 by Michelle: Added new forum icons.
-#268684 by Michelle: Changed 'mark as read' to use new icon.
-#268684 by Michelle: Added advf-comment-wrapper.tpl.php and used it to add reply link at bottom of each page.
-#301089 by George2: Only print title div if there is a title on the comment.
-NOISSUE by Michelle: Fixed bad copy of &variables when calling functions. Thanks afeijo for reporting it.
-NOISSUE by Michelle: Changed 'ago' to showing actual dates when over 48 hours.
-#302125 by IceCreamYou, Michelle: Added facebook status support.
-
-September 1, 2008
------------------
-#238668 by Michelle: Added advanced setting to turn this off if it causes performance problems.
-#268684 by Michelle: Added support for flatgrey style. Actual style has not been added yet.
-#228557 by Michelle: Moved contrib code into individual files to pave the way for plugin system. Removed modules not yet ported to D6.
-#300594 by Michelle: Updated private message code to work with D6 rewrite.
-
-August 21, 2008
----------------
-#295562 by catch: Make 'views' column in topic list statistics.module dependent.
-#268684 by Michelle: Cleaned up advf-forum-topic-list.tpl.php and moved some logic into the preprocess.
-#268684 by Michelle: Added classes to table header for topic list and cleaned up empty fields.
-Made advanced setting for turning off created column.
-#238668 by ixeft, Michelle: Added N new posts to forum overview.
-
-August 20, 2008
----------------
-#268684 by merlinofchaos, sdboyer, and a tiny bit Michelle: Adapted panels plug in system to allow any module to add styles to advanced forum. This paves the way for offering multiple styles with the module as well as letting others contribute styles. Also 'renamed' themes directory to styles so much moving around of files. (Theme changes: The default advforum style as well as any customized themes won't work at this point. Instructions coming once this stabalizes.)
-
-August 15, 2008
----------------
-#297227 by Michelle: Missed spot affected by D6's change to per type comment settings.
-
-August 15, 2008
----------------
-#268684 by stephthegeek: Added new "naked" style. This completely revamped basic style will be the base for future styles.
-#268684 by Michelle: Simplified style switching / icon finding to pave the way for this issue. This is a temporary measure until the new style plugin system is written. (Theme changes: Themes are now styles and these notes will be called "Style changes" after this. As of this change, you need to set the name of the style on the options page. Advf will look for a directory by that name first in the active theme and then in the module. If you want to customize a style, copy the entire directory into your theme and make changes there.)
-
-August 1, 2008
---------------
-#268273 by Michelle: Another fix for the last comment in forum mess.
-
-June 9, 2008
-------------
-#268680 by Morbus: Whitespace / comment cleanup.
-Code cleanup and syncing the branches.
-
-June 6, 2008 - ALPHA 1
-------------
-#241982 by Michelle: Fixed install function for filling table so it doesn't give warnings and returns success/failure properly. Since it was filling the table even with the warnings, there's no need to rerun this.
-#242527 by Michelle: Re-fixed the problem with views showing blank instead of 0.
-
-June 5, 2008
-------------
-#241982 by Michelle: Added function to .install to fill last post table with initial values.
-#241982 by Michelle: Adjusted comment link to account for multiple pages.
-#241982 by Michelle: Added icon linked to most recent comment. (Theme changes: advf-forum-submitted.tpl.php, added newest_comment.gif)
-#266765 by aMakUzr: Fixed class markup on forum posts.
-
-June 3, 2008
-------------
-#242527 by Michelle: Initialized view count to 0 so it doesn't show blank when no views of topic.
-#208440 by Michelle: Made reference post use forum theme when replying. Also removed links from comment in reply mode.
-#241982 by Michelle: Updated variable list in comments of advf-forum-submitted.tpl.php to account for changes.
-
-June 2, 2008
-------------
-#241982 by Michelle: Added checking to see if last topic has been deleted or unpublished.
-
-May 30, 2008
-------------
-#241982 by Michelle with tons of help from litwol and neclimdul: Updated install file to create the new table.
-#241982 by Michelle (based on idea from Bdragon): Use a table to store reference to last posts in forum to replace the monster query.
-
-Still to do: Account for deleted/unpublished comments and nodes. Write something in the install file to backfill table with existing posts. More testing.
-
-Theme changes:
-advf-forum-submitted.tpl.php - Added an extra section for adding more info when a comment is the latest.
-
-#No issue by Michelle, Added some doxygen comments and moved around some functions for better readability.
-
-May 27, 2008
-------------
-#263943 by SkoalFyfan: Changed template name from forums to advf-forums in preprocess code.
-#256174 by seals: Swedish translation update.
-
-May 27, 2008
-------------
-Fixed up function advanced_forum_treat_as_forum_post() to be better commented, more logical, #232513 allow other content types (thanks nbz for the starter code), and fix #260640 comment theming not defaulting to off.
-#217194 Added template file to theme the repeated node on paginated forum threads. Thanks, Morbus. (Theme changes: advf-forum-repeat-post.tpl.php)
-Pulled creating the 'topic pager' out of advanced_forum_preprocess_forum_topic_list to simplify it.
-#242527 Added number of views to the topic listing page. Thanks to Zandroc for the starter code. (Theme changes: advf-forum-topic-list.tpl.php, advanced_forum-structure.css)
-Removed some unused CSS from advanced_forum.css
-
-May 13, 2008
-------------
-Removed debug code left in MAR and cleaned up comments. Thanks afeijo.
-
-May 12, 2008
-------------
-Port from D5: #255949 Added link to top of forum threads that lists the number of unread comments and links to the first one. This links to the comment id and so will work across pages. (Theme changes: advf-forum-post.tpl.php - Added $jump_first_new)
-Added extra markup for the post header area. (Theme changes: advf-forum-post.tpl.php - Added div.forum-post-header)
-#253155 Changed _is_forum() to advanced_forum_treat_as_forum_post() to comply with coding standards and clarify purpose.
-#253155 Changed _topic_nid() to _advanced_forum_topic_nid().
-#253155 Changed theme_image... to theme('image'...
-Ported path_to_subtheme() related code from D5.
-#246701 IE 6 fixes. Thanks, CompShack. (Theme changes: Affects both .css files)
-
-May 9, 2008
------------
-#241071 Mark as read function rewritten by afeijo (with some early help from konfuzed) on IRC. Thanks for the late night debugging to get this working.
-
-May 8, 2008
------------
-#238125 Removed the sql rewrite since it doesn't work with subqueries.
-#248652 Fixed PHP 4 incompatibility in showing last post in forum. Thanks jamix.
-#249651 Added check that contact module is enabled.
-#254051 Fixed error in mark as read menu item.
-#256174 Added Swedish translation. Thanks seals.
-Ported settings page from 5.x.
-#241071 Got mark as read partially working. Still an error.
-
-May 7, 2008
------------
-#254892 Added variable for forum description to forum topic list. Theme changes: advf-forums.tpl.php - Added description. advf-forum-topic-list.tpl.php - Updated variable list to include $forum_description. advf-forum-topic-list.tpl.php - padding around new class.
-
-May 1, 2008
------------
-Ported some small fixes that were done for D5 but not D6.
-Updated D6 with all D5 theme changes.
-#237362 Loaded user object in preprocesses for node and comment rather than in template_preprocess_author_pane so it is available in the main forum post template. Fixed #236870 in the process.
-
-March 22, 2008
---------------
-Fixed remaining issues with advanced_forum_get_all_last_topics (I hope!)
-Updated README.txt and CHANGELOG.txt
-Fixed $Id at the tops of all the files.
-
-March 18, 2008
---------------
-#222212 #235749 Removed caching from advanced_forum_get_all_last_topics due to too many problems.
-
-March 3, 2008
--------------
-Added some tweaks to the user info pane
-
-Feb 25, 2008
-------------
-Added better shadow topic link.
-
-Feb 24, 2008
-------------
-Fixed last topics in forums list. Thanks to LasseP.
-
-Feb 23, 2008
-------------
-Added back in mark as read buttons.
-Added extra formatting to sticky topics.
-Added folder icon to forum list.
-More CSS tweaks
-
-Feb 22, 2008
-------------
-#204281 Fixed indenting on forum overview.
-#219958 Added reply button to top of thread.
-Recreated links on comments so we can theme them better and changed CSS to match.
-Small CSS fixes to adapt to new .tpl files.
-
-FEB 21, 2008 - D6 BRANCH
-Massive changes to begin porting this to 6.x
-
------------------------ Pre-Port -----------------------------------------------
-
-Feb 07, 2008 - ALPHA 2
-------------
-Minor theme tweaks - Fixed mark as read button & lightened post info background
-Added rest of CSS to theme links on forum topics like buttons
-#212329 Changed 'Add comment' link to 'Reply' on top post.
-
-Feb 5, 2008
-------------
-Incorporated mark as read code into main module
-Themed forum links to look like buttons
-Changed link for shadow posts to give name of forum and link to the moved post
-
-Feb 3, 2008 - ALPHA 1
------------
-Committed all of eigentor's changes to the default theme
-
-Jan 23, 2007
-------------
-Added t() to 'posted on'
-
-Dec 22, 2007
-------------
-Created this changelog to help early adopters keep up with my changes. Will only be recording major changes until the module gets non-dev releases.
-Notable recent changes:
- - Moved all theme related files into themes/advforum to enable alternate themes
- - Removed call to _is_forum() at the top of node-forum.tpl.php and rolled logic into the function
- - Renamed node-forum.tpl.php to forum-thread.tpl.php
-
-Nov 18, 2007
-------------
-Created project for advanced forum and uploaded some early code
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/LICENSE.txt b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/LICENSE.txt
deleted file mode 100644
index 2c095c8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/LICENSE.txt
+++ /dev/null
@@ -1,274 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-
- Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
-Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
-verbatim copies of this license document, but changing it is not allowed.
-
- Preamble
-
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public License
-applies to most of the Free Software Foundation's software and to any other
-program whose authors commit to using it. (Some other Free Software
-Foundation software is covered by the GNU Library General Public License
-instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this service if
-you wish), that you receive source code or can get it if you want it, that you
-can change the software or use pieces of it in new free programs; and that
-you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have. You must make
-sure that they, too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If the
-software is modified by someone else and passed on, we want its recipients
-to know that what they have is not the original, so that any problems
-introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
- MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms
-of this General Public License. The "Program", below, refers to any such
-program or work, and a "work based on the Program" means either the
-Program or any derivative work under copyright law: that is to say, a work
-containing the Program or a portion of it, either verbatim or with
-modifications and/or translated into another language. (Hereinafter, translation
-is included without limitation in the term "modification".) Each licensee is
-addressed as "you".
-
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made
-by running the Program). Whether that is true depends on what the Program
-does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it,
-thus forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you
-also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that
-you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or in
-part contains or is derived from the Program or any part thereof, to be
-licensed as a whole at no charge to all third parties under the terms of this
-License.
-
-c) If the modified program normally reads commands interactively when run,
-you must cause it, when started running for such interactive use in the most
-ordinary way, to print or display an announcement including an appropriate
-copyright notice and a notice that there is no warranty (or else, saying that
-you provide a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this License.
-(Exception: if the Program itself is interactive but does not normally print such
-an announcement, your work based on the Program is not required to print
-an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be
-reasonably considered independent and separate works in themselves, then
-this License, and its terms, do not apply to those sections when you distribute
-them as separate works. But when you distribute the same sections as part
-of a whole which is a work based on the Program, the distribution of the
-whole must be on the terms of this License, whose permissions for other
-licensees extend to the entire whole, and thus to each and every part
-regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to
-work written entirely by you; rather, the intent is to exercise the right to
-control the distribution of derivative or collective works based on the
-Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the scope
-of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1
-and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source
-code, which must be distributed under the terms of Sections 1 and 2 above
-on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give
-any third party, for a charge no more than your cost of physically performing
-source distribution, a complete machine-readable copy of the corresponding
-source code, to be distributed under the terms of Sections 1 and 2 above on
-a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for
-noncommercial distribution and only if you received the program in object
-code or executable form with such an offer, in accord with Subsection b
-above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation and
-installation of the executable. However, as a special exception, the source
-code distributed need not include anything that is normally distributed (in
-either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the
-source code from the same place counts as distribution of the source code,
-even though third parties are not compelled to copy the source along with the
-object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy,
-modify, sublicense or distribute the Program is void, and will automatically
-terminate your rights under this License. However, parties who have received
-copies, or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the
-Program or its derivative works. These actions are prohibited by law if you
-do not accept this License. Therefore, by modifying or distributing the
-Program (or any work based on the Program), you indicate your acceptance
-of this License to do so, and all its terms and conditions for copying,
-distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these terms and
-conditions. You may not impose any further restrictions on the recipients'
-exercise of the rights granted herein. You are not responsible for enforcing
-compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License. If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices. Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose
-that choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded. In such
-case, this License incorporates the limitation as if written in the body of this
-License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will be
-similar in spirit to the present version, but may differ in detail to address new
-problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-a version number of this License which applies to it and "any later version",
-you have the option of following the terms and conditions either of that
-version or of any later version published by the Free Software Foundation. If
-the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we sometimes make
-exceptions for this. Our decision will be guided by the two goals of
-preserving the free status of all derivatives of our free software and of
-promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
-PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
-AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
-ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
-LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE
-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
-OR DATA BEING RENDERED INACCURATE OR LOSSES
-SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
-IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/README.txt b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/README.txt
deleted file mode 100644
index b51be99..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/README.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-
-CONTENTS OF THIS FILE
----------------------
- * Introduction
- * Installation
- * Other configuration
- * Credits
-
-INTRODUCTION
-------------
-Advanced Forum (http://drupal.org/project/advanced_forum) enhances Drupal's forum module to provide the look and, with the help of other modules, much of the functionality found in common forum software. Because it uses the core forum module, it uses the node and comment system built into Drupal and is completely integrated, not a bridge.
-
-INSTALLATION
-------------
-
-1. Enable all dependencies: Author Pane ( http://drupal.org/project/author_pane ), Forum,
- Taxonomy, Comment. (Optionally: Statistics)
-
-2. Copy the entire advanced_forum project directory (not just the contents) to your
- normal module directory (ie: sites/all/modules)
-
-3. Enable the advanced forum module at ?q=admin/build/modules
-
-4. Visit the Advanced Forum settings page at ?q=admin/settings/advanced-forum
- # General:
- * "Advanced forum style directory" Select the style you are using.
- See http://drupal.org/node/234042 for more information on this.
- * "Use graphical buttons for links" Check this if you want links to use graphical
- buttons (where available).
- * "Treat all site comments like forum comments" If you would like advanced forum to
- take over the theming of all comments, even those outside the forum, choose yes.
- # Forum and topic lists
- * "Hide the created column on the topic list" This option hides the created column
- on the topic list page, which can't be done purely in theming due to the header
- tablesort. If you hide this column, it is up to you to change the tenplate to
- display the information elsewhere.
- * "Get the number of new comments per forum on the forum list" Core forum shows the
- number of new topics. If checked, Advanced Forum will get the number of new
- comments as well and show it under "posts" on the forum overview. Slow query not
- recommended on large forums.
- * "Number of characters to display for the topic title" On the main forums page, the
- title of the last topic is shown. Because this is a narrow column, it is
- truncated. This option sets how many characters are shown.
- * "Number of hours before switching to date posted in displays" In the forum / topic
- listing, recent posts are shown like "1 day, 3 hours ago" and older posts will
- have the actual date. You control the cutoff here.
- # Topics
- * "Use topic navigation" Core forum gets the next and previous topics and shows
- links to them under the top post. This is turned off by default as the query has
- performance issues and the placement of the links is poor.
- * "User picture preset" You will only see this option if you have imagecache 2
- enabled. If you choose a preset here, it will be used for the avatars in forum
- posts. This can be used to give a more uniform appearance if people have many
- different sizes for avatars. If you don't want to use a preset, just leave it
- blank.
-
-OTHER CONFIGURATION
--------------------
-
-1. Forum settings ( ?q=admin/content/forum/settings )
- * Hot topic threshold: Up to you.
- * Topics per page: Up to you.
- * Default order: "Date - newest first" so the most recent posts are at the top of the
- topic list.
-2. Select content types to use in forums ( ?q=admin/content/taxonomy )
-3. Edit the forum vocabulary
- * Check all content types you want to use in forums.
-4. Comment settings ( ?q=admin/content/node-type/forum ) [Note: do this for each content
- type used in forums]
- * Expand "Comment settings" fieldset.
- * Default comment setting: "Read/write"
- * Set Default display mode: Flat list - expanded. (Advforum is intended to be used
- flat. Using it threaded should mostly work but is unsupported and may have some
- issues.)
- * Default display order: Date - oldest first
- * Default comments per page: Up to you. (If you chose to have a threaded forum,
- setting this number to the maximum will reduce issues with pagination and threading.)
- * Comment controls: "Do not display" is recommended.
- * Anonymous commenting: Up to you.
- * Comment subject field: Up to you. If disabled, advforum will not display the Drupal
- default subject, which is the first few words of the comment.
- * Preview comment: Up to you.
- * Location of comment submission form: Up to you. Displaying below provides a non-ajax
- quick reply.
-5. User settings ( ?q=admin/user/settings )
- * Signature support: Enabled
- * Picture support: Enable this for avatars in the forum.
- * Picture maximum dimensions: If you change this from the default 85x85, you will want
- to size it in either CSS or with imagecache to avoid breaking the forum layout.
-6. Statistics settings ( ?q=admin/reports/settings )
- * Enable access log: Enabled
- * Count content views: Enabled - Needed for topic views count.
-
-CREDITS
--------
-Developer and maintainer: Michelle Cox ( http://drupal.org/user/23570 )
-
-Advanced forum was originally based on flatforum. Though there is little or no code left
-from that module, its authors deserve credit for the idea.
-
-The Naked styles, which are the basis of all the other styles, were created by
-stephthegeek (http://drupal.org/user/47874). Previous theme work was done by eigentor
-(http://drupal.org/user/96718) and jacine (http://drupal.org/user/88931)
-
-Icons provided by paris (http://drupal.org/user/14747) and yoroy
-(http://drupal.org/user/41502)
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.info
deleted file mode 100644
index 33e8a13..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.info
+++ /dev/null
@@ -1,14 +0,0 @@
-name = Advanced Forum
-description = Enables the look and feel of other popular forum software.
-dependencies[] = forum
-dependencies[] = ctools
-dependencies[] = views
-
-core = 6.x
-
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.install b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.install
deleted file mode 100644
index 2a7587e..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.install
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-
-/**
- * @file
- * Installation code for Advanced Forum.
- */
-
-function advanced_forum_install() {
- db_query("UPDATE {system} SET weight = 15 WHERE name = 'advanced_forum'");
-}
-
-function advanced_forum_uninstall() {
- variable_del('advanced_forum_style');
- variable_del('advanced_forum_image_directory');
- variable_del('advanced_forum_theme_all_comments');
- variable_del('advanced_forum_hide_created');
- variable_del('advanced_forum_topic_pager_max');
- variable_del('advanced_forum_get_new_comments');
- variable_del('advanced_forum_use_topic_navigation');
- variable_del('advanced_forum_collapsible_containers');
-}
-
-function advanced_forum_update_5000() {
- $ret = array();
- $ret[] = update_sql("UPDATE {system} SET weight = 10 WHERE name = 'advanced_forum'");
- return $ret;
-}
-
-/* Removed these as they were a bad idea
-function advanced_forum_update_5001() {
-}
-
-function advanced_forum_update_5002() {
-}
-*/
-
-function advanced_forum_update_5003() {
- $ret = array();
- $ret[] = update_sql('DROP TABLE IF EXISTS {advforum_last_post}');
- return $ret;
-}
-
-function advanced_forum_update_5004() {
-/* Removed variable clean up because it caused false fails. */
-}
-
-function advanced_forum_update_5005() {
- $ret = array();
- $ret[] = update_sql("UPDATE {system} SET weight = 15 WHERE name = 'advanced_forum'");
- return $ret;
-}
-
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.module b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.module
deleted file mode 100644
index 3a86aa6..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/advanced_forum.module
+++ /dev/null
@@ -1,1331 +0,0 @@
-<?php
-
-/**
- * @file
- * Enables the look and feel of other popular forum software.
- */
-
-// DRUPAL HOOKS **************************************************************/
-
-/**
- * Implementation of hook_perm().
- */
-function advanced_forum_perm() {
- return array(
- 'administer advanced forum',
- 'view forum statistics',
- 'view last edited notice',
- );
-}
-
-/**
- * Implementation of hook_menu().
- */
-function advanced_forum_menu() {
- $items['admin/settings/advanced-forum'] = array(
- 'access arguments' => array('administer advanced forum'),
- 'description' => 'Configure Advanced Forum with these settings.',
- 'page arguments' => array('advanced_forum_settings_page'),
- 'page callback' => 'drupal_get_form',
- 'title' => 'Advanced Forum',
- 'file' => 'includes/settings.inc'
- );
-
- $items['forum/markasread'] = array(
- 'access callback' => 'advanced_forum_markasread_access',
- 'page callback' => 'advanced_forum_markasread',
- 'type' => MENU_CALLBACK,
- );
-
- if (variable_get('advanced_forum_add_local_task', TRUE)) {
- $items['forum/view'] = array(
- 'title' => 'View Forums',
- 'page callback' => 'advanced_forum_page',
- 'access arguments' => array('access content'),
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- 'weight' => -100,
- );
- }
-
- return $items;
-}
-
-/**
- * Implementation of hook_menu_alter().
- */
-function advanced_forum_menu_alter(&$callbacks) {
- // Take over the forum page creation so we can add more information.
- $callbacks['forum']['page callback'] = 'advanced_forum_page';
-
- // Turn 'forum' into a normal menu item so it appears in navigation.
- $callbacks['forum']['type'] = MENU_NORMAL_ITEM;
-}
-
-/**
- * Implementation of hook_theme().
- */
-function advanced_forum_theme() {
- $items['advanced_forum_l'] = array(
- 'arguments' => array(
- 'text' => NULL,
- 'path' => NULL,
- 'options' => array(),
- 'button_class' => NULL,
- )
- );
-
- $items['advanced_forum_statistics'] = array(
- 'template' => 'advanced_forum-statistics',
- );
-
- $items['advanced_forum_topic_legend'] = array(
- 'template' => 'advanced_forum-topic-legend',
- );
-
- $items['advanced_forum_topic_header'] = array(
- 'template' => 'advanced_forum-topic-header',
- 'arguments' => array(
- 'node' => NULL,
- 'comment_count' => NULL,
- )
- );
-
- $items['advanced_forum_active_poster'] = array(
- 'template' => 'advanced_forum-active-poster',
- 'arguments' => array(
- 'forum' => NULL,
- 'account' => NULL,
- 'posts' => NULL,
- 'topics' => NULL,
- 'last_post' => NULL,
- )
- );
-
- $items['advanced_forum_forum_legend'] = array(
- 'template' => 'advanced_forum-forum-legend',
- );
-
- $items['advanced_forum_user_picture'] = array(
- 'arguments' => array(
- 'account' => NULL,
- )
- );
-
- $items['advanced_forum_reply_link'] = array(
- 'arguments' => array(
- 'node' => NULL,
- )
- );
-
- $items['advanced_forum_topic_pager'] = array(
- 'arguments' => array(
- 'pagecount' => NULL,
- 'topic' => NULL,
- )
- );
-
- $items['advanced_forum_shadow_topic'] = array(
- 'arguments' => array(
- 'title' => NULL,
- 'nid' => NULL,
- 'new_forum' => NULL,
- )
- );
-
- $items['advanced_forum_subforum_list'] = array(
- 'arguments' => array(
- 'subforum_list' => NULL,
- )
- );
-
- $items['advanced_forum_subcontainer_list'] = array(
- 'arguments' => array(
- 'subcontainer_list' => NULL,
- )
- );
-
- $items['advanced_forum_simple_author_pane'] = array(
- 'arguments' => array(
- 'context' => NULL,
- )
- );
-
- $items['advanced_forum_post_edited'] = array(
- 'arguments' => array(
- 'who' => NULL,
- 'when' => NULL,
- 'why' => NULL,
- )
- );
-
- $items['advanced_forum_node_type_create_list'] = array(
- 'arguments' => array(
- 'forum_id' => NULL,
- )
- );
-
- // These only exist if nodecomment is on.
- if (module_exists('nodecomment')) {
- $items['advanced_forum_search_forum'] = array(
- 'arguments' => array('tid' => NULL),
- 'template' => 'advanced_forum-search-forum',
- );
-
- $items['advanced_forum_search_topic'] = array(
- 'arguments' => array('node' => NULL),
- 'template' => 'advanced_forum-search-topic',
- );
-
- $items['views_view_fields__advanced_forum_search'] = array(
- 'arguments' => array('view' => NULL, 'options' => NULL, 'row' => NULL),
- 'template' => 'advanced_forum_search_result',
- 'original hook' => 'views_view_fields',
- );
-
- $items['views_view_fields__advanced_forum_search_topic'] = array(
- 'arguments' => array('view' => NULL, 'options' => NULL, 'row' => NULL),
- 'template' => 'advanced_forum_search_result',
- 'original hook' => 'views_view_fields',
- );
- }
-
- // Templates for features added by Views
- $items['views_view_forum_topic_list__advanced_forum_topic_list'] = array(
- 'arguments' => array('view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL),
- 'template' => 'advanced_forum-topic-list-view',
- 'original hook' => 'views_view_forum_topic_list',
- );
-
- $items['views_view__advanced_forum_topic_list'] = array(
- 'arguments' => array('view' => NULL),
- 'template' => 'advanced_forum-topic-list-outer-view',
- 'original hook' => 'views_view',
- );
-
- $items['views_view__advanced_forum_group_topic_list'] = array(
- 'arguments' => array('view' => NULL),
- 'template' => 'advanced_forum-group-topic-list-outer-view',
- 'original hook' => 'views_view',
- );
-
- return $items;
-}
-
-/**
- * Implementation of hook_theme_registry_alter().
- */
-function advanced_forum_theme_registry_alter(&$theme_registry) {
- advanced_forum_load_style_includes();
-
- // Garland's phptemplate_comment_wrapper really sucks. Chances are, a theme
- // does NOT want to control this on forum nodes anyway, so we're going to take
- // it over:
- if (isset($theme_registry['comment_wrapper']['function']) && $theme_registry['comment_wrapper']['function'] == 'phptemplate_comment_wrapper') {
- $theme_registry['comment_wrapper']['function'] = 'advanced_forum_comment_wrapper';
- }
-
- // Optionally kill the next/previous forum topic navigation links because
- // it is a nasty query that can slow down the forums.
- if (!variable_get('advanced_forum_use_topic_navigation', FALSE)) {
- foreach ($theme_registry['forum_topic_navigation']['preprocess functions'] as $key => $value) {
- if ($value == 'template_preprocess_forum_topic_navigation') {
- unset($theme_registry['forum_topic_navigation']['preprocess functions'][$key]);
- }
- }
- }
-
- // Don't let core do its basic preprocess for forums, as we want to do
- // other stuff now.
- foreach ($theme_registry['forums']['preprocess functions'] as $key => $value) {
- if ($value == 'template_preprocess_forums') {
- unset($theme_registry['forums']['preprocess functions'][$key]);
- }
- }
-
- // We duplicate all of core's forum list preprocessing so no need to run
- // it twice. Running twice also causes problems with & in forum name.
- foreach ($theme_registry['forum_list']['preprocess functions'] as $key => $value) {
- if ($value == 'template_preprocess_forum_list') {
- unset($theme_registry['forum_list']['preprocess functions'][$key]);
- }
- }
-
- // Views handles the topic list pages so remove the core template preprocess.
- foreach ($theme_registry['forum_topic_list']['preprocess functions'] as $key => $value) {
- if ($value == 'template_preprocess_forum_topic_list') {
- unset($theme_registry['forum_topic_list']['preprocess functions'][$key]);
- }
- }
-
- // --- The following section manipulates the theme registry so the .tpl files
- // --- for the given templates can be found first in the (sub)theme directory
- // --- then in ancestor themes, if any, then in the active style directory
- // --- for advanced forum or any ancestor styles.
-
- // Affected templates
- $templates = array('node',
- 'comment',
- 'comment_wrapper',
- 'forums',
- 'forum_list',
- 'forum_topic_list',
- 'forum_icon',
- 'forum_submitted',
- 'forum_topic_navigation',
- 'author_pane',
- 'advanced_forum_statistics',
- 'advanced_forum_search_forum',
- 'advanced_forum_search_topic',
- 'advanced_forum_search_result',
- 'advanced_forum_topic_list_view',
- 'views_view_fields__advanced_forum_search',
- 'views_view_fields__advanced_forum_search_topic',
- 'views_view_forum_topic_list__advanced_forum_topic_list',
- 'views_view_forum_topic_list__advanced_forum_group_topic_list',
- 'views_view__advanced_forum_topic_list',
- 'views_view__advanced_forum_group_topic_list',
- 'advanced_forum_topic_legend',
- 'advanced_forum_forum_legend',
- 'advanced_forum_topic_header',
- 'advanced_forum_active_poster',
- );
-
- // Find all our ancestor themes and put them in an array.
- global $theme;
- $themes = list_themes();
-
- $ancestor_paths = array();
- $ancestor = $theme;
- while ($ancestor && isset($themes[$ancestor]->base_theme)) {
- array_unshift($ancestor_paths, dirname($themes[$themes[$ancestor]->base_theme]->filename));
- $ancestor = $themes[$ancestor]->base_theme;
- }
-
- // Get the sequence of styles to look in for templates
- $lineage = advanced_forum_style_lineage();
-
- if (!array_key_exists('naked', $lineage)) {
- // Add naked in at the end of the line to prevent problems if a style
- // doesn't include all needed templates.
- $lineage['naked'] = drupal_get_path('module', 'advanced_forum') . '/styles/naked';
- }
-
- foreach ($templates as $template) {
- // Sanity check in case the template is not being used.
- if (!empty($theme_registry[$template])) {
- // If there was a path in there, store it.
- $existing_path = array_shift($theme_registry[$template]['theme paths']);
-
- // Add paths for our style and ancestors before the existing path, if any.
- foreach ($lineage AS $style => $style_path) {
- array_unshift($theme_registry[$template]['theme paths'], $existing_path, $style_path);
- $existing_path = array_shift($theme_registry[$template]['theme paths']);
- }
-
- // If there are any ancestor paths (ie: we are in a subtheme, add those)
- foreach ($ancestor_paths as $ancestor_path) {
- $theme_registry[$template]['theme paths'][] = $ancestor_path;
- }
-
- // Put the active theme's path last since that takes precidence.
- $theme_registry[$template]['theme paths'][] = advanced_forum_path_to_theme();
-
- // Add preprocess functions if our style has them.
- $preprocess = array();
- foreach ($lineage as $key => $path) {
- if (function_exists('advanced_forum_' . $key . '_preprocess_' . $template)) {
- $preprocess[] = 'advanced_forum_' . $key . '_preprocess_' . $template;
- }
- }
-
- // There are preprocess functions to add, so figure out where we want to add
- // them.
- if ($preprocess) {
- $position = 0;
- foreach ($theme_registry[$template]['preprocess functions'] as $function) {
- $position++;
- // If we see either of these items, that means we can place our
- // preprocess functions after this.
- if (substr($function, 0, 25) == 'advanced_forum_preprocess' || substr($function, 0, 34) == 'template_preprocess_advanced_forum') {
- break;
- }
- }
- // Add in our new preprocess functions:
- array_splice($theme_registry[$template]['preprocess functions'], $position, 0, $preprocess);
- }
- }
- }
-}
-
-/**
- * Implementation of hook_nodeapi().
- */
-function advanced_forum_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
- if ($op == 'update' || $op == 'insert' || $op == 'delete') {
- // Update the cached statistics.
- advanced_forum_statistics_replies(TRUE);
- }
-
- if ($op == 'view' && !empty($node->content['forum_navigation'])) {
- if (!empty($node->content['forum_navigation'])) {
- // Move the forum navigation to a seperate variable so it doesn't
- // get lumped in with the content.
- $node->advanced_forum_navigation = $node->content['forum_navigation']['#value'];
- $node->content['forum_navigation'] = NULL;
- }
- }
-}
-
-/**
- * Implementation of hook_comment().
- */
-function advanced_forum_comment(&$a1, $op) {
- if ($op == 'update' || $op == 'insert' || $op == 'delete') {
- // Update the cached statistics.
- advanced_forum_statistics_replies(TRUE);
- }
-}
-
-/**
- * Implementation of hook_link().
- */
-function advanced_forum_link($type, $node = NULL, $teaser = FALSE) {
- $links = array();
-
- if ($type == 'node' && (!isset($node->comment_target_nid))) {
- if (advanced_forum_is_styled($node, $teaser, $type)) {
- // Add edit / delete links to the node links to match replies.
- if (node_access('update', $node)) {
- $links['post_edit'] = array(
- 'title' => t('edit'),
- 'href' => 'node/'. $node->nid .'/edit',
- 'query' => drupal_get_destination(),
- );
- }
-
- if (node_access('delete', $node)) {
- $links['post_delete'] = array(
- 'title' => t('delete'),
- 'href' => 'node/'. $node->nid .'/delete',
- );
- }
-
- // Core only adds the link if the comment form is on a separate page
- // but we want the link there regardless for consistancy.
- // Nodecomment already handles this so only run if that's not enabled.
- if (!module_exists('nodecomment')) {
- if ($node->comment == COMMENT_NODE_READ_WRITE) {
- if (user_access('post comments')) {
- if (variable_get('comment_form_location_'. $node->type, COMMENT_FORM_SEPARATE_PAGE) != COMMENT_FORM_SEPARATE_PAGE) {
- $links['comment_add'] = array(
- 'title' => t('Add new comment'),
- 'href' => "comment/reply/$node->nid",
- 'attributes' => array('title' => t('Reply to this topic.')),
- 'fragment' => 'comment-form'
- );
- }
- }
- }
- }
- }
- }
-
- return $links;
-}
-
-/**
- * Implementation of hook_link_alter().
- */
-function advanced_forum_link_alter(&$links, $node, $comment = NULL) {
- if (empty($comment)) {
- $object = $node;
- $object_type = 'node';
- }
- else {
- $object = $comment;
- $object_type = 'comment';
- }
-
- // Check if we are altering links on a node that is displayed in a teaser.
- // @TODO: Find out if there's a better way to tell if this is a teaser.
- $teaser = !(arg(0) == 'node' && arg(1) > 0);
-
- if (advanced_forum_is_styled($object, $teaser, $object_type)) {
- // Change first post from "add comment" to "reply" if it isn't already.
- if (!empty($links['comment_add'])) {
- $links['comment_add']['title'] = t('reply');
- }
-
- // List the keys we are interested in.
- $affected_keys = array('post_edit', 'comment_edit', 'post_delete', 'comment_delete', 'quote', 'comment_add', 'comment_reply', 'comment_mover_node_prune', 'comment_mover_comment_prune');
-
- // Add extra span tags for image replacement.
- foreach ($links AS $key => $link) {
- if (in_array($key, $affected_keys)) {
- $current_classes = (empty($links[$key]['attributes']['class'])) ? '' : $links[$key]['attributes']['class'];
- $links[$key]['attributes']['class'] = "$current_classes af-button-small";
- $links[$key]['title'] = '<span>' . $links[$key]['title'] . '</span>';
- $links[$key]['html'] = TRUE;
- }
- }
-
- // Put the links in a consistent order.
- foreach ($affected_keys as $key) {
- if (isset($links[$key])) {
- $temp = $links[$key];
- unset($links[$key]);
- $links[$key] = $temp;
- }
- }
- }
-}
-
-/**
- * Implementation of hook_form_alter().
- */
-function advanced_forum_form_alter(&$form, &$form_state, $form_id) {
- if (!empty($form['#node']->type) && advanced_forum_type_is_in_forum($form['#node']->type) && isset($form['body_field']) && isset($form['body_field']['#after_build'])) {
- // Remove the teaser splitter.
- $teaser_js_build = array_search('node_teaser_js', $form['body_field']['#after_build']);
- unset($form['body_field']['#after_build'][$teaser_js_build]);
- $form['body_field']['teaser_js']['#access'] = FALSE;
- $form['body_field']['teaser_include']['#access'] = FALSE;
- }
-
- // Add our OG view as a potential RON for organic groups.
- if (!empty($form['og_settings']['group_details']['og_home_page_view'])) {
- $form['og_settings']['group_details']['og_home_page_view']['#options']['advanced_forum_group_topic_list'] = 'advanced_forum_group_topic_list';
- }
-}
-
-// MAKE VIEWS BITS WORK *****************************************************/
-function advanced_forum_views_api() {
- return array(
- 'api' => 2,
- 'path' => drupal_get_path('module', 'advanced_forum') . '/includes/views',
- 'file' => 'views.inc',
- );
-}
-
-// MAKE CTOOLS BITS WORK *****************************************************/
-/**
- * Tell CTools about what plugins we support.
- */
-function advanced_forum_ctools_plugin_directory($module, $plugin) {
- if ($module == 'advanced_forum') {
- return 'styles';
- }
-
- if ($module == 'page_manager' || $module == 'ctools') {
- return 'plugins/' . $plugin;
- }
-}
-
-function advanced_forum_ctools_plugin_api($module, $api) {
- if ($module == 'page_manager' && $api = 'pages_default') {
- return array(
- 'version' => 1,
- 'path' => drupal_get_path('module', 'advanced_forum') . '/includes/panels',
- );
- }
-}
-
-// THEME FUNCTIONS AND TEMPLATE PREPROCESSES **********************************/
-include_once drupal_get_path('module', 'advanced_forum') . '/includes/theme.inc';
-
-// STYLE RELATED FUNCTIONS ****************************************************/
-include_once drupal_get_path('module', 'advanced_forum') . '/includes/style.inc';
-
-// CORE FORUM PAGE OVERRIDES **************************************************/
-include_once drupal_get_path('module', 'advanced_forum') . '/includes/core-overrides.inc';
-
-// MARK AS READ ***************************************************************/
-include_once drupal_get_path('module', 'advanced_forum') . '/includes/mark-read.inc';
-
-// VIEWS RELATED GOODIES ******************************************************/
-
-/**
- * Post render a view and replace any advanced forum tokens.
- */
-function advanced_forum_views_post_render(&$view, &$output) {
- if (!is_object($view->style_plugin) || !$view->style_plugin->uses_row_plugin()) {
- return;
- }
-
- $plugin = $view->display_handler->get_option('row_plugin');
- if ($plugin == 'node' || $plugin == 'nodecomment_threaded') {
- // Look for token matches in the output:
- $matches = array();
- $tokens = array();
-
- // We want to change the look of the 'new' marker from the default, slightly:
- $tokens['<span class="new">' . t('new') . '</span>'] = '<span class="new">(' . t('new') . ')</span>';
-
- // Replace the Author Pane token with the actual Author Pane.
- // Note that this token will only exist if Author Pane is enabled.
- if (preg_match_all('/<!--post:author-pane-([\d]+)-->/us', $output, $matches)) {
- foreach ($matches[1] as $match => $uid) {
- $token = $matches[0][$match]; // This is the exact string that matched.
- if (!isset($tokens[$token])) {
- $account = user_load($uid);
- $tokens[$token] = theme('author_pane', $account, 'advanced_forum', variable_get('advanced_forum_user_picture_preset', ''), NULL, TRUE);
- }
- }
- }
-
- // Replace the Post edited token.
- if (preg_match_all('/<!--post:post-edited-([\d]+)-->/us', $output, $matches)) {
- foreach ($matches[1] as $match => $nid) {
- $token = $matches[0][$match]; // This is the exact string that matched.
- if (!isset($tokens[$token])) {
- if (user_access('view last edited notice')) {
- $sql = 'SELECT uid, log, timestamp FROM {node_revisions} WHERE nid = %d ORDER BY timestamp DESC';
- $row = db_fetch_object(db_query($sql, $nid));
- $tokens[$token] = theme('advanced_forum_post_edited', $row->uid, $row->timestamp, $row->log);
- }
- else {
- // No access; remove token.
- $tokens[$token] = '';
- }
- }
- }
- }
-
- // Replace the core Signature token.
- if (preg_match_all('/<!--post:signature-core-([\d]+)-->/us', $output, $matches)) {
- foreach ($matches[1] as $match => $uid) {
- $token = $matches[0][$match]; // This is the exact string that matched.
- if (!isset($tokens[$token])) {
- $account = user_load($uid);
- if ($account->signature) {
- $tokens[$token] = check_markup($account->signature, $account->signature_format, FALSE);
- }
- }
- }
- }
-
- // Replace the posted by viewer tokens with class if appropriate.
- if (preg_match_all('/<!--post:poster-id-([\d]+)-->/us', $output, $matches)) {
- foreach ($matches[1] as $match => $uid) {
- $token = $matches[0][$match]; // This is the exact string that matched.
- if (!isset($tokens[$token])) {
- global $user;
-
- if ($user->uid > 0 && $uid == $user->uid) {
- // This post is by current user.
- $tokens[$token] = " post-by-viewer";
- }
- else {
- $tokens[$token] = "";
- }
- }
- }
- }
-
- // Perform replacements.
- $output = strtr($output, $tokens);
- }
-}
-
-/**
- * Display the "sort" widget. This is a specially hacked widget that only
- * works with tablesorting. Tablesorting MUST be on for these widgets
- * to appear.
- */
-function advanced_forum_forum_topic_list_sort() {
- $form_state = array(
- 'method' => 'get',
- 'no_redirect' => TRUE,
- 'rerender' => TRUE,
- 'input' => $_GET,
- 'drop tokens' => TRUE,
- );
-
- ctools_include('form');
- return ctools_build_form('advanced_forum_forum_topic_list_sort_form', $form_state);
-}
-
-function advanced_forum_forum_topic_list_sort_form(&$form_state) {
- $view = views_get_view('advanced_forum_topic_list');
- $view->set_display('default');
- $view->init_handlers();
- $view->init_style();
-
- // Work up a list of possible fields.
- $handler = &$view->style_plugin;
- $fields = &$view->field;
- $columns = $handler->sanitize_columns($handler->options['columns'], $fields);
-
- $options = array();
- foreach ($columns as $field => $column) {
- if ($field == $column && empty($fields[$field]->options['exclude'])) {
- if (empty($handler->options['info'][$field]['sortable']) || !$fields[$field]->click_sortable()) {
- continue;
- }
- $label = check_plain(!empty($fields[$field]) ? $fields[$field]->label() : '');
- $options[$field] = $label;
- }
- }
-
- $form['inline'] = array(
- '#prefix' => '<div class="container-inline">',
- '#suffix' => '</div>',
- );
- $form['inline']['order'] = array(
- '#type' => 'select',
- '#options' => $options,
- '#default_value' => $handler->options['default'],
- );
-
- $form['inline']['sort'] = array(
- '#type' => 'select',
- '#options' => array(
- 'asc' => t('Up'),
- 'desc' => t('Down'),
- ),
- '#default_value' => 'desc',
- );
-
- $form['inline']['submit'] = array(
- '#id' => 'sort-topic-submit',
- '#name' => '',
- '#type' => 'submit',
- '#value' => t('Sort'),
- );
-
- if (isset($_GET['page'])) {
- $form['page'] = array(
- '#type' => 'hidden',
- '#default_value' => $_GET['page'],
- );
- }
-
- if (!variable_get('clean_url', FALSE)) {
- $form['q'] = array(
- '#type' => 'hidden',
- '#value' => $_GET['q'],
- );
- }
-
- $view->destroy();
- return $form;
-}
-
-
-// STATISTICS *****************************************************************/
-
-/**
- * Count total amount of forum threads.
- */
-function advanced_forum_statistics_topics() {
- return db_result(db_query('SELECT COUNT(DISTINCT(nid)) FROM {forum}'));
-}
-
-/**
- * Counts total amount of replies. Initial posts are added to this total
- * in the calling function.
- *
- * @param $refresh
- * TRUE if the stored count should be updated.
- * @return
- * Total number of replies in the forum.
- */
-function advanced_forum_statistics_replies($refresh = FALSE) {
- // Check for cached total.
- $total_replies = variable_get('advanced_forum_stats_replies', 0);
-
- // If there's no cache or we need to refresh the cache
- if ($refresh || $total_replies == 0) {
- if (module_exists('nodecomment')) {
- $total_replies = db_result(db_query('SELECT COUNT(cid) FROM {node_comments} c INNER JOIN {forum} f ON (f.nid = c.nid)'));
- }
- else {
- $total_replies = db_result(db_query('SELECT SUM(s.comment_count) FROM {node_comment_statistics} s INNER JOIN {forum} f ON (s.nid = f.nid)'));
- }
-
- variable_set('advanced_forum_stats_replies', $total_replies);
- }
-
- return $total_replies;
-}
-
-/**
- * Count total amount of active users.
- */
-function advanced_forum_statistics_users() {
- return db_result(db_query('SELECT COUNT(uid) FROM {users} WHERE status = 1'));
-}
-
-/**
- * Return the newest X active (not blocked) users, linked to their profiles.
- */
-function advanced_forum_statistics_latest_users() {
- $number_to_fetch = 5; // @TODO: Make this a setting.
- $sql = 'SELECT uid, name FROM {users} WHERE status = 1 AND access > 0 ORDER BY created DESC';
- $latest_users = db_query_range($sql, NULL, NULL, $number_to_fetch);
- while ($account = db_fetch_object($latest_users)) {
- $list[] = theme('username', $account);
- }
-
- return $list;
-}
-
-/**
- * Return an array of online usernames, linked to their profiles.
- */
-function advanced_forum_statistics_online_users() {
- $list = array();
- $interval = time() - variable_get('user_block_seconds_online', 900);
- $sql = 'SELECT DISTINCT u.uid, u.name, MAX(s.timestamp) as maxtime
- FROM {users} u
- INNER JOIN {sessions} s ON u.uid = s.uid
- WHERE s.timestamp >= %d AND s.uid > 0
- GROUP BY u.uid, u.name
- ORDER BY maxtime DESC';
- $authenticated_users = db_query($sql, $interval);
-
- while ($account = db_fetch_object($authenticated_users)) {
- $list[] = theme('username', $account);
- }
-
- return $list;
-}
-
-// CALCULATING LINKS - New, Last, Etc *****************************************/
-
-function advanced_forum_get_reply_link($node) {
- $reply_link = array();
-
- // Give nodecomment (if installed) first shot at the comment setting
- $comment_setting = (empty($node->node_comment)) ? $node->comment : $node->node_comment;
-
- // Anchor to the form is depends on if reply is a node or a comment.
- $fragment = (empty($node->node_comment)) ? 'comment-form' : 'node-form';
-
- if ($comment_setting == COMMENT_NODE_READ_WRITE) {
- if (user_access('post comments')) {
- if (variable_get('comment_form_location_'. $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
- // Reply form is on separate page. Grab the href from the node links
- // so it's automatically corrected for Node Comments if needed.
- $reply_link['href'] = $node->links['comment_add']['href'];
- $reply_link['options']['fragment'] = $fragment;
-
- $reply_link['class'] = 'reply-allowed';
- $reply_link['title'] = t('Post reply');
-
- return $reply_link;
- }
- else {
- // Reply form is on same page. The reply button should jump down to it
- // rather than going to a new page.
- $reply_link['href'] = $_GET['q'];
- $reply_link['options']['fragment'] = $fragment;
- $current_page = isset($_GET['page']) ? $_GET['page'] : 0;
- $reply_link['options']['query'] = ($current_page) ? "page=$current_page" : NULL;
-
- $reply_link['class'] = 'reply-allowed';
- $reply_link['title'] = t('Quick reply');
-
- return $reply_link;
- }
- }
- else {
- // User does not have access to post replies on this node.
- return 'reply-forbidden';
- }
- }
- else {
- // Topic is locked.
- return 'reply-locked';
- }
-}
-
-/**
- * Get a link to the last post in a topic.
- *
- * @param $node
- * Node object
- * @return
- * Text linking to the last post in a topic.
- */
-function advanced_forum_last_post_link($node) {
- $last_comment_id = advanced_forum_last_post_in_topic($node->nid);
- $last_page = advanced_forum_get_last_page($node);
- $query = ($last_page > 0) ? "page=$last_page" : '';
-
- $options = array(
- 'html' => TRUE,
- 'query' => $query,
- 'fragment' => "comment-$last_comment_id",
- );
-
- return theme('advanced_forum_l', t('Last post'), "node/$node->nid", $options, 'large');
-}
-
-/**
- * Returns a link directly to the first new post in a topic.
- *
- * @param $node
- * Node object
- * @param $comment_count
- * Number of comments on passed node.
- * @return
- * Link to the first unread post.
- */
-function advanced_forum_first_new_post_link($node, $comment_count) {
- $nid = $node->nid;
- $current_page = isset($_GET['page']) ? $_GET['page'] : 0;
- $number_new_comments = advanced_forum_reply_num_new($nid);
-
- if ($number_new_comments > 0) {
- $page_of_first_new = advanced_forum_page_first_new($comment_count, $number_new_comments, $node);
-
- // Note that we are linking to the cid anchor rather than "new" because
- // the new links will be gone if we go to another page.
- $cid_of_first_new = advanced_forum_first_new_comment($nid);
-
- $number_new = t("(!new new)", array('!new' => $number_new_comments));
-
- $options = array(
- 'html' => TRUE,
- 'query' => $page_of_first_new,
- 'fragment' => "comment-$cid_of_first_new"
- );
-
- return theme('advanced_forum_l', t('First unread'), "node/$nid", $options, 'large');
- }
-}
-
-/**
- * Get the page number with the first new post.
- * This is simply a wrapper to either call the comment module version or the
- * nodecomment module version.
- */
-function advanced_forum_page_first_new($num_comments, $new_replies, $node) {
- $comment_type = module_invoke('nodecomment', 'get_comment_type', $node->type);
- if (isset($comment_type)) {
- return nodecomment_new_page_count($num_comments, $new_replies, $node);
- }
- else {
- return comment_new_page_count($num_comments, $new_replies, $node);
- }
-}
-
-/**
- * Get the number of new posts on a topic.
- * This is simply a wrapper to either call the comment module version or the
- * nodecomment module version.
- */
-function advanced_forum_reply_num_new($nid, $timestamp = 0) {
- // Make a static cache because this function is called twice from the topic
- // header. Once to display the number and once to make the link to first new.
- static $number_new_for_node = array();
-
- if (empty($number_new_for_node[$nid])) {
- global $user;
-
- $node = node_load($nid);
-
- // We must also check the forum post itself to see if we have viewed it
- $viewed = 0; // If not told otherwise, it has been viewed before
- if ($user->uid) {
- $viewed = node_last_viewed($nid);
- // Set it to 1 if it has not been viewed before.
- $viewed = ($viewed == 0 ? 1 : 0);
- }
-
- $comment_type = module_invoke('nodecomment', 'get_comment_type', $node->type);
- if (isset($comment_type)) {
- $number_new_for_node[$nid] = nodecomment_num_new($nid, $timestamp) + $viewed;
- }
- else {
- $number_new_for_node[$nid] = comment_num_new($nid, $timestamp) + $viewed;
- }
- }
-
- return $number_new_for_node[$nid];
-}
-
-/**
- * Get the comment id of the last post in a topic.
- *
- * @param $node
- * Node object
- * @return
- * cid of last post.
- */
-function advanced_forum_last_post_in_topic($nid) {
- $node = node_load($nid);
- if (module_exists('nodecomment') && nodecomment_get_comment_type($node->type)) {
- // Nodecomment module version
- $query = 'SELECT nc.cid
- FROM {node_comments} nc
- INNER JOIN {node} n ON nc.nid = n.nid
- WHERE nc.nid = %d AND n.status = 1
- ORDER BY nc.cid DESC';
- $result = db_result(db_query_range($query, $nid, 0, 1));
- }
- else {
- // Comment module version
- $query = 'SELECT c.cid
- FROM {comments} c
- WHERE c.nid = %d AND c.status = %d
- ORDER BY c.cid DESC';
- $result = db_result(db_query_range($query, $nid, COMMENT_PUBLISHED, 0, 1));
- }
-
- return $result;
-}
-
-/**
- * Returns the page number of the last page starting at 0 like the pager does.
- */
-function advanced_forum_get_last_page($node) {
- $comments_per_page = _comment_get_display_setting('comments_per_page', $node);
- $comment_count = $node->comment_count;
- $last_page = ceil($comment_count / $comments_per_page) - 1;
- return $last_page;
-}
-
-/**
- * Returns the ID of the first unread comment.
- *
- * @param $nid
- * Node ID
- * @param $timestamp
- * Date/time used to override when the user last viewed the node.
- * @return
- * Comment ID
- */
-function advanced_forum_first_new_comment($nid, $timestamp = 0) {
- global $user;
-
- if ($user->uid) {
- // Retrieve the timestamp at which the current user last viewed the
- // specified node.
- if (!$timestamp) {
- $timestamp = node_last_viewed($nid);
- }
-
- // Set the timestamp to the limit if the node was last read past the cutoff
- $timestamp = ($timestamp > NODE_NEW_LIMIT ? $timestamp : NODE_NEW_LIMIT);
-
- // Use the timestamp to retrieve the oldest new comment.
- if (module_exists('nodecomment')) {
- $query = "SELECT nc.cid
- FROM {node_comments} nc
- INNER JOIN {node} n ON nc.cid = n.nid
- WHERE nc.nid = %d AND n.changed > %d AND n.status = 1
- ORDER BY nc.cid";
- $result = db_result(db_query_range($query, $nid, $timestamp, 0, 1));
-
- }
- else {
- $query = "SELECT c.cid
- FROM {comments} c
- WHERE c.nid = %d AND c.timestamp > %d AND c.status = %d
- ORDER BY c.cid";
- $result = db_result(db_query_range($query, $nid, $timestamp, COMMENT_PUBLISHED, 0, 1));
- }
-
- return $result;
- }
- else {
- return 0;
- }
-}
-
-
-// GENERAL UTILITY FUNCTIONS *************************************************/
-
-/**
- * Return an array of node types allowed in a given vocabulary or term ID.
- *
- * Note: TID is currently for future use and not acted on.
- */
-function advanced_forum_allowed_node_types($tid=0, $vid=0) {
-
- if (module_exists('forum_access')) {
- // Check with forum access to see if this forum allows node creation.
- // If it doesn't, send back an empty list.
- if (!forum_access_access($tid, 'create', NULL, TRUE)) {
- return array();
- }
- }
-
- // If no vocabulary is passed in, assume it should be the forum vocab.
- $vid = (empty($vid)) ? variable_get('forum_nav_vocabulary', '') : $vid;
- $vocabulary = taxonomy_vocabulary_load($vid);
-
- if (is_array($vocabulary->nodes)) {
- // There are some node types associated with this vocab so return them.
- return $vocabulary->nodes;
- }
- else {
- return array();
- }
-}
-
-/**
- * Return whether a given node type is allowed in the whole forum or given forum.
- */
-function advanced_forum_type_is_in_forum($type, $tid=0) {
- $forum_types = advanced_forum_allowed_node_types();
- if (in_array($type, $forum_types)) {
- return TRUE;
- }
-}
-
-/**
- * Generate a list of node creation links for a forum.
- *
- * This is used on the forum list, allowing us to have direct
- * links to create new nodes in the forum.
- */
-function advanced_forum_node_type_create_list($tid) {
- $allowed_types = advanced_forum_allowed_node_types($tid);
-
- // Ensure "new topic" is first.
- if (isset($allowed_types['forum'])) {
- unset($allowed_types['forum']);
- array_unshift($allowed_types, 'forum');
- }
-
- // Loop through all node types allowed in this forum.
- foreach ($allowed_types as $type) {
- // Check if this node type can be created by current user.
- if (node_access('create', $type)) {
- // Fetch the "General" name of the content type.
- $node_type = node_get_types('name', $type);
-
- // Remove the word "Forum" out of "Forum topic" to shorten it.
- // @TODO: this is a little dodgy and may not work right with
- // translations. Should be replaced if there's a better way.
- $node_type = str_replace('Forum', '', $node_type);
-
- // Push the link with title and url to the array.
- $forum_types[$type] = array(
- 'name' => $node_type,
- 'href' => 'node/add/'. str_replace('_', '-', $type) .'/'. $tid,
- );
- }
- }
-
- if (empty($forum_types)) {
- // The user is logged-in; but denied access to create any new forum content type.
- global $user;
- if ($user->uid) {
- return t('You are not allowed to post new content in this forum.');
- }
- // The user is not logged-in; and denied access to create any new forum content type.
- else {
- $login = url('user/login', array('query' => drupal_get_destination()));
- return t('<a href="@login">Login</a> to post new content in forum.', array('@login' => $login));
- }
- }
- else {
- return $forum_types;
- }
-}
-
-/**
- * Create a drop down list of forum actions.
- */
-function advanced_forum_forum_tools($tid=0) {
- global $user;
-
- if ($tid > 0) {
- $targets[url("forum/active", array('query' => "forum[]=$tid"))] = t('View active posts in this forum');
- $targets[url("forum/unanswered", array('query' => "forum[]=$tid"))] = t('View unanswered posts in this forum');
-
- if ($user->uid) {
- $targets[url("forum/new", array('query' => "forum[]=$tid"))] = t('View new posts in this forum');
-
- if (module_exists('nodecomment')) {
- $targets[url("forum/user", array('query' => "forum[]=$tid"))] = t('View your posts in this forum');
- }
- }
- }
- else {
- $targets[url("forum/active")] = t('View active forum posts');
- $targets[url("forum/unanswered")] = t('View unanswered forum posts');
-
- if ($user->uid) {
- $targets[url("forum/new")] = t('View new forum posts');
-
- if (module_exists('nodecomment')) {
- $targets[url("forum/user")] = t('View your forum posts');
- }
- }
- }
-
- // Add mark as read to the jump list.
- // This code is a little odd and needs explaining. The return value of
- // the mark_as_read function is already formed HTML and so is unsuitable
- // for the jump list. The function already has built in the ability
- // to add to an existing $links array, which has the URL and title text
- // separated. Rather than add a third method just for the jump menu, I
- // reused that functionality here.
- $mark_as_read = array();
- advanced_forum_get_mark_read_link($tid, $mark_as_read);
- if (!empty($mark_as_read['mark-read']['href'])) {
- $targets[url($mark_as_read['mark-read']['href'])] = $mark_as_read['mark-read']['title'];
- }
-
- $options['choose'] = t("- Forum Tools -");
-
- // Create and return the jump menu.
- ctools_include('jump-menu');
- return drupal_get_form('ctools_jump_menu', $targets, $options);
-}
-
-/**
- * Creates a pager to place on each multi-page topic of the topic listing page.
- *
- * @param $max_pages_to_display
- * Number of pages to include on the pager.
- * @param $topic
- * Topic object to create a pager for.
- * @return
- * Object containing the linked pages ready assembly by the theme function.
- */
-function advanced_forum_create_topic_pager($max_pages_to_display, $topic) {
- // Find the number of comments per page for the node type of the topic.
- $comments_per_page = _comment_get_display_setting('comments_per_page', $topic);
-
- if ($max_pages_to_display > 0 && $topic->num_comments > $comments_per_page) {
- // Topic has more than one page and a pager is wanted. Start off the
- // first page because that doesn't have a query.
- $pager_array = array();
- $current_display_page = 1;
- $pager_array[] = l('1', "node/$topic->nid");
-
- // Find the ending point. The pager URL is always 1 less than
- // the number being displayed because the first page is 0.
- $last_display_page = ceil($topic->num_comments / $comments_per_page);
- $last_pager_page = $last_display_page - 1;
-
- // Add pages until we run out or until we hit the max to show.
- while (($current_display_page < $last_display_page) && ($current_display_page < $max_pages_to_display)) {
- // Move to the next page
- $current_display_page++;
-
- // The page number we link to is 1 less than what's displayed
- $link_to_page = $current_display_page - 1;
-
- // Add the link to the array
- $pager_array[] = l($current_display_page, "node/$topic->nid", array('query' => 'page=' . $link_to_page));
- }
-
- // Move to the next page
- $current_display_page++;
-
- if ($current_display_page == $last_display_page) {
- // We are one past the max to display, but it's the last page,
- // so putting the ...last is silly. Just display it normally.
- $link_to_page = $current_display_page - 1;
- $pager_array[] = l($current_display_page, "node/$topic->nid", array('query' => 'page=' . $link_to_page));
- }
-
- $pager_last = '';
- if ($current_display_page < $last_display_page) {
- // We are one past the max to display and still aren't
- // on the last page, so put in ... Last Page(N)
- $text = t('Last Page');
- $pager_last_text = l($text, "node/$topic->nid", array('query' => 'page=' . $last_pager_page));
- $pager_last_number = l($last_display_page, "node/$topic->nid", array('query' => 'page=' . $last_pager_page));
- }
-
- $topic_pager = new stdClass();
- $topic_pager->initial_pages = (empty($pager_array)) ? array() : $pager_array;
- $topic_pager->last_page_text = (empty($pager_last_text)) ? '' : $pager_last_text;
- $topic_pager->last_page_number = (empty($pager_last_numer)) ? '' : $pager_last_number;
-
- return $topic_pager;
- }
-}
-
-/**
- * Calculates the number of unread replies for each forum and returns the
- * count for the requested forum.
- */
-function advanced_forum_unread_replies_in_forum($tid, $uid) {
- static $result_cache = NULL;
-
- if (is_NULL($result_cache)) {
- $result_cache = array();
-
- if (module_exists("nodecomment")) {
- $sql = "SELECT COUNT(nc.cid) AS count, f.tid
- FROM {node_comments} nc
- INNER JOIN {forum} f ON nc.nid = f.nid
- INNER JOIN {node} n ON nc.cid = n.nid
- INNER JOIN {node} tn ON nc.nid = tn.nid and f.vid = tn.vid
- LEFT JOIN {history} h ON nc.nid = h.nid AND h.uid = %d
- WHERE n.status = 1 AND n.changed > %d AND (n.changed > h.timestamp OR h.timestamp IS NULL)
- GROUP BY f.tid";
-
- $sql = db_rewrite_sql($sql);
- }
- else {
- $sql = "SELECT COUNT(c.cid) AS count, f.tid
- FROM {comments} c
- INNER JOIN {forum} f ON c.nid = f.nid
- INNER JOIN {node} n ON f.vid = n.vid
- LEFT JOIN {history} h ON c.nid = h.nid AND h.uid = %d
- WHERE c.status = 0 AND c.timestamp > %d AND (c.timestamp > h.timestamp OR h.timestamp IS NULL)
- GROUP BY f.tid";
-
- $sql = db_rewrite_sql($sql, 'c', 'cid');
-
- }
-
- $result = db_query($sql, $uid, NODE_NEW_LIMIT);
- while ($row = db_fetch_array($result)) {
- $result_cache[$row['tid']] = $row['count'];
- }
- }
-
- return (isset($result_cache[$tid])) ? $result_cache[$tid] : 0;
-}
-
-/**
- * Returns the display position of a given reply post ID on a given node.
- */
-function advanced_forum_post_position($node_id, $post_id) {
- static $post_order = array();
-
- if (!isset($post_order[$node_id])) {
- // Initialize the spot for this node's list.
- $post_order[$node_id] = array();
-
- // Make this work with either core comments or node comments.
- $table = (module_exists('nodecomment')) ? "node_comments" : "comments";
-
- // Get the list of CIDs from the database in order of oldest first.
- // We are going to make that assumption for now for simplicity but may
- // revisit in the future if there are requests for newest first.
- $query = "SELECT c.cid FROM {" . $table . "} c WHERE c.nid = %d ORDER BY c.cid ASC";
-
- // Cycle through the results and fill in the array.
- $result = db_query($query, $node_id);
- while ($post = db_fetch_array($result)) {
- $post_order[$node_id][] = reset($post);
- }
- }
-
- // Find the position of the passed in post ID.
- $post_position = 0;
- if (is_array($post_order[$node_id])) {
- if (($index = array_search($post_id, $post_order[$node_id])) !== FALSE) {
- $post_position = $index;
-
- // We need to add 2 because the array starts at 0 and also because the topic
- // node is post #1 on display but is not included in the index.
- $post_position = $post_position + 2;
- }
- }
-
- return $post_position;
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_comment.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_comment.inc
deleted file mode 100644
index 19a629a..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_comment.inc
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/**
- * @file
- * Holds the contents of a preprocess function moved into its own file
- * to ease memory requirements and having too much code in one file.
- */
-
-function _advanced_forum_preprocess_comment(&$variables) {
- /* Easy links to the comment and parent node */
- $comment = $variables['comment'];
- $node = node_load($comment->nid);
- $variables['first_post'] = $node;
-
- // This is a comment, not the node.
- $variables['top_post'] = FALSE;
-
- /* Determine the template file to use for the comment. */
- if (arg(1) == 'reply' || arg(1) == 'edit') {
- // Use the preview version
- advanced_forum_add_template_suggestions("post-preview", $variables['template_files']);
- }
- else {
- // Use our combined node/comment template file
- advanced_forum_add_template_suggestions("post", $variables['template_files']);
- }
-
- /* Assemble all the classes & id that go on the main div. */
- $classes = array();
-
- // Add our general classes.
- $classes[] = 'forum-post clear-block';
-
- // Add the poster's UID
- $classes[] = "posted-by-$comment->uid";
-
- // Add class if the poster is the viewer.
- global $user;
- if ($user->uid > 0 && $user->uid == $comment->uid) {
- $classes[] = "post-by-viewer";
- }
-
- // Add class if the poster is the topic starter.
- if ($node->uid > 0 && $node->uid == $comment->uid) {
- $classes[] = "post-by-starter";
- }
-
- // Add class if post is new. Comment is used here instead of post for
- // consistency with Node Comments.
- if (!empty($comment->new)) {
- $classes[] = "comment-new";
- }
-
- // Create the template variable.
- $variables['advanced_forum_classes'] = implode(' ', $classes);
-
- /* New marker */
- $variables['new_marker'] = '';
- static $new_anchor_shown = FALSE;
-
- if (!empty($comment->new)) {
- if ($new_anchor_shown) {
- $variables['new_marker'] = '<span class="new">' . t('(new)') . '</span>';
- }
- else {
- $new_anchor_shown = TRUE;
- $variables['new_marker'] = '<a id="new"></a><span class="new">' . t('(new)') . '</span>';
- }
- }
-
- /* Post ID */
- // Set the post ID for theming / targetting
- $variables['post_id'] = "post-$comment->cid";
-
- /* Linked post number */
- if (!isset($post_number)) {
- static $post_number = 1;
- }
-
- $posts_per_page = _comment_get_display_setting('comments_per_page', $node);
-
- $page_number = !empty($_GET['page']) ? $_GET['page'] : 0;
- if (!$page_number) {
- $page_number = 0;
- }
-
- $post_number++;
-
- $linktext = '#' . (($page_number * $posts_per_page) + $post_number);
-
- if (module_exists('permalink')) {
- // If Permalink is enabled, use that to get the comment # link.
- $permalink = permalink_link_render('comment', $comment);
- $variables['post_link'] = l($linktext, $permalink['href'], $permalink);
- }
- else {
- // Otherwise, link to the comment anchor on the appropriate page.
- $fragment = 'comment-' . $comment->cid;
- $query = ($page_number) ? 'page=' . $page_number : NULL;
- $linkpath = "node/$node->nid";
-
- $variables['post_link'] = l($linktext, $linkpath, array('query' => $query, 'fragment' => $fragment));
- }
-
- /* In reply to */
- $variables['in_reply_to'] = "";
- if ($comment->pid > 0) {
- // Find the display position of the parent post;.
- $post_position = advanced_forum_post_position($node->nid, $comment->pid);
-
- // This extra if test is a sanity check in case the comment being replied
- // to no longer exists.
- if ($post_position > 0) {
- // Find the page the post is on. We need to compensate for the topic node
- // being #1 which puts an extra post on the first page but not on the rest.
- $page_number = floor(($post_position - 2) / $posts_per_page);
-
- // Assemble the link.
- $fragment = 'comment-' . $comment->pid;
- $query = ($page_number) ? 'page=' . $page_number : NULL;
- $linktext = t("(Reply to #!post_position)", array('!post_position' => $post_position));
- $linkpath = "node/$node->nid";
- $variables['in_reply_to'] = l($linktext, $linkpath, array('query' => $query, 'fragment' => $fragment));
- }
- }
-
- /* Title */
- if (variable_get('comment_subject_field_' . $node->type, 1) == 0) {
- // if comment titles are disabled, don't display it.
- $variables['title'] = '';
- }
- else {
- // Assign the subject to the title variable for consistancy with nodes.
- $variables['title'] = check_plain($comment->subject);
- }
-
- /* User information / author pane */
- if ($comment->uid == 0) {
- // Anonymous user. Make a fake user object for theme_username
- $variables['account']->name = empty($comment->name) ? "" : $comment->name;
- $variables['account']->homepage = empty($comment->homepage) ? "" : $comment->homepage;
- $variables['account']->email = empty($comment->email) ? "" : $comment->email;
- }
- else {
- // Load up the real user object
- $variables['account'] = user_load(array('uid' => $comment->uid));
- }
-
- // Create the author pane
- if (module_exists('author_pane')) {
- $variables['author_pane'] = theme('author_pane', $variables['account'], 'advanced_forum', variable_get('advanced_forum_user_picture_preset', ''), $comment, TRUE);
- }
- else {
- $variables['author_pane'] = theme('advanced_forum_simple_author_pane', $comment);
- }
-
- /* Content */
- // Assign the comment to the content variable for consistancy with nodes.
- $variables['content'] = $comment->comment;
-
- /* Signatures */
- // Load the signature.
- if (module_exists('signature_forum')) {
- // If Signature For Forums is installed, use that
- $variables['signature'] = signature_forum_get_signature($comment);
- }
- elseif (variable_get('user_signatures', 0)) {
- if (!empty($variables['account']->signature)) {
- // Otherwise load Drupal's built in one, if enabled.
- $variables['signature'] = check_markup($variables['account']->signature, $variables['account']->signature_format, FALSE);
- }
- }
-
- /* Post edited */
- $variables['post_edited'] = (isset($variables['comment_edited'])) ? $variables['comment_edited'] : "";
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_forum_list.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_forum_list.inc
deleted file mode 100644
index de9ffff..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_forum_list.inc
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-
-/**
- * @file
- * Holds the contents of a preprocess function moved into its own file
- * to ease memory requirements and having too much code in one file.
- */
-
-function _advanced_forum_preprocess_forum_list(&$variables) {
- // Tell Drupal to use our forum list template file.
- advanced_forum_add_template_suggestions("forum-list", $variables['template_files']);
-
- // Add needed items for the collapsible containers.
- $variables['collapsible'] = variable_get('advanced_forum_collapsible_containers', 'slide');
- if ($variables['collapsible'] != 'none') {
- drupal_add_js(drupal_get_path('module', 'advanced_forum') . '/js/advanced_forum.js', 'module');
- drupal_add_js(array('advanced_forum' => array('effect' => $variables['collapsible'])), 'setting');
- }
-
- // The tid is the ID of the container or forum we are in. Assign it to
- // $parent_id for easy reference, assign it to the forum_id template variable
- // to give it a nice name for themers, then get rid of the original variable.
- $parent_id = isset($variables['tid']) ? $variables['tid'] : 0;
- $variables['forum_id'] = $parent_id;
- unset($variables['tid']);
-
- // Add a variable showning if we are using taxonomy image for easier theming.
- $variables['use_taxonomy_image'] = (function_exists('taxonomy_image_display') && variable_get('advanced_forum_use_taxonomy_image', TRUE));
-
- // Process the containers and forums and move them to a new variable.
- $items = array();
- $lowest_depth = 0;
- foreach ($variables['forums'] as $id => $forum) {
- if (empty($forum->container)) {
- $items[$id] = advanced_forum_process_forum($forum);
- }
- else {
- $items[$id] = advanced_forum_process_container($forum);
- }
-
- // Figure out how deep the hierarchy goes for the next step.
- if ($forum->depth > $lowest_depth) {
- $lowest_depth = $forum->depth;
- }
- }
-
- for ($depth = $lowest_depth; $depth > 0; $depth--)
- foreach ($items as $id => $item) {
- if ($item->depth == $depth) {
- $items[$item->parents['0']]->child_total_topics += $item->total_topics + $item->child_total_topics;
- $items[$item->parents['0']]->child_new_topics += $item->new_topics + $item->child_new_topics;
- $items[$item->parents['0']]->child_total_posts += $item->total_posts + $item->child_total_posts;
- $items[$item->parents['0']]->child_new_posts += $item->new_posts + $item->child_new_posts;
- }
- }
-
- // Loop through all the items and fill the $tables variable that will
- // hold all the tables with the containers and forums organized, processed,
- // and ready for the template.
-
- if ($parent_id) {
- // On a container page. Fake the main table.
- $table_counter = 1;
- $tables[$table_counter]['table_info'] = advanced_forum_process_container($variables['parents'][0]);
- }
- else {
- $table_counter = 0;
- }
-
- foreach ($items as $id => $item) {
- // Get a handle on the parent of this item.
- if ($parent_id && $item->depth == 0) {
- // If we are on a container page, the parent of root items is the main
- // container that is being used for the table info.
- $parent = $tables[$table_counter]['table_info'];
- }
- elseif (!empty($variables['forums'][$item->parents[0]])) {
- // For simplicity, we assume forums/containers have only one parent.
- $parent = $variables['forums'][$item->parents[0]];
- }
- // Intentional no "else" because only root items on the main page have
- // no parent and we don't use the variable there.
-
- // If we aren't on the main forum page, we need to bump up the depth.
- $item_depth = ($parent_id) ? $item->depth + 1 : $item->depth;
-
- if (!empty($item->container)) {
- // CONTAINERS.
-
- if ($item_depth == 0) {
- // Top level container always starts a new table.
- $table_counter++;
- $tables[$table_counter]['table_info'] = $item;
- $tables[$table_counter]['items'] = array();
-
- // Reset the striping.
- advanced_forum_stripe(TRUE);
- }
- elseif ($item_depth == 1) {
- // Subcontainer at top level is treated like a forum.
-
- // We set the forum icon here, rather than in the process_forum
- // function because we need to take into account new content
- // in children.
- if ($item->new_topics || $item->new_posts || $item->child_new_topics || $item->child_new_posts) {
- $item->icon_classes = "forum-list-icon forum-list-icon-new-posts";
- $item->icon_text = t("New posts");
- }
- else {
- $item->icon_classes = "forum-list-icon forum-list-icon-default";
- $item->icon_text = t("No new");
- }
-
- // Set the variable to control the row striping.
- $item->zebra = advanced_forum_stripe();
-
- // Add the container info to the table's item list.
- $tables[$table_counter]['items'][$id] = $item;
- }
- elseif ($item_depth == 2) {
- // A container elsewhere gets added to the parent's subcontainer list.
- $tables[$table_counter]['items'][$parent->tid]->subcontainer_list[$id] = $item;
- }
- }
- else {
- // FORUMS.
-
- // We set the forum icon here, rather than in the process_forum
- // function because we need to take into account new content
- // in children.
- if ($item->new_topics || $item->new_posts || $item->child_new_topics || $item->child_new_posts) {
- $item->icon_classes = "forum-list-icon forum-list-icon-new-posts";
- $item->icon_text = t("New posts");
- }
- else {
- $item->icon_classes = "forum-list-icon forum-list-icon-default";
- $item->icon_text = t("No new");
- }
-
- if ($item_depth == 0) {
- // This is a forum at the root. If it is the first or the first
- // since the last container, make a new table. Otherwise, put it in
- // the previous table.
- if (empty($table_counter) || !empty($tables[$table_counter]['table_info']->container)) {
- // This is the first root item or the current table belongs to a
- // container. Start a new generic one. We need a tid so just grab
- // the tid of the current forum for it.
- $table_counter++;
- $tables[$table_counter]['table_info']->name = t('Forums');
- $tables[$table_counter]['table_info']->description = '';
- $tables[$table_counter]['table_info']->tid = $item->tid;
-
- // Reset the striping.
- advanced_forum_stripe(TRUE);
- }
-
- // Set the variable to control the row striping.
- $item->zebra = advanced_forum_stripe();
-
- // Add the forum info to the table's item list.
- $tables[$table_counter]['items'][$id] = $item;
- }
- elseif ($item_depth == 1) {
- // Main forum. Add it to the item list.
- if (empty($item->container)) {
- $item->zebra = advanced_forum_stripe();
- }
-
- $tables[$table_counter]['items'][$id] = $item;
- }
- elseif ($item_depth == 2) {
- // Subforum.
- $tables[$table_counter]['items'][$parent->tid]->subforum_list[$id] = $item;
- }
- }
- }
-
- // Theme subcontainers, subforums and add post counts to parents.
- foreach ($tables as $table_id => $table) {
- foreach ($table['items'] as $item_id => $item) {
- if (!empty($item->subforum_list)) {
- $tables[$table_id]['items'][$item_id]->subforums = theme('advanced_forum_subforum_list', $item->subforum_list);
- }
-
- if (!empty($item->subcontainer_list)) {
- $tables[$table_id]['items'][$item_id]->subcontainers = theme('advanced_forum_subcontainer_list', $item->subcontainer_list);
- }
- }
- }
-
- $variables['tables'] = $tables;
-
- // Remove unneeded variables.
- unset($variables['zebra']);
- unset($variables['forums']);
-}
-
-
-function advanced_forum_stripe($reset = FALSE) {
- static $stripe = 'odd';
-
- if ($reset) {
- $stripe = 'odd';
- }
- else {
- $stripe = ($stripe == 'odd') ? 'even' : 'odd';
- }
-
- return $stripe;
-}
-
-/**
- * Prepare an individual container for display.
- */
-function advanced_forum_process_container($container) {
- // Create the link to the container.
- $container->link = url("forum/$container->tid");
-
- // Sanitise the name and description so they can be safely printed.
- $container->name = check_plain($container->name);
- $container->description = !empty($container->description) ? filter_xss_admin($container->description) : '';
-
- // Create a variable to check if the item is a container in the template.
- $container->is_container = TRUE;
-
- // @TODO: Make the icon change if subforums have posts.
- $container->icon_classes = "forum-list-icon forum-list-icon-default";
- $container->icon_text = t("No new");
-
- // Add in the taxonomy image, if any.
- if (function_exists('taxonomy_image_display') && variable_get('advanced_forum_use_taxonomy_image', TRUE)) {
- $container->forum_image = taxonomy_image_display($container->tid);
- }
-
- // Initialize these variables to avoid notices later.
- $container->total_topics = 0;
- $container->new_topics = 0;
- $container->total_posts = 0;
- $container->new_posts = 0;
- $container->child_total_topics = 0;
- $container->child_new_topics = 0;
- $container->child_total_posts = 0;
- $container->child_new_posts = 0;
-
- return $container;
-}
-
-/**
- * Prepare an individual forum for display.
- */
-function advanced_forum_process_forum($forum) {
- // Create a variable to check if the item is a container in the template.
- $forum->is_container = FALSE;
-
- // Create the link to the forum.
- $forum->link = url("forum/$forum->tid");
-
- // Sanitise the name and description so they can be safely printed.
- // We don't do this for subforum names because that is sent through l()
- // in the theme function which runs it through check_plain().
- $forum->name = empty($forum->parents[0]) ? check_plain($forum->name) : $forum->name;
- $forum->description = !empty($forum->description) ? filter_xss_admin($forum->description) : '';
-
- // Initialize these variables to avoid notices later since not all forums
- // have new content or even any content at all.
- $forum->total_topics = 0;
- $forum->child_total_topics = 0;
-
- $forum->new_topics = 0;
- $forum->new_topics_text = '';
- $forum->new_topics_link = '';
- $forum->child_new_topics = 0;
-
- $forum->total_posts = 0;
- $forum->child_total_posts = 0;
-
- $forum->new_posts = 0;
- $forum->new_posts_text = '';
- $forum->new_posts_link = '';
- $forum->child_new_posts = 0;
-
- // Rename these to make them more descriptive.
- if (isset($forum->num_topics)) {
- $forum->total_topics = $forum->num_topics;
- unset($forum->num_topics);
- }
-
- if (isset($forum->num_posts)) {
- $forum->total_posts = $forum->num_posts;
- unset($forum->num_posts);
- }
-
- // If the viewer is authenticated, check for new topics and posts.
- global $user;
- if ($user->uid) {
- // New topics.
- $forum->new_topics = _forum_topics_unread($forum->tid, $user->uid);
- if ($forum->new_topics) {
- $forum->new_topics_text = format_plural($forum->new_topics, '1 new', '@count new');
- $forum->new_topics_link = url("forum/$forum->tid", array('fragment' => 'new'));
- }
-
- // New posts are optional because the query is slow.
- if (variable_get('advanced_forum_get_new_comments', 0)) {
- $forum->new_posts = advanced_forum_unread_replies_in_forum($forum->tid, $user->uid) + $forum->new_topics;
-
- if ($forum->new_posts) {
- $forum->new_posts_text = format_plural($forum->new_posts, '1 new', '@count new');
- $forum->new_posts_link = url("forum/$forum->tid", array('fragment' => 'new'));
- }
- }
- }
-
- // Process the "last post" object into a printable string.
- // Trying to copy the string back into the variable directly caused odd bugs
- // so we move it to a temp variable then unset the original.
- $last_post = (empty($forum->last_post)) ? '' : $forum->last_post;
- unset($forum->last_post);
- $forum->last_post = theme('forum_submitted', $last_post);
-
- // Add in the taxonomy image, if any
- if (function_exists('taxonomy_image_display') && variable_get('advanced_forum_use_taxonomy_image', TRUE)) {
- $forum->forum_image = taxonomy_image_display($forum->tid);
- }
-
- return $forum;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_forums.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_forums.inc
deleted file mode 100644
index 6781351..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_forums.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @file
- * Holds the contents of a preprocess function moved into its own file
- * to ease memory requirements and having too much code in one file.
- */
-
-function _advanced_forum_preprocess_forums(&$variables) {
- advanced_forum_add_template_suggestions("forums", $variables['template_files']);
-
- $variables['forums_defined'] = count($variables['forums']) || count($variables['parents']);
-
- $tid = intval($variables['tid']);
-
- if (!empty($variables['forums'])) {
- $variables['forums'] = theme('forum_list', $variables['forums'], $variables['parents'], $variables['tid']);
- }
- else {
- $variables['forums'] = '';
- }
-
- $variables['search'] = theme('advanced_forum_search_forum', $tid);
-
- if (arg(1) == 0) {
- // We're on the front page of the forums.
-
- // Remove forum description.
- $variables['forum_description'] = '';
-
- // This is normally attached to the topic list so we need to create it
- // here as well since the main page has no topics.
- $variables['forum_tools'] = advanced_forum_forum_tools(0);
-
- // Fetch the forum statistics.
- $variables['forum_statistics'] = '';
- if (user_access('view forum statistics')) {
- $variables['forum_statistics'] = theme('advanced_forum_statistics');
- }
-
- // Fetch the forum legend.
- $variables['forum_legend'] = theme('advanced_forum_forum_legend');
- }
- else {
- // Grab the forum description and make it available to the template file
- $forum = taxonomy_get_term($tid);
- $variables['forum_description'] = $forum->description;
-
- // Get the themed list of node types that can be posted in this forum.
- $variables['forum_links'] = theme('advanced_forum_node_type_create_list', $variables['tid']);
-
- // Set a variable for displaying the topic legend.
- $variables['topic_legend'] = theme('advanced_forum_topic_legend');
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_node.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_node.inc
deleted file mode 100644
index def2b6f..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/advanced_forum_preprocess_node.inc
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-
-/**
- * @file
- * Holds the contents of a preprocess function moved into its own file
- * to ease memory requirements and having too much code in one file.
- */
-
-function _advanced_forum_preprocess_node(&$variables) {
- /* Shortcut variables */
- $node = $variables['node'];
-
- $node_parent_id = '';
- if (!empty($variables['node']->comment_target_nid)) {
- // This is a Node Comments reply node so grab the parent id and load the
- // parent node for use below.
- $node_parent_id = $variables['node']->comment_target_nid;
- $parent_node = node_load($node_parent_id);
- }
-
- /* Determine the template file to use for the node. */
- if (!$node_parent_id && isset($_GET['page']) && $_GET['page'] > 0) {
- // This is the repeated node on the top of subsequent pages.
- // We send this to a special .tpl so people can adjust it to their needs.
- advanced_forum_add_template_suggestions("post-repeated", $variables['template_files']);
- }
- elseif (arg(1) == 'reply' || (arg(0) == 'node' && arg(1) == 'add') || $variables['node']->build_mode == NODE_BUILD_PREVIEW) {
- // 'reply' deals with the first post being shown when adding a comment.
- // 'node/add' is when previewing a new forum post.
- advanced_forum_add_template_suggestions("post-preview", $variables['template_files']);
- }
- elseif (arg(0) != 'node' || arg(1) < 1) {
- // We aren't on the node page so use the teaser template.
- advanced_forum_add_template_suggestions("post-teaser", $variables['template_files']);
- }
- else {
- // Use our combined node/comment template file
- advanced_forum_add_template_suggestions("post", $variables['template_files']);
- }
-
- /* Topic header */
- // Check if this node is the first post, aka topic head. When using the
- // comment module, this will always be true because replies are not nodes
- // but nodecomment will use this same preprocess for all posts.
- $variables['top_post'] = '';
- if (!$node_parent_id) {
- $variables['top_post'] = TRUE;
-
- // Build the topic header
- $variables['topic_header'] = theme('advanced_forum_topic_header', $node, $variables['comment_count']);
- }
-
- /* Assemble all the classes & id that go on the main div. */
- $classes = array();
-
- // Add in our classes.
- $classes[] = 'forum-post clear-block';
-
- // Add the current language to the classes for image handling.
- global $language;
- if (!empty($language->language)) {
- $classes[] = $language->language;
- }
-
- // Add the poster's UID
- $classes[] = "posted-by-$node->uid";
-
- // Add class if the poster is the topic starter. This is only applicable
- // on Node Comment reply nodes as core comments are handled in the comment
- // template.
- if ($node_parent_id && $node->uid > 0 && $node->uid == $parent_node->uid) {
- $classes[] = "post-by-starter";
- }
-
- // Create the template variable.
- $variables['advanced_forum_classes'] = implode(' ', $classes);
-
- /* New marker */
- // This is dealt with in the caching section. Initialized here to avoid
- // notices on the top post.
- $variables['new_marker'] = '';
-
- /* Post ID */
- // Set the post ID for theming / targetting
- $variables['post_id'] = "post-$node->nid";
-
- /* Coment anchor */
- if ($node_parent_id) {
- // We need to add this because nodecomment puts this in the template
- // that we are overriding whereas the comment module adds it in code
- // outside of the template and it will be there twice if we always add it.
- // Must use 'comment' instead of 'post' or 'reply' to match NC & core.
- $variables['comment_anchor'] = '<a id="comment-' . $node->nid . '"></a>';
- }
-
- /* Linked post number */
- if (!isset($post_number)) {
- static $post_number = 1;
- }
-
- $page_number = !empty($_GET['page']) ? $_GET['page'] : 0;
-
- if (!$node_parent_id) {
- // If this is the topic starting node, we need to start off the numbering.
- $variables['post_link'] = l('#1', "node/$node->nid");
- }
- else {
- // This is a nodecomment node so we want to do the comment counting.
- $posts_per_page = _comment_get_display_setting('comments_per_page', $parent_node);
- $post_number++;
-
- $linktext = '#' . (($page_number * $posts_per_page) + $post_number);
- $linkpath = "node/$parent_node->nid";
- $query = ($page_number) ? 'page=' . $page_number : NULL;
- $fragment = 'comment-' . $node->nid;
-
- $variables['post_link'] = l($linktext, $linkpath, array('query' => $query, 'fragment' => $fragment));
- }
-
- /* In reply to */
- $variables['in_reply_to'] = "";
- if (!empty($node->comment_target_cid)) {
- // Find the display position of the parent post;.
- $post_position = advanced_forum_post_position($node_parent_id, $node->comment_target_cid);
-
- // This extra if test is a sanity check in case the comment being replied
- // to no longer exists.
- if ($post_position > 0) {
- // Find the page the post is on. We need to compensate for the topic node
- // being #1 which puts an extra post on the first page but not on the rest.
- $page_number = floor(($post_position - 2) / $posts_per_page);
-
- // Assemble the link.
- $fragment = 'comment-' . $node->comment_target_cid;
- $query = ($page_number) ? 'page=' . $page_number : NULL;
- $linktext = t("(Reply to #!post_position)", array('!post_position' => $post_position));
- $linkpath = "node/$parent_node->nid";
- $variables['in_reply_to'] = l($linktext, $linkpath, array('query' => $query, 'fragment' => $fragment));
- }
- }
-
- /* User information / author pane */
- $variables['account'] = user_load(array('uid' => $node->uid));
-
- if (!module_exists('author_pane')) {
- // If not using the Author Pane module, create a simple version with just
- // name and photo. If using AP, that's handled down in the
- // "uncached variables" section.
- $variables['author_pane'] = theme('advanced_forum_simple_author_pane', $node);
- }
-
- /* Reply link */
- if (!$node_parent_id) {
- // Build the reply link / button. This isn't used in the default template
- // but is provided as a convenience to people who want to customize theirs.
- $variables['reply_link'] = theme('advanced_forum_reply_link', $node);
- }
-
- /* Signatures */
- if (module_exists('signature_forum')) {
- // If Signatures for Forums is installed, use that.
- // Note: we cannot get around the signature being cached because we would
- // need to do a full node load to get all the info SfF needs to replace
- // the token and that would counteract the caching.
- $variables['signature'] = signature_forum_get_signature($node);
- }
-
- /* Uncached variables */
- // Node Comment caches the whole topic for performance reasons. This is
- // incompatable with any variables that change based on who's viewing the
- // topic. To get around this, we place a token here and replace it in post
- // rendering. Only do this if post rendering is supported and it's not a
- // preview of nodecomment.
- if (!$variables['top_post'] && method_exists('views_plugin_cache', 'post_render') && $variables['node']->build_mode != NODE_BUILD_PREVIEW) {
- /* Author Pane */
- if (module_exists('author_pane')) {
- $variables['author_pane'] = '<!--post:author-pane-' . $node->uid . '-->';
- }
-
- /* Revisions */
- if ($variables['created'] != $variables['revision_timestamp']) {
- $variables['post_edited'] = '<!--post:post-edited-' . $node->nid . '-->';
- }
-
- /* Signatures */
- if (!module_exists('signature_forum') && variable_get('user_signatures', 0)) {
- // Signature for Forums module not enabled; load Drupal's built in one,
- // if enabled.
- $variables['signature'] = '<!--post:signature-core-' . $node->uid . '-->';
- }
-
- /* User specific node theming class */
- // Add class if the poster is the viewer.
- $variables['advanced_forum_classes'] .= ' <!--post:poster-id-' . $node->uid . '-->';
-
- /* New marker */
- // This is handled by Node Comments. Just make sure the tokens are printed.
- $variables['new_marker'] = $variables['first_new'] . ' ' . $variables['new_output'];
- }
- else {
- // Create variables normally.
- /* Author Pane */
- if (module_exists('author_pane')) {
- $variables['author_pane'] = theme('author_pane', $variables['account'], 'advanced_forum', variable_get('advanced_forum_user_picture_preset', ''), $node, TRUE);
- }
-
- /* Revisions */
- if (!empty($variables['revision_timestamp']) && user_access('view last edited notice') && $variables['created'] != $variables['revision_timestamp']) {
- $variables['post_edited'] = theme('advanced_forum_post_edited', $variables['revision_uid'], $variables['revision_timestamp'], $variables['log']);
- }
-
- /* Signatures */
- if (!module_exists('signature_forum') && variable_get('user_signatures', 0)) {
- if ($variables['account']->signature) {
- $variables['signature'] = check_markup($variables['account']->signature, $variables['account']->signature_format, FALSE);
- }
- }
-
- /* Viewer is poster class */
- global $user;
- if ($user->uid > 0 && $user->uid == $node->uid) {
- $variables['advanced_forum_classes'] .= " post-by-viewer";
- }
- }
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/core-overrides.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/core-overrides.inc
deleted file mode 100644
index b06d6c8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/core-overrides.inc
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * @file
- * These are functions that are overriding core directly (not theme related.)
- */
-
-/**
- * Menu callback; prints a forum listing.
- */
-function advanced_forum_page($tid = 0) {
- if (!is_numeric($tid)) {
- return MENU_NOT_FOUND;
- }
-
- $tid = (int)$tid;
-
- _advanced_forum_add_files();
-
- $topics = '';
- $forum_per_page = variable_get('forum_per_page', 25);
- $sortby = variable_get('forum_order', 1);
-
- $forums = advanced_forum_get_forums($tid);
-
- $parents = taxonomy_get_parents_all($tid);
- if ($tid && !in_array($tid, variable_get('forum_containers', array()))) {
- $topics = advanced_forum_get_topics($tid, $sortby, $forum_per_page);
- }
-
- $vid = variable_get('forum_nav_vocabulary', '');
- $vocabulary = taxonomy_vocabulary_load($vid);
-
- // Breadcrumb navigation:
- $breadcrumb[] = l(t('Home'), NULL);
- if ($tid) {
- $breadcrumb[] = l($vocabulary->name, 'forum');
- }
- if ($parents) {
- foreach (array_reverse($parents) as $p) {
- if ($p->tid != $tid) {
- $breadcrumb[] = l($p->name, 'forum/'. $p->tid);
- }
- else {
- $title = $p->name;
- }
- }
- }
-
- if (empty($title)) {
- $title = $vocabulary->name;
- }
-
- if (!variable_get('advanced_forum_disable_breadcrumbs', FALSE)) {
- drupal_set_breadcrumb($breadcrumb);
- }
-
- drupal_set_title(check_plain($title));
-
- return theme('forums', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
-}
-
-/**
- * Returns a list of all forums for a given taxonomy id
- *
- * This is copied from the forum module and adapted.
- *
- * Forum objects contain the following fields
- * -num_topics Number of topics in the forum
- * -num_posts Total number of posts in all topics
- * -last_post Most recent post for the forum
- *
- * @param $tid
- * Taxonomy ID of the vocabulary that holds the forum list.
- * @return
- * Array of object containing the forum information.
- */
-function advanced_forum_get_forums($tid = 0) {
-
- $forums = array();
- $vid = variable_get('forum_nav_vocabulary', '');
- $_forums = taxonomy_get_tree($vid, $tid);
-
- if (count($_forums)) {
-
- $counts = array();
-
- $sql = "
- SELECT r.tid AS tid, n.nid AS nid, l.comment_count AS nid_comment_count
- FROM {node} n
- INNER JOIN {node_comment_statistics} l ON n.nid = l.nid
- INNER JOIN {term_node} r ON n.vid = r.vid
- WHERE n.status = 1
- GROUP BY r.tid, n.nid, l.comment_count";
- $sql_rewritten = db_rewrite_sql($sql);
- if ($sql_rewritten == $sql) {
- $sql = "
- SELECT r.tid, COUNT(n.nid) AS topic_count, SUM(l.comment_count) AS comment_count
- FROM {node} n
- INNER JOIN {node_comment_statistics} l ON n.nid = l.nid
- INNER JOIN {term_node} r ON n.vid = r.vid
- WHERE n.status = 1
- GROUP BY r.tid";
- $sql = db_rewrite_sql($sql);
- }
- else {
- $sql = "
- SELECT tid, COUNT(nid) AS topic_count, SUM(nid_comment_count) AS comment_count
- FROM ($sql_rewritten) AS forum_content_list
- GROUP BY tid";
- }
-
- $_counts = db_query($sql);
- while ($count = db_fetch_object($_counts)) {
- $counts[$count->tid] = $count;
- }
- }
-
- foreach ($_forums as $forum) {
- // Check if this term is a container
- if (in_array($forum->tid, variable_get('forum_containers', array()))) {
- $forum->container = 1;
- }
-
- if (!empty($counts[$forum->tid])) {
- $forum->num_topics = $counts[$forum->tid]->topic_count;
- $forum->num_posts = $counts[$forum->tid]->topic_count + $counts[$forum->tid]->comment_count;
- }
- else {
- $forum->num_topics = 0;
- $forum->num_posts = 0;
- }
-
- // Find out from the style's .info how many posts per forum to collect.
- $info = advanced_forum_style_info();
- $post_count = isset($info['forum list post count']) ? intval($info['forum list post count']) : 1;
-
- // This query does not use full ANSI syntax since MySQL 3.x does not support
- // table1 INNER JOIN table2 INNER JOIN table3 ON table2_criteria ON table3_criteria
- // used to join node_comment_statistics to users.
- $sql = "SELECT n.nid,
- n.title as node_title,
- n.type,
- ncs.last_comment_timestamp as timestamp,
- IF (ncs.last_comment_uid != 0, u2.name, ncs.last_comment_name) AS name,
- ncs.last_comment_uid as uid
- FROM {node} n
- INNER JOIN {users} u1 ON n.uid = u1.uid
- INNER JOIN {term_node} tn ON n.vid = tn.vid
- INNER JOIN {node_comment_statistics} ncs ON n.nid = ncs.nid
- INNER JOIN {users} u2 ON ncs.last_comment_uid=u2.uid
- WHERE n.status = 1 AND tn.tid = %d
- ORDER BY ncs.last_comment_timestamp DESC";
- $sql = db_rewrite_sql($sql);
- if ($post_count) {
- $result = db_query_range($sql, $forum->tid, 0, $post_count);
- while ($topic = db_fetch_object($result)) {
- if ($post_count > 1) {
- $forum->last_post[] = $topic;
- }
- else {
- $forum->last_post = $topic;
- }
- }
- }
-
- $forums[$forum->tid] = $forum;
- }
-
- return $forums;
-}
-
-/**
- * This is copied from the forum module and adapted.
- */
-function advanced_forum_get_topics($tid, $sortby, $forum_per_page, $sort_form = TRUE) {
- $term = taxonomy_get_term($tid);
- drupal_add_feed(url('taxonomy/term/'. $tid .'/0/feed'), 'RSS - '. check_plain($term->name));
-
- // Views handles this page
- $view = views_get_view('advanced_forum_topic_list');
- $view->set_display('default');
- $view->set_arguments(array($tid));
- $view->sort_form = $sort_form;
- return $view->preview();
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/mark-read.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/mark-read.inc
deleted file mode 100644
index fdd746f..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/mark-read.inc
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-
-/**
- * @file
- * Holds functions relating to the Mark Forum/All Read functionality.
- */
-
-/**
- * Either fill a $links array or return a string version of the link to mark read.
- */
-function advanced_forum_get_mark_read_link($tid = 0, &$links = array()) {
- if (advanced_forum_markasread_access() && !in_array($tid, variable_get('forum_containers', array()))) {
- if ($tid) {
- $links['mark-read']['title'] = t('Mark all topics read');
- $links['mark-read']['href'] = "forum/markasread/$tid";
-
- return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
- }
- else {
- $links['mark-read']['title'] = t('Mark all forums read');
- $links['mark-read']['href'] = "forum/markasread";
-
- return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE));
- }
- }
-}
-
-/**
- * Marks all posts in forums or in a given forum as read by the current user.
- */
-function advanced_forum_markasread($current_forum_id = 0) {
- global $user;
-
- // See if we're on a forum or on the forum overview
- // Path will be /forum/markasread or /forum/markasread/tid
- if ($current_forum_id) {
- // Delete the current history entries so already visited nodes get updated.
- $sql = "DELETE h
- FROM {history} AS h
- INNER JOIN {term_node} AS tn ON (h.nid = tn.nid)
- WHERE h.uid = %d AND tn.tid = %d";
- db_query($sql, $user->uid, $current_forum_id);
-
- // Update the history table with all forum nodes newer than the cutoff.
- $sql = "INSERT INTO {history} (uid, nid, timestamp)
- SELECT DISTINCT %d, n.nid, %d
- FROM {node} AS n
- INNER JOIN {term_node} AS tn ON n.nid = tn.nid
- INNER JOIN {node_comment_statistics} AS ncs ON ncs.nid = n.nid
- WHERE (n.changed > %d OR ncs.last_comment_timestamp > %d) AND tn.tid = %d";
-
- $args = array($user->uid, time(), NODE_NEW_LIMIT, NODE_NEW_LIMIT, $current_forum_id);
- db_query($sql, $args);
-
- // Readpath integration
- if (module_exists('readpath')) {
- readpath_clear_readpath();
- }
-
- drupal_set_message(t('All content in this forum has been marked as read'));
- drupal_goto('forum/' . $current_forum_id);
- }
-
- // We are on the forum overview, requesting all forums be marked read
- $forum_vocabulary_id = variable_get('forum_nav_vocabulary', '');
-
- // Delete the current history entries so already visited nodes get updated.
- $sql = "DELETE h
- FROM {history} AS h
- INNER JOIN {term_node} AS tn ON (h.nid = tn.nid)
- INNER JOIN {term_data} AS td ON (td.tid = tn.tid)
- WHERE h.uid = %d AND td.vid = %d";
- db_query($sql, $user->uid, $forum_vocabulary_id);
-
- // Update the history table with all forum nodes newer than the cutoff.
- $sql = "INSERT INTO {history} (uid, nid, timestamp)
- SELECT DISTINCT %d, n.nid, %d
- FROM {node} AS n
- INNER JOIN {term_node} AS tn ON n.nid=tn.nid
- INNER JOIN {node_comment_statistics} AS ncs ON ncs.nid = n.nid
- INNER JOIN {term_data} AS td ON tn.tid = td.tid
- WHERE (n.changed > %d OR ncs.last_comment_timestamp > %d) AND td.vid = %d";
-
- $args = array($user->uid, time(), NODE_NEW_LIMIT, NODE_NEW_LIMIT, $forum_vocabulary_id);
-
- db_query($sql, $args);
-
- drupal_set_message(t('All forum content been marked as read'));
- drupal_goto('forum');
-}
-
-/**
- * Access callback for menus and link display.
- *
- * This separate function is needed because the Drupal 6 menu system doesn't
- * run hook_menu() every time and the logged-in status of the user can get
- * cached and re-used for other users.
- */
-function advanced_forum_markasread_access() {
- global $user;
- return user_access('access content') && $user->uid;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/advanced_forum.pages_default.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/advanced_forum.pages_default.inc
deleted file mode 100644
index ae835f9..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/advanced_forum.pages_default.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Default panel handlers for Advanced Forum.
- */
-
-/**
- * Loads the included panels.
- *
- * This function is used instead of panels ability to autodiscover a panels
- * export .inc because this allows us to put each page in its own file.
- * Thanks to Moshe and OG for the code.
- */
-function advanced_forum_default_page_manager_handlers() {
- $files = file_scan_directory(drupal_get_path('module', 'advanced_forum') . '/includes/panels', '.handler$');
- foreach ($files as $absolute => $file) {
- $handler = NULL;
- require_once $absolute;
- if (isset($handler)) {
- $handlers[$file->name] = $handler;
- }
- }
- return $handlers;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_container.handler b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_container.handler
deleted file mode 100644
index 74992bc..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_container.handler
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-// $Id$
-
-$handler = new stdClass;
-$handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-$handler->api_version = 1;
-$handler->name = 'forum_panel_context_container';
-$handler->task = 'forum';
-$handler->subtask = '';
-$handler->handler = 'panel_context';
-$handler->weight = 1;
-$handler->conf = array(
- 'title' => 'Container',
- 'no_blocks' => 0,
- 'css_id' => 'forum',
- 'css' => '',
- 'contexts' => array(),
- 'relationships' => array(),
- 'access' => array(
- 'plugins' => array(
- 0 => array(
- 'name' => 'forum_container',
- 'settings' => array(
- 'container' => '0',
- ),
- 'context' => 'argument_forum_id_1',
- ),
- ),
- 'logic' => 'and',
- ),
-);
-if (module_exists('panels')) {
- $display = new panels_display;
- $display->layout = 'flexible';
- $display->layout_settings = array();
- $display->panel_settings = array(
- 'style_settings' => array(
- 'default' => NULL,
- 'center' => NULL,
- ),
- );
- $display->cache = array();
- $display->title = '%forum:name';
- $display->content = array();
- $display->panels = array();
- $pane = new stdClass;
- $pane->pid = 'new-1';
- $pane->panel = 'center';
- $pane->type = 'forum_search';
- $pane->subtype = 'forum_search';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $display->content['new-1'] = $pane;
- $display->panels['center'][0] = 'new-1';
- $pane = new stdClass;
- $pane->pid = 'new-2';
- $pane->panel = 'center';
- $pane->type = 'forum_list';
- $pane->subtype = 'forum_list';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $display->content['new-2'] = $pane;
- $display->panels['center'][1] = 'new-2';
- $pane = new stdClass;
- $pane->pid = 'new-3';
- $pane->panel = 'center';
- $pane->type = 'forum_tools';
- $pane->subtype = 'forum_tools';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $display->content['new-3'] = $pane;
- $display->panels['center'][2] = 'new-3';
- $pane = new stdClass;
- $pane->pid = 'new-4';
- $pane->panel = 'center';
- $pane->type = 'forum_legend';
- $pane->subtype = 'forum_legend';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $display->content['new-4'] = $pane;
- $display->panels['center'][3] = 'new-4';
- $display->hide_title = PANELS_TITLE_FIXED;
- $display->title_pane = 'new-1';
- $handler->conf['display'] = $display;
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_forum.handler b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_forum.handler
deleted file mode 100644
index ce5ab79..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_forum.handler
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-// $Id$
-
-$handler = new stdClass;
-$handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-$handler->api_version = 1;
-$handler->name = 'forum_panel_context_forum';
-$handler->task = 'forum';
-$handler->subtask = '';
-$handler->handler = 'panel_context';
-$handler->weight = 2;
-$handler->conf = array(
- 'title' => 'Forum',
- 'no_blocks' => 0,
- 'css_id' => 'forum',
- 'css' => '',
- 'contexts' => array(),
- 'relationships' => array(),
- 'access' => array(
- 'plugins' => array(
- 0 => array(
- 'name' => 'forum_container',
- 'settings' => array(
- 'container' => '1',
- ),
- 'context' => 'argument_forum_id_1',
- ),
- ),
- 'logic' => 'and',
- ),
-);
-if (module_exists('panels')) {
- $display = new panels_display;
- $display->layout = 'flexible';
- $display->layout_settings = array();
- $display->panel_settings = array(
- 'style_settings' => array(
- 'default' => NULL,
- 'center' => NULL,
- ),
- );
- $display->cache = array();
- $display->title = '%forum:name';
- $display->content = array();
- $display->panels = array();
- $pane = new stdClass;
- $pane->pid = 'new-1';
- $pane->panel = 'center';
- $pane->type = 'forum_search';
- $pane->subtype = 'forum_search';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $display->content['new-1'] = $pane;
- $display->panels['center'][0] = 'new-1';
- $pane = new stdClass;
- $pane->pid = 'new-2';
- $pane->panel = 'center';
- $pane->type = 'forum_list';
- $pane->subtype = 'forum_list';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $display->content['new-2'] = $pane;
- $display->panels['center'][1] = 'new-2';
- $pane = new stdClass;
- $pane->pid = 'new-3';
- $pane->panel = 'center';
- $pane->type = 'forum_node_create_list';
- $pane->subtype = 'forum_node_create_list';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => '',
- 'css_class' => 'forum-node-create-links-top',
- );
- $pane->extras = array();
- $pane->position = 2;
- $display->content['new-3'] = $pane;
- $display->panels['center'][2] = 'new-3';
- $pane = new stdClass;
- $pane->pid = 'new-4';
- $pane->panel = 'center';
- $pane->type = 'forum_topic_list';
- $pane->subtype = 'forum_topic_list';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $display->content['new-4'] = $pane;
- $display->panels['center'][3] = 'new-4';
- $pane = new stdClass;
- $pane->pid = 'new-5';
- $pane->panel = 'center';
- $pane->type = 'forum_node_create_list';
- $pane->subtype = 'forum_node_create_list';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 4;
- $display->content['new-5'] = $pane;
- $display->panels['center'][4] = 'new-5';
- $pane = new stdClass;
- $pane->pid = 'new-6';
- $pane->panel = 'center';
- $pane->type = 'forum_tools';
- $pane->subtype = 'forum_tools';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 5;
- $display->content['new-6'] = $pane;
- $display->panels['center'][5] = 'new-6';
- $pane = new stdClass;
- $pane->pid = 'new-7';
- $pane->panel = 'center';
- $pane->type = 'forum_topic_legend';
- $pane->subtype = 'forum_topic_legend';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 6;
- $display->content['new-7'] = $pane;
- $display->panels['center'][6] = 'new-7';
- $display->hide_title = PANELS_TITLE_FIXED;
- $display->title_pane = 'new-1';
- $handler->conf['display'] = $display;
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_top.handler b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_top.handler
deleted file mode 100644
index 62381c2..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/panels/forum_panel_context_top.handler
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-// $Id$
-
-if (module_exists('panels')) {
-
-$handler = new stdClass;
-$handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-$handler->api_version = 1;
-$handler->name = 'forum_panel_context_top';
-$handler->task = 'forum';
-$handler->subtask = '';
-$handler->handler = 'panel_context';
-$handler->weight = 0;
-$handler->conf = array(
- 'title' => 'Top Level Forum',
- 'no_blocks' => 0,
- 'css_id' => 'forum',
- 'css' => '',
- 'contexts' => array(),
- 'relationships' => array(),
- 'access' => array(
- 'plugins' => array(
- 0 => array(
- 'name' => 'forum_id',
- 'settings' => array(
- 'tids' => array(
- 0 => '0',
- ),
- ),
- 'context' => 'argument_forum_id_1',
- ),
- ),
- 'logic' => 'and',
- ),
-);
-$display = new panels_display;
-$display->layout = 'flexible';
-$display->layout_settings = array();
-$display->panel_settings = array(
- 'style_settings' => array(
- 'default' => NULL,
- 'center' => NULL,
- ),
-);
-$display->cache = array();
-$display->title = '%forum:name';
-$display->content = array();
-$display->panels = array();
- $pane = new stdClass;
- $pane->pid = 'new-1';
- $pane->panel = 'center';
- $pane->type = 'forum_search';
- $pane->subtype = 'forum_search';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $display->content['new-1'] = $pane;
- $display->panels['center'][0] = 'new-1';
- $pane = new stdClass;
- $pane->pid = 'new-2';
- $pane->panel = 'center';
- $pane->type = 'forum_list';
- $pane->subtype = 'forum_list';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $display->content['new-2'] = $pane;
- $display->panels['center'][1] = 'new-2';
- $pane = new stdClass;
- $pane->pid = 'new-3';
- $pane->panel = 'center';
- $pane->type = 'forum_legend';
- $pane->subtype = 'forum_legend';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $display->content['new-3'] = $pane;
- $display->panels['center'][2] = 'new-3';
- $pane = new stdClass;
- $pane->pid = 'new-4';
- $pane->panel = 'center';
- $pane->type = 'forum_tools';
- $pane->subtype = 'forum_tools';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $display->content['new-4'] = $pane;
- $display->panels['center'][3] = 'new-4';
- $pane = new stdClass;
- $pane->pid = 'new-5';
- $pane->panel = 'center';
- $pane->type = 'forum_statistics';
- $pane->subtype = 'forum_statistics';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_forum_id_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 4;
- $display->content['new-5'] = $pane;
- $display->panels['center'][4] = 'new-5';
-$display->hide_title = PANELS_TITLE_FIXED;
-$display->title_pane = 'new-1';
-$handler->conf['display'] = $display;
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/plugins.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/plugins.inc
deleted file mode 100644
index 7fc15bb..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/plugins.inc
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-
-/**
- * @file
- * Allows modules to contribute styles.
- */
-
-// -----------------------------------------------------------------------
-// REQUEST FUNCTIONS
-
-/**
- * Fetch an advanced forum style plugin
- *
- * @param $style
- * Name of the style plugin
- *
- * @return
- * An array with information about the requested style plugin.
- */
-function advanced_forum_get_style($style) {
- return advanced_forum_get_plugins('styles', 'advanced_forum_styles', $style);
-}
-
-/**
- * Collate information about all available advanced_forum styles.
- *
- * @return
- * An array with information about the requested forum style.
- */
-function advanced_forum_get_styles() {
- return advanced_forum_get_plugins('styles', 'advanced_forum_styles');
-}
-
-// -----------------------------------------------------------------------
-// MASTER HANDLER
-
-/**
- * Fetch a group of plugins by name.
- *
- * @param $plugin
- * This is the name of the plugin, and also the name of the directory.
- * @param $hook
- * This is the hook to call to get the info for the plugin.
- *
- * @return
- * An array of information arrays about the plugins received.
- */
-function advanced_forum_get_plugins($plugin, $hook, $id = NULL) {
- static $plugins = array();
- static $all_hooks = array();
-
- // Always load all hooks if we need them.
- if (!isset($all_hooks[$plugin])) {
- $all_hooks[$plugin] = TRUE;
- $plugins[$plugin] = advanced_forum_load_hooks($hook);
- }
-
- // If a specific plugin $id is being requested, return it.
- if ($id && array_key_exists($id, $plugins[$plugin])) {
- return $plugins[$plugin][$id];
- }
-
- // If no $id was requested, return the lot.
- if (!$id) {
- return $plugins[$plugin];
- }
-}
-
-// -----------------------------------------------------------------------
-// WORKER/RETRIEVER FUNCTIONS
-
-/**
- * Load plugin info for all hooks; this is handled separately from plugins
- * from files.
- *
- * @param $hook
- * The hook being invoked.
- *
- * @return
- * An array of info supplied by any hook implementations.
- */
-function advanced_forum_load_hooks($hook) {
- $info = array();
- foreach (module_implements($hook) as $module) {
- $result = _advanced_forum_process_plugin($module, $module, drupal_get_path('module', $module), $hook);
- if (is_array($result)) {
- $info = array_merge($info, $result);
- }
- }
- return $info;
-}
-
-/**
- * Process a single hook implementation of a advanced_forum plugin.
- *
- * @param $module
- * The module that owns the hook.
- * @param $identifier
- * Either the module or 'advanced_forum_' . $file->name
- * @param $hook
- * The name of the hook being invoked.
- */
-function _advanced_forum_process_plugin($module, $identifier, $path, $hook) {
- $function = $identifier . '_' . $hook;
- if (!function_exists($function)) {
- return NULL;
- }
- $result = $function();
- if (!isset($result) || !is_array($result)) {
- return NULL;
- }
-
- // Fill in defaults.
- foreach ($result as $name => $plugin) {
- if (!is_dir($path . '/' . $plugin['directory'])) {
- unset($result[$name]);
- continue;
- }
- $result[$name] += array(
- 'module' => $module,
- 'name' => $name,
- 'path' => $path . '/' . $plugin['directory'],
- );
- }
-
- return !empty($result) ? $result : NULL;
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/settings.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/settings.inc
deleted file mode 100644
index e3ce420..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/settings.inc
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
- * @file
- * Advanced forum settings / configuration page.
- */
-
-/**
- * Defines the Advanced Forum settings form.
- */
-function advanced_forum_settings_page() {
- /* General settings */
- $form['advanced_forum_general'] = array(
- '#type' => 'fieldset',
- '#title' => t('General'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- );
-
- // Choose style
- $options = array();
- $available_styles = advanced_forum_get_all_styles();
- foreach ($available_styles as $style_machine_name => $style) {
- $options[$style_machine_name] = $style['name'];
- }
- asort($options);
-
- $form['advanced_forum_general']['advanced_forum_style'] = array(
- '#type' => 'select',
- '#title' => t('Advanced forum style'),
- '#options' => $options,
- '#description' => t('Choose which style to use for your forums. This will apply independent of site theme.'),
- '#default_value' => variable_get('advanced_forum_style', 'cloudless_day_stacked'),
- );
-
- // Choose node types that are styled.
- $node_types = node_get_types();
- $options = array();
- foreach ($node_types as $node_machine_name => $node_type) {
- $options[$node_machine_name] = $node_type->name;
- }
-
- $form['advanced_forum_general']['advanced_forum_styled_node_types'] = array(
- '#type' => 'select',
- '#title' => t('Node types to style'),
- '#options' => $options,
- '#multiple' => TRUE,
- '#description' => t('Choose which node types will have the forum style applied.'),
- '#default_value' => variable_get('advanced_forum_styled_node_types', array('forum')),
- );
-
- // Style nodes presented in teaser form.
- $form['advanced_forum_general']['advanced_forum_style_teasers'] = array(
- '#type' => 'checkbox',
- '#title' => t('Style nodes when being displayed as teasers.'),
- '#default_value' => variable_get('advanced_forum_style_teasers', 0),
- '#description' => t('If checked, selected node types will be styled even when they are in a teaser list.'),
- );
-
- // Style nodes only if tagged for the forum.
- $form['advanced_forum_general']['advanced_forum_style_only_forum_tagged'] = array(
- '#type' => 'checkbox',
- '#title' => t('Style nodes only if they have a forum term attached.'),
- '#default_value' => variable_get('advanced_forum_style_only_forum_tagged', 1),
- '#description' => t('If checked, selected node types will be only styled if they are associated with a forum term.'),
- );
-
- // Style all site comments as forums
- $form['advanced_forum_general']['advanced_forum_style_all_comments'] = array(
- '#type' => 'checkbox',
- '#title' => t('Style all comments like forum replies.'),
- '#default_value' => variable_get('advanced_forum_style_all_comments', 0),
- '#description' => t('If checked, every comment will be styled as if it were a forum reply. This only works on comments from the core comment module. Nodecomments can be selected in the node type selection.'),
- );
-
- $form['advanced_forum_general']['advanced_forum_add_local_task'] = array(
- '#type' => 'checkbox',
- '#title' => t('Add a tab for forum view page.'),
- '#default_value' => variable_get('advanced_forum_add_local_task', TRUE),
- '#description' => t('If checked, this will add a local task tab for "View forums". Use this in conjunction with making the included views have local tasks. If you don\'t know what this means, leave it unchecked. You must clear the cache before this will take effect.'),
- );
-
- $form['advanced_forum_general']['advanced_forum_views_as_tabs'] = array(
- '#type' => 'checkbox',
- '#title' => t('Add a tab for included views that have their own pages.'),
- '#default_value' => variable_get('advanced_forum_views_as_tabs', TRUE),
- '#description' => t('If checked, this will add a local task tab for "Active topics," "New posts," "My posts," and "Unanswered topics." If you don\'t know what this means, leave it unchecked. You must clear the cache before this will take effect.'),
- );
-
- /* Forum / topic list settings */
- $form['advanced_forum_lists'] = array(
- '#type' => 'fieldset',
- '#title' => t('Forum and topic lists'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- );
-
- // Disable breadcrumbs
- $form['advanced_forum_lists']['advanced_forum_disable_breadcrumbs'] = array(
- '#type' => 'checkbox',
- '#title' => t('Disable breadcrumbs'),
- '#default_value' => variable_get('advanced_forum_disable_breadcrumbs', 0),
- '#description' => t('Check this to disable breadcrumbs in the forum if you are using another module to customize them. Does not affect node pages and does not work when Page Manager is overriding forum pages.'),
- );
-
- $form['advanced_forum_lists']['advanced_forum_collapsible_containers'] = array(
- '#type' => 'select',
- '#title' => t('Collapsible forum containers'),
- '#options' => array(
- 'none' => t("None"),
- 'fade' => t("Fade"),
- 'slide'=> t("Slide"),
- 'toggle' => t("Toggle"),
- ),
- '#description' => t('Select whether or not to enable collapsible forum containers and what type of animation to use.'),
- '#default_value' => variable_get('advanced_forum_collapsible_containers', 'toggle'),
- );
-
- // Taxonomy image on forum list
- if (function_exists('taxonomy_image_display')) {
- $form['advanced_forum_lists']['advanced_forum_use_taxonomy_image'] = array(
- '#type' => 'checkbox',
- '#title' => t('Use taxonomy image in forum listing'),
- '#default_value' => variable_get('advanced_forum_use_taxonomy_image', TRUE),
- '#description' => t('If this is checked, Advanced Forum will add a new column to the forum listing for the image associated with the forum term.'),
- );
- }
-
- // Retrieve new comments on forum listing
- $form['advanced_forum_lists']['advanced_forum_get_new_comments'] = array(
- '#type' => 'checkbox',
- '#title' => t('Get the number of new comments per forum on the forum list'),
- '#default_value' => variable_get('advanced_forum_get_new_comments', 0),
- '#description' => t('Core forum shows the number of new topics. If checked, Advanced Forum will get the number of new comments as well and show it under "posts" on the forum overview. Slow query not recommended on large forums.'),
- );
-
- // Title length max
- $form['advanced_forum_lists']['advanced_forum_topic_title_length'] = array(
- '#type' => 'textfield',
- '#title' => t('Number of characters to display for the topic title'),
- '#size' => 5,
- '#description' => t('Used on main forum page. Enter 0 to use the full title.'),
- '#default_value' => variable_get('advanced_forum_topic_title_length', 20),
- );
-
- /* Topic settings */
- $form['advanced_forum_topics'] = array(
- '#type' => 'fieldset',
- '#title' => t('Topics'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- );
-
- // Use topic navigation
- $form['advanced_forum_topics']['advanced_forum_use_topic_navigation'] = array(
- '#type' => 'checkbox',
- '#title' => t('Use topic navigation'),
- '#default_value' => variable_get('advanced_forum_use_topic_navigation', 1),
- '#description' => t('The query to get the previous / next topics can cause performance problems. Unchecking this will prevent the query from running.'),
- );
-
- if (module_exists('imagecache')) {
- $options = array('' => '');
- $presets = imagecache_presets();
- foreach ($presets AS $preset) {
- $options[$preset['presetname']] = $preset['presetname'];
- }
-
- $form['advanced_forum_topics']['advanced_forum_user_picture_preset'] = array(
- '#type' => 'select',
- '#title' => t('User picture preset'),
- '#options' => $options,
- '#description' => t('Imagecache preset to use for forum avatars. Leave blank to not use this feature.'),
- '#default_value' => variable_get('advanced_forum_user_picture_preset', ''),
- );
- }
-
- // Send our form to Drupal to make a settings page
- return system_settings_form($form);
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/style.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/style.inc
deleted file mode 100644
index 9ab3a86..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/style.inc
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-
-/**
- * @file
- * Functions relating to the style system, not including core hooks and
- * preprocess / theme functions.
- */
-
-// STYLE API ****************************************************************/
-/**
- * Returns the name of the forum style to use.
- */
-function advanced_forum_get_current_style() {
- return variable_get('advanced_forum_style', 'silver_bells');
-}
-
-function advanced_forum_get_style($style) {
- ctools_include('plugins');
- return ctools_get_plugins('advanced_forum', 'styles', $style);
-}
-
-function advanced_forum_get_all_styles() {
- ctools_include('plugins') ;
- return ctools_get_plugins('advanced_forum', 'styles');
-}
-
-/**
- * Returns the path to the advanced forum style, including the style name
- */
-function advanced_forum_path_to_style($requested_style = NULL) {
- // Set a static variable so this is cached after the first call.
- static $style_paths = array();
-
- if (empty($requested_style)) {
- // If no style is passed in, assume the current style is wanted.
- $requested_style = advanced_forum_get_current_style();
- }
-
- if (empty($style_path)) {
- // Get the path information
- $styles = advanced_forum_get_all_styles();
- foreach ($styles as $key => $style) {
- $style_paths[$key] = $style['path'];
- }
- }
- return $style_paths[$requested_style];
-}
-
-/**
- * Starting at a given style, return paths of it and all ancestor styles
- */
-function advanced_forum_style_lineage($style = NULL) {
- static $lineages = array();
- if (empty($style)) {
- // If no style is passed in, assume the current style is wanted.
- $style = advanced_forum_get_current_style();
- }
-
- if (!array_key_exists($style, $lineages)) {
- $lineage = array();
-
- // Get an array with information from all styles.
- $all_styles = advanced_forum_get_all_styles();
-
- // Add the current style to the lineage first
- $lineage[$style] = $all_styles[$style]['path'];
-
- // Check if there is an "extra style" listed. This allows you to grab the
- // CSS of one other style and toss it in as a pseudo parent. We do not
- // follow the path up its parent. The primary use is for adding in the
- // "stacked" CSS but could be used for other purposes as well.
- if (!empty($all_styles[$style]['extra style']) && !empty($all_styles[$all_styles[$style]['extra style']]['path'])) {
- $extra_style = $all_styles[$style]['extra style'];
- $lineage[$extra_style] = $all_styles[$extra_style]['path'];
- }
-
- // Grab the style we are looking at. This variable starts out as the current
- // style in use on the page but will change as we move up the chain.
- $current_style = $style;
-
- while (!empty($all_styles[$current_style]['base style'])) {
- // There is a parent style, so move up to it.
- $current_style = $all_styles[$current_style]['base style'];
-
- // Make sure the listed parent style actually exists.
- if (!empty($all_styles[$current_style]['path'])) {
- // Add the style to our list.
- $lineage[$current_style] = $all_styles[$current_style]['path'];
- }
- }
-
- $lineages[$style] = $lineage;
- }
-
- return $lineages[$style];
-}
-
-/**
- * Load any .inc files related to the style so that preprocess
- * functions can run as appropriate.
- */
-function advanced_forum_load_style_includes($style = NULL) {
- $lineage = advanced_forum_style_lineage($style);
- foreach ($lineage as $key => $path) {
- if (file_exists("$path/$key.inc")) {
- require_once("$path/$key.inc");
- }
- }
-}
-
-/**
- * Get the info for a style, using an additive notation to
- * include all items from the parent lineage.
- */
-function advanced_forum_style_info($style = NULL) {
- static $info = array();
- if (empty($style)) {
- // If no style is passed in, assume the current style is wanted.
- $style = advanced_forum_get_current_style();
- }
-
- if (!array_key_exists($style, $info)) {
- $info[$style] = array();
- $lineage = advanced_forum_style_lineage();
- foreach ($lineage as $key => $dir) {
- // using the + operator is additive but will not overwrite.
- // $lineage comes out as the actual style with each
- // successive style after it, so simply adding the arrays
- // together means that all info will be combined and keys
- // in the parent info will be defaults passed down to children
- // only if they do not override them.
- $info[$style] += advanced_forum_get_style($key);
- }
- }
-
- return $info[$style];
-}
-
-function advanced_forum_is_styled($content, $teaser = FALSE, $type = 'node') {
- // This is the ID of the topic starting node
- static $master_topic_id;
-
- // Give other modules a first crack at making the decision. To keep this
- // simple, he last one in the array wins.
- $topic_ids = module_invoke_all('advanced_forum_is_styled_alter', $content, $teaser, $type);
- $topic_id = end($topic_ids);
-
- if (!$topic_id) {
- // If no other modules made a decision on this, we look at it.
- switch ($type) {
- case 'node':
- if (!empty($content->comment_target_nid) && $content->comment_target_nid == $master_topic_id) {
- // This nodecomment is attached to a node we already know is styled.
- $topic_id = $master_topic_id;
- }
- else {
- // See if the node should be styled.
- $topic_id = advanced_forum_node_is_styled($content, $teaser);
- }
- break;
-
- case 'comment':
- $topic_id = advanced_forum_comment_is_styled($content, $master_topic_id);
- break;
-
- case 'comment-wrapper':
- if ($content->nid == $master_topic_id) {
- // Use our comment wrapper only if we are on a styled node.
- $topic_id = $master_topic_id;
- }
- break;
- }
- }
-
- if ($topic_id > 0) {
- // If we have a positive number for the topic ID, then this item is styled.
- // We need to update the master ID, add the CSS/JS files, and tell the caller
- // our decision.
- $master_topic_id = $topic_id;
- _advanced_forum_add_files();
- return TRUE;
- }
- elseif ($topic_id == -42) {
- // A -42 means all the tests passed but the node is being previewed so there
- // is no node id, yet. Add the files and return true but don't update the
- // master topic ID.
- _advanced_forum_add_files();
- return TRUE;
- }
-
-}
-
-function advanced_forum_node_is_styled($node, $teaser = FALSE) {
- // Get the list of types that should have the style applied
- $styled_node_types = variable_get('advanced_forum_styled_node_types', array('forum'));
- // If this type is in the list of types that should be styled...
- if (in_array($node->type, $styled_node_types)) {
- // ...and if we are styling teasers or this isn't a teaser...
- if (variable_get('advanced_forum_style_teasers', FALSE) || !$teaser) {
- // ...and if this is not a new node being previewed...
- if (!empty($node->nid)) {
- // ...and if we are styling non forum tagged nodes or this is forum tagged...
- if (!variable_get('advanced_forum_style_only_forum_tagged', TRUE) || advanced_forum_is_forum_tagged($node)) {
- // ... then return the node ID.
- return $node->nid;
- }
- }
- // ...or if this _is_ a new node being previewed...
- else {
- // ...and if we are styling non forum tagged nodes or this is forum tagged...
- if (!variable_get('advanced_forum_style_only_forum_tagged', TRUE) || advanced_forum_is_forum_tagged($node, TRUE)) {
- // ...Send back -42 as a special code to say that this should be
- // styled but that it isn't the actual node id.
- return -42;
- }
- }
- }
- }
-}
-
-function advanced_forum_comment_is_styled($comment, $master_topic_id) {
- if (isset($master_topic_id) && ($comment->nid == $master_topic_id)) {
- // This comment is on a node we already know is styled, or a previous
- // comment on this node is styled, so the comment is styled.
- return $master_topic_id;
- }
-
- if (variable_get("advanced_forum_style_all_comments", 0)) {
- // All comments on this site should be styled.
- return $comment->nid;
- }
-
- // Load up the node this comment is attached to and see if it is styled.
- // This should not happen often, only in a case where the comment is
- // displayed seperately from the node (such as a reply preview).
- $node = node_load($comment->nid);
- if (advanced_forum_node_is_styled($node, FALSE)) {
- return $comment->nid;
- }
-
- // Comment doesn't pass any styling test
- return -1;
-}
-
-function advanced_forum_is_forum_tagged($node, $preview = FALSE) {
- $vid = variable_get('forum_nav_vocabulary', '');
- if ($preview) {
- foreach ($node->taxonomy as $term) {
- if ($term->vid == $vid) {
- return TRUE;
- }
- }
- }
- else {
- // Get a list of the terms attached to this node
- $terms = taxonomy_node_get_terms_by_vocabulary($node, $vid);
- if (count($terms) > 0) {
- return TRUE;
- }
- }
-}
-
-/**
- * Returns the path to actual site theme in use because path_to_theme is flaky.
- */
-function advanced_forum_path_to_theme() {
- global $theme;
-
- if (!empty($theme)) {
- // Normally, the global theme variable is set, so we use that.
- return drupal_get_path('theme', $theme);
- }
-
- // For some reason I've never figured out, some users are reporting
- // that the global theme variable is not set when this is called.
- // As a band-aid solution, this will pull the default theme out of the
- // database and use that.
- $default_theme = variable_get('theme_default', 'garland');
- return drupal_get_path('theme', $default_theme);
-}
-
-/**
- * Manipulate the template suggestions to add in one for each style as well
- * as the default.
- */
-function advanced_forum_add_template_suggestions($template, &$template_suggestions) {
- // We only need to calculate the style lineage once per page load.
- static $lineage;
-
- if (empty($lineage)) {
- $lineage = advanced_forum_style_lineage();
- $lineage = array_reverse($lineage, TRUE);
- }
-
- // Add a suggestion for each style in the lineage.
- foreach ($lineage AS $key => $path) {
- $template_suggestions[] = "advanced_forum.$key.$template";
- }
-
- // Add in a version without any style name at the end. The order will be
- // reversed when drupal_discover_template() looks for the first matching
- // file so adding this at the end means it will be found first.
- $template_suggestions[] = "advanced_forum.$template";
-
- return;
-}
-
-/**
- * Adds extra files needed for styling.
- * This is currently just CSS files but was made generic to allow adding
- * javascript in the future.
- */
-function _advanced_forum_add_files() {
- // This could get called more than once on a page and we only need to do it once.
- static $added;
-
- if (empty($added)) {
- $added = TRUE;
- $lineage = advanced_forum_style_lineage();
- $lineage = array_reverse($lineage, TRUE);
- $theme_path = advanced_forum_path_to_theme();
-
- foreach (array('structure.css', 'style.css', 'images.css') as $css_type) {
- $css_file = "$theme_path/advanced_forum.$css_type";
- if (file_exists($css_file)) {
- // CSS files with no style name in the theme directory trump all
- // to provide a theme specific style override.
- drupal_add_css($css_file);
- }
- else {
- // For each style from the current style on up through each parent
- // style, look for the style specific CSS file first in the active
- // theme and then in the style directory.
- foreach ($lineage AS $key => $path) {
- $css_file = "/advanced_forum.$key.$css_type";
- if (file_exists("$theme_path/$css_file")) {
- // If the style specific file is in the theme, use that.
- drupal_add_css("$theme_path/$css_file");
- }
- elseif (file_exists("$path/$css_file")) {
- // Otherwise look in the style for it.
- drupal_add_css("$path" . "$css_file");
- }
- }
- }
- }
-
- advanced_forum_load_style_includes();
- }
-}
-
-/**
- * Allow themable wrapping of all comments.
- */
-function advanced_forum_comment_wrapper($content, $node) {
- // See if this is a forum post:
- $vid = variable_get('forum_nav_vocabulary', '');
- foreach ($node->taxonomy as $tid => $term) {
- if ($term->vid == $vid) {
- return _advanced_forum_comment_wrapper($content, $node);
- }
- }
-
- return phptemplate_comment_wrapper($content, $node);
-}
-
-/**
- * Wrap forum comments a little differently to make it easier.
- */
-function _advanced_forum_comment_wrapper($content, $node) {
- return '<div id="comments" class="forum-comment-wrapper">'. $content .'</div>';
-}
-
-
-// CTOOLS INTEGRATION FOR STYLES ********************************************/
-function advanced_forum_ctools_plugin_styles() {
- return array(
- 'info file' => TRUE,
- 'load themes' => TRUE,
- );
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/template_preprocess_advanced_forum_topic_list_view.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/template_preprocess_advanced_forum_topic_list_view.inc
deleted file mode 100644
index 9119ce9..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/template_preprocess_advanced_forum_topic_list_view.inc
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * @file
- * Holds the contents of a preprocess function moved into its own file
- * to ease memory requirements and having too much code in one file.
- */
-function _template_preprocess_advanced_forum_topic_list_view(&$variables) {
- // Even though this isn't needed for the actual topic list view, the other
- // views use this same style and need the AF style files added.
- _advanced_forum_add_files();
-
- $variables['template_files'][] = 'advanced_forum-topic-list-view';
- advanced_forum_add_template_suggestions("topic-list-view", $variables['template_files']);
-
- $view = $variables['view'];
-
- // We need the raw data for this grouping, which is passed in as $variables['rows'].
- // However, the template also needs to use for the rendered fields. We
- // therefore swap the raw data out to a new variable and reset $variables['rows']
- // so that it can get rebuilt.
- $result = $variables['rows'];
- $variables['rows'] = array();
-
- $options = $view->style_plugin->options;
- $handler = $view->style_plugin;
-
- $fields = &$view->field;
- $columns = $handler->sanitize_columns($options['columns'], $fields);
-
- $active = !empty($handler->active) ? $handler->active : '';
- $order = !empty($handler->order) ? $handler->order : 'asc';
-
- $query = tablesort_get_querystring();
- if ($query) {
- $query = '&' . $query;
- }
-
- $forum = $view->style_plugin->get_forum_ids();
-
- // Fields must be rendered in order as of Views 2.3, so we will pre-render
- // everything.
- $renders = array();
- $keys = array_keys($view->field);
- $stickies_done = FALSE;
- $sticky_count = 0;
-
- foreach ($result as $count => $row) {
-
- foreach ($keys as $id) {
- $renders[$count][$id] = $view->field[$id]->theme($row);
- }
-
- // Grab the teaser so it can be used on the title of the td as a popup
- // preview. By default, the view provides the teaser as a popup on the
- // title link.
- $teaser = $renders[$count]['teaser'];
- $teaser = htmlentities($teaser);
- $teasers[$count] = $teaser;
-
- // Determine stickiness.
- if (!$stickies_done) {
- $sticky[$count] = !empty($row->topic_is_sticky);
- if ($sticky[$count]) {
- $sticky_count++;
- $variables['row_classes'][$count][] = 'sticky';
- }
- else {
- $stickies_done = TRUE;
- if ($sticky_count) {
- // This ends up appearing only if we have both sticky and non sticky posts.
- // Otherwise it will never show up.
- $variables['row_classes'][$count - 1][] = 'forum-last-sticky';
- }
- }
- }
-
- // Shadow (moved) topics.
- if ($forum && !in_array($row->topic_actual_forum, $forum)) {
- $term = taxonomy_get_term($row->topic_actual_forum);
- $variables['shadow'][$count] = theme('advanced_forum_shadow_topic', $row->node_title, $row->nid, $term->name);
- }
- else {
- $variables['shadow'][$count] = FALSE;
- }
- }
-
- // Make the sticky variable available to the template.
- $variables['sticky'] = $sticky;
- $variables['teasers'] = $teasers;
-
- foreach ($columns as $field => $column) {
- // render the header labels
- if ($field == $column && empty($fields[$field]->options['exclude'])) {
- $label = check_plain(!empty($fields[$field]) ? $fields[$field]->label() : '');
- if (empty($options['info'][$field]['sortable']) || !$fields[$field]->click_sortable()) {
- $variables['header'][$field] = $label;
- }
- else {
- // @todo -- make this a setting
- $initial = 'asc';
-
- if ($active == $field && $order == 'asc') {
- $initial = 'desc';
- }
-
- $title = t('sort by @s', array('@s' => $label));
- if ($active == $field) {
- $label .= theme('tablesort_indicator', $initial);
- }
- $link_options = array(
- 'html' => TRUE,
- 'attributes' => array('title' => $title),
- 'query' => 'order=' . urlencode($field) . '&sort=' . $initial . $query,
- );
- $variables['header'][$field] = l($label, $_GET['q'], $link_options);
- }
- }
-
- // Create a second variable so we can easily find what fields we have and what the
- // CSS classes should be.
- $variables['fields'][$field] = views_css_safe($field);
- if ($active == $field) {
- $variables['fields'][$field] .= ' active';
- }
-
- // Render each field into its appropriate column.
- foreach ($result as $num => $row) {
- if (!empty($fields[$field]) && empty($fields[$field]->options['exclude'])) {
- $field_output = $renders[$num][$field];
-
- if (!isset($variables['rows'][$num][$column])) {
- $variables['rows'][$num][$column] = '';
- }
-
- // Don't bother with separators and stuff if the field does not show up.
- if ($field_output === '') {
- continue;
- }
-
- // Place the field into the column, along with an optional separator.
- if ($variables['rows'][$num][$column] !== '') {
- if (!empty($options['info'][$column]['separator'])) {
- $variables['rows'][$num][$column] .= filter_xss_admin($options['info'][$column]['separator']);
- }
- }
-
- $variables['rows'][$num][$column] .= $field_output;
- }
- }
- }
-
- foreach ($variables['rows'] as $num => $row) {
- $variables['row_classes'][$num][] = ($num % 2 == 0) ? 'odd' : 'even';
- }
-
- $variables['class'] = 'views-table';
- if (!empty($options['sticky'])) {
- drupal_add_js('misc/tableheader.js');
- $variables['class'] .= " sticky-enabled";
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/theme.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/theme.inc
deleted file mode 100644
index 5915632..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/theme.inc
+++ /dev/null
@@ -1,533 +0,0 @@
-<?php
-
-/**
- * @file
- * Holds theme functions and template preprocesses.
- * Other style related functions are in style.inc
- */
-
-// THEME FUNCTIONS **********************************************************/
-
-/**
- * Theme function to display a link, optionally buttonized.
- */
-function theme_advanced_forum_l($text, $path, $options = array(), $button_class = NULL) {
- if (!is_null($button_class)) {
- // Buttonized link: add our button class and the span.
- $current_classes = (empty($options['attributes']['class'])) ? '' : $options['attributes']['class'];
- $options['attributes']['class'] = "$current_classes af-button-$button_class";
- $options['html'] = TRUE;
- $l = l('<span>' . $text . '</span>', $path, $options);
- return $l;
- }
- else {
- // Standard link: just send it through l().
- return l($text, $path, $options);
- }
-}
-
-/**
- * Theme function to show list of types that can be posted in forum.
- */
-function theme_advanced_forum_node_type_create_list($forum_id) {
- // Get the list of node types to display links for.
- $type_list = advanced_forum_node_type_create_list($forum_id);
- $output = '';
-
- if (is_array($type_list)) {
- foreach ($type_list as $type => $item) {
- $output .= '<div class="forum-add-node forum-add-' . $type . '">';
- $output .= theme('advanced_forum_l', t('New @node_type', array('@node_type' => $item['name'])), $item['href'], NULL, 'large');
- $output .= '</div>';
- }
- }
- else {
- // User did not have access to create any node types in this fourm so
- // we just return the denial text / login prompt.
- $output = $type_list;
- }
-
- return $output;
-}
-
-/**
- * Theme function to show who last edited a post.
- */
-function theme_advanced_forum_post_edited($who, $when, $why) {
- $editor = user_load($who);
- $editor_name = theme('username', $editor);
-
- $datetime = format_date($when, 'custom', variable_get('date_format_short', 'm/d/Y - H:i'));
-
- $edited_by = t('<span class="post-edit-label">Edited by</span> !editor', array('!editor' => $editor_name));
- $edited_on = t('<span class="post-edit-label">on</span> !datetime', array('!datetime' => $datetime));
- $edit_reason = (empty($why)) ? "" : t('<span class="post-edit-label">Reason:</span> !reason', array('!reason' => $why));
-
- return $edited_by . ' ' . $edited_on . '<br />' . $edit_reason;
-}
-
-/**
- * Theme function to show simple author pane when not using Author Pane.
- */
-function theme_advanced_forum_simple_author_pane($context) {
- // Sending the context rather than the account makes it work for anon comments.
- $name = theme('username', $context);
-
- $account = user_load($context->uid);
- $picture = theme('user_picture', $account);
-
- return '<div class="author-pane">' . $name . $picture . '</div>';
-}
-
-/**
- * Theme function to format the reply link at the top/bottom of topic.
- */
-function theme_advanced_forum_reply_link($node) {
- // Get the information about whether the user can reply and the link to do
- // so if the user is allowed to.
- $reply_link = advanced_forum_get_reply_link($node);
-
- if (is_array($reply_link)) {
- // Reply is allowed. Variable contains the link information.
- $output = '<div class="topic-reply-allowed">';
- $output .= theme('advanced_forum_l', $reply_link['title'], $reply_link['href'], $reply_link['options'], 'large');
- $output .= '</div>';
- return $output;
- }
- elseif ($reply_link == 'reply-locked') {
- // @TODO: The double span here is icky but I don't know how else to get
- // around the fact that there's no "a" to put the button class on.
- return '<div class="topic-reply-locked"><span class="af-button-large"><span>' . t('Topic locked') . '</span></span></div>';
- }
- elseif ($reply_link == 'reply-forbidden') {
- // User is not allowed to reply to this topic.
- return theme('comment_post_forbidden', $node);
- }
-}
-
-/**
- * Theme function to return assembled pager for use on each topic in list.
- *
- * @param $pagecount
- * Number of pages to include on the pager.
- * @param $topic
- * Topic object to create a pager for.
- * @return
- * Assembled pager.
- */
-function theme_advanced_forum_topic_pager($pagecount, $topic) {
- // Get the information to assemble the pager. This returns an object with
- // the following properties:
- // initial_pages: Array of linked numbers for first set of pages
- // last_page_text: Linked text "Last page" (translatable)
- // last_page_number: Linked number pointing to the last page.
- $topic_pager = advanced_forum_create_topic_pager($pagecount, $topic);
- $last_page = '';
-
- if (!empty($topic_pager->initial_pages)) {
- if (!empty($topic_pager->last_page_text)) {
- // If you prefer to end with the number, replace
- // $topic_pager->last_page_text with $topic_pager->last_page_number
- $last_page = ' … ' . $topic_pager->last_page_text;
- }
-
- return '<span class="topic-pager">(Page: ' . implode(", ", $topic_pager->initial_pages) . $last_page . ')</span>';
- }
-}
-
-/**
- * Theme function to create shadow topic reference.
- *
- * @param $title
- * Unlinked title of the topic.
- * @param $nid
- * Node id of the topic.
- * @param $new_forum
- * Name of the forum that now contains the topic.
- * @return
- * String to print in place of the title/author info on topic lists.
- */
-function theme_advanced_forum_shadow_topic($title, $nid, $new_forum) {
- return $title . '<br />' .
- t('This topic has been moved to "!forum"', array('!forum' => $new_forum)) .
- ' (' . l(t('View topic'), "node/$nid") . ')';
-}
-
-/**
- * Theme function to a formatted list of subforums.
- *
- * @param $subforum_list
- * Array of subforums.
- * @return
- * Formatted list of subforums.
- */
-function theme_advanced_forum_subforum_list($subforum_list) {
- $subforums = array();
- foreach ($subforum_list AS $tid => $subforum) {
- // Note: $subforum->name has not been run through check_plain because
- // it ends up going through there when l() is called without the HTML
- // option. If you change this to set HTML to TRUE, you must sanitize it.
- $text = l($subforum->name, "forum/$tid");
- $text .= ' (' . $subforum->total_posts;
-
- if (empty($subforum->new_posts)) {
- $text .= ')';
- }
- else {
- $text .= ' - ' . l($subforum->new_posts_text, $subforum->new_posts_link) . ')';
- }
-
- $subforums[] = $text;
- }
-
- return implode(', ', $subforums);
-}
-
-/**
- * Theme function to a formatted list of subcontainers.
- *
- * @param $subcontainer_list
- * Array of subcontainers.
- * @return
- * Formatted list of subcontainers.
- */
-function theme_advanced_forum_subcontainer_list($subcontainer_list) {
- $subcontainers = array();
- foreach ($subcontainer_list AS $tid => $subcontainer) {
- // Note: $subcontainer->name has not been run through check_plain because
- // it ends up going through there when l() is called without the HTML
- // option. If you change this to set HTML to TRUE, you must sanitize it.
- $text = l($subcontainer->name, "forum/$tid");
- $text .= ' (' . $subcontainer->total_posts;
-
- if (empty($subcontainer->new_posts)) {
- $text .= ')';
- }
- else {
- $text .= ' - ' . l($subforum->new_posts_text, $subforum->new_posts_link) . ')';
- }
-
- $subcontainers[] = $text;
- }
-
- return implode(', ', $subcontainers);
-}
-
-
-// TEMPLATE PREPROCESS ******************************************************/
-
-/*** FORUM OVERVIEW & TOPIC LIST PAGES **************************************/
-
-/**
- * Preprocesses template variables for the forum template.
- */
-function advanced_forum_preprocess_forums(&$variables) {
- include_once drupal_get_path('module', 'advanced_forum') . '/includes/advanced_forum_preprocess_forums.inc';
- _advanced_forum_preprocess_forums($variables);
-}
-
-/**
- * Preprocesses template variables for the forum search form template.
- */
-function advanced_forum_preprocess_advanced_forum_search_forum(&$variables) {
- advanced_forum_add_template_suggestions("search-forum", $variables['template_files']);
-
- $variables['forum'] = $variables['tid'] ? $variables['tid'] : 'All';
- $variables['path'] = url('forum/search');
-}
-
-/**
- * Preprocesses template variables for the search results template.
- */
-function advanced_forum_preprocess_views_view_fields__advanced_forum_search(&$variables) {
- _advanced_forum_add_files();
- advanced_forum_add_template_suggestions("search-result", $variables['template_files']);
-}
-
-/**
- * Preprocesses template variables for the submitted by/in template.
- */
-function advanced_forum_preprocess_forum_submitted(&$variables) {
- advanced_forum_add_template_suggestions("submitted", $variables['template_files']);
-
- // Avoid E_ALL warning
- $variables['topic_link'] = '';
-
- if (isset($variables['topic']->node_title)) {
- $nid = $variables['topic']->nid;
-
- // Make a fake node object to avoid the node load
- $node = new stdClass();
- $node->nid = $nid;
- $node->type = $variables['topic']->type;
-
- // Find the page of the first unread comment, if any
- $num_comments = db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE nid = %d', $nid));
- $new_replies = advanced_forum_reply_num_new($nid);
- $query = advanced_forum_page_first_new($num_comments, $new_replies, $node);
-
- // Format the node title with a link
- $title_length = variable_get('advanced_forum_topic_title_length', 15);
- if ($title_length == 0) {
- $short_topic_title = $variables['topic']->node_title;
- }
- else {
- $short_topic_title = truncate_utf8($variables['topic']->node_title, $title_length, TRUE, TRUE);
- }
-
- $fragment = ($new_replies) ? 'new' : NULL;
- $variables['topic_link'] = l($short_topic_title, "node/$nid", array('query' => $query, 'fragment' => $fragment));
- }
-
- // For items posted more than $cutoff hours ago, offer an actual date.
- $cutoff = variable_get('advanced_forum_time_ago_cutoff', 48) * 60 * 60;
- if (isset($variables['topic']->timestamp)) {
- $timestamp = $variables['topic']->timestamp;
- if (time() - $timestamp > $cutoff) {
- $variables['date_posted'] = format_date($timestamp, 'small');
- }
- }
-}
-
-/*** JUST FORUM OVERVIEW PAGE ***********************************************/
-
-/**
- * Preprocesses template variables for the forum legend template.
- */
-function advanced_forum_preprocess_advanced_forum_forum_legend(&$variables) {
- advanced_forum_add_template_suggestions("forum-legend", $variables['template_files']);
-}
-
-/**
- * Preprocesses template variables for the forum statistics template.
- */
-function advanced_forum_preprocess_advanced_forum_statistics(&$variables) {
- advanced_forum_add_template_suggestions("statistics", $variables['template_files']);
-
- $variables['topics'] = advanced_forum_statistics_topics();
- $variables['posts'] = advanced_forum_statistics_replies() + $variables['topics'];
- $variables['users'] = advanced_forum_statistics_users();
-
- $authenticated_users = advanced_forum_statistics_online_users();
- $variables['online_users'] = implode(', ', $authenticated_users);
- $variables['current_users'] = count($authenticated_users);
- $variables['current_guests'] = sess_count(time() - variable_get('user_block_seconds_online', 900));
- $variables['current_total'] = $variables['current_users'] + $variables['current_guests'];
-
- $latest_users = advanced_forum_statistics_latest_users();
- $variables['latest_users'] = implode(', ', $latest_users);
-}
-
-/**
- * Preprocesses template variables for the forum list template.
- */
-function advanced_forum_preprocess_forum_list(&$variables) {
- include_once drupal_get_path('module', 'advanced_forum') . '/includes/advanced_forum_preprocess_forum_list.inc';
- _advanced_forum_preprocess_forum_list($variables);
-}
-
-
-/*** JUST TOPIC LIST PAGES **************************************************/
-
-function advanced_forum_preprocess_views_view_forum_topic_list__advanced_forum_topic_list(&$variables) {
- _advanced_forum_add_files();
- advanced_forum_add_template_suggestions("topic-list-view", $variables['template_files']);
-
- // Set a variable for displaying the topic legend.
- $variables['topic_legend'] = theme('advanced_forum_topic_legend');
-}
-
-function advanced_forum_preprocess_views_view__advanced_forum_topic_list(&$variables) {
- _advanced_forum_add_files();
- advanced_forum_add_template_suggestions("topic-list-outer-view", $variables['template_files']);
-
- // @TODO: This is messy tying it to the URL. Need to find a better way.
- $variables['node_create_list'] = '';
- $variables['forum_tools'] = '';
- $tid = arg(1);
- if (arg(0) == 'forum' && $tid > 0 && variable_get('advanced_forum_forum_disabled', TRUE)) {
- $variables['node_create_list'] = theme('advanced_forum_node_type_create_list', $tid);
- $variables['forum_tools'] = advanced_forum_forum_tools($tid);
- }
-}
-
-/**
- * Display a view as a forum topic list style.
- */
-function template_preprocess_advanced_forum_topic_list_view(&$variables) {
- include_once drupal_get_path('module', 'advanced_forum') . '/includes/template_preprocess_advanced_forum_topic_list_view.inc';
- _template_preprocess_advanced_forum_topic_list_view($variables);
-}
-
-
-/**
- * Preprocesses template variables for the topic list template.
- */
-function advanced_forum_preprocess_forum_topic_list(&$variables) {
- advanced_forum_add_template_suggestions("topic-list", $variables['template_files']);
-}
-
-/**
- * Preprocesses template variables for the forum icon template.
- */
-function advanced_forum_preprocess_forum_icon(&$variables) {
- advanced_forum_add_template_suggestions("topic-icon", $variables['template_files']);
-}
-
-/**
- * Preprocesses template variables for the topic legend template.
- */
-function advanced_forum_preprocess_advanced_forum_topic_legend(&$variables) {
- advanced_forum_add_template_suggestions("topic-legend", $variables['template_files']);
-}
-
-
-/*** TOPIC PAGES ************************************************************/
-
-function advanced_forum_preprocess_advanced_forum_search_topic(&$variables) {
- advanced_forum_add_template_suggestions("search-topic", $variables['template_files']);
-
- $variables['path'] = url('node/'. $variables['node']->nid . '/search');
-}
-
-function advanced_forum_preprocess_views_view_fields__advanced_forum_search_topic(&$variables) {
- _advanced_forum_add_files();
- advanced_forum_add_template_suggestions("search-result", $variables['template_files']);
-}
-
-/**
- * Preprocesses template variables for the topic header template.
- */
-function advanced_forum_preprocess_advanced_forum_topic_header(&$variables) {
- advanced_forum_add_template_suggestions("topic-header", $variables['template_files']);
-
- $node = $variables['node'];
-
- // Form to search within the topic. (only works with nodecomment)
- $variables['search'] = theme('advanced_forum_search_topic', $variables['node']);
-
- // Reply link / button
- $variables['reply_link'] = theme('advanced_forum_reply_link', $node);
-
- // Total posts, including first post.
- $posts = (empty($variables['comment_count'])) ? 1 : $variables['comment_count'] + 1;
- $variables['total_posts_count'] = format_plural($posts, '1 post', '@count posts');
-
- // Number of new posts on topic.
- $variables['new_posts_count'] = advanced_forum_reply_num_new($node->nid);
-
- // Link to first new post only if the new post isn't the topic starter.
- $variables['first_new_post_link'] = '';
- if ($posts > 1) {
- $variables['first_new_post_link'] = advanced_forum_first_new_post_link($variables['node'], $variables['comment_count']);
- }
-
- // Link to last post in topic.
- $variables['last_post_link'] = advanced_forum_last_post_link($node);
-}
-
-/**
- * Preprocesses template variables for the active poster template.
- */
-function advanced_forum_preprocess_advanced_forum_active_poster(&$variables) {
- advanced_forum_add_template_suggestions("active-poster", $variables['template_files']);
-
- $variables['account_name'] = theme('username', $variables['account']);
- $variables['picture'] = theme('advanced_forum_user_picture', $variables['account']);
-
- $node = $variables['last_post'];
- $variables['last_post_title'] = l($node->title, "node/$node->nid");
- $variables['last_post_date'] = format_date($node->created);
-}
-
-/**
- * Preprocesses template variables for the author pane.
- */
-function advanced_forum_preprocess_author_pane(&$variables) {
- // Author pane is used in various places. Check the caller to make sure
- // we are the one that called it.
- if (!empty($variables['caller']) && $variables['caller'] == 'advanced_forum') {
- advanced_forum_add_template_suggestions("author-pane", $variables['template_files']);
- }
-}
-
-/**
- * Preprocesses template variables for the page template.
- */
-function advanced_forum_preprocess_page(&$variables) {
- if (arg(0) == 'forum') {
- $variables['forum_page'] = TRUE;
- }
- elseif (arg(0) == 'node' && !empty($variables['node']) && advanced_forum_type_is_in_forum($variables['node']->type)) {
- $variables['forum_page'] = TRUE;
- }
-}
-
-/**
- * Preprocesses template variables for the node template.
- */
-function advanced_forum_preprocess_node(&$variables) {
- if (advanced_forum_is_styled($variables['node'], $variables['teaser'], 'node')) {
- include_once drupal_get_path('module', 'advanced_forum') . '/includes/advanced_forum_preprocess_node.inc';
- _advanced_forum_preprocess_node($variables);
- }
-}
-
-function advanced_forum_preprocess_comment_wrapper(&$variables) {
- if (advanced_forum_is_styled($variables['node'], FALSE, 'comment-wrapper')) {
- advanced_forum_add_template_suggestions("comment-wrapper", $variables['template_files']);
-
- $variables['reply_link'] = '';
- $form_on_seperate_page = variable_get('comment_form_location_'. $variables['node']->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE;
-
- if (module_exists('nodecomment')) {
- $comments_locked = $variables['node']->node_comment != COMMENT_NODE_READ_WRITE;
- }
- else {
- $comments_locked = $variables['node']->comment != COMMENT_NODE_READ_WRITE;
- }
-
- if ($form_on_seperate_page || $comments_locked) {
- // If the post is locked or the comment form is on a seperate page,
- // build the reply/locked link / button
- $variables['reply_link'] = theme('advanced_forum_reply_link', $variables['node']);
- }
-
- // Grab the topic navigation that we hijacked in nodeapi.
- $variables['topic_navigation'] = $variables['node']->advanced_forum_navigation;
- }
-}
-
-/**
- * Preprocesses template variables for the comment template.
- */
-function advanced_forum_preprocess_comment(&$variables) {
- if (advanced_forum_is_styled($variables['comment'], FALSE, 'comment')) {
- include_once drupal_get_path('module', 'advanced_forum') . '/includes/advanced_forum_preprocess_comment.inc';
- _advanced_forum_preprocess_comment($variables);
- }
-}
-
-function advanced_forum_preprocess_forum_topic_navigation(&$variables) {
- advanced_forum_add_template_suggestions("topic-navigation", $variables['template_files']);
-
- // If we killed the preprocess, initialize these to avoid notices.
- if (!isset($variables['prev'])) {
- $variables['prev'] = '';
- }
- if (!isset($variables['next'])) {
- $variables['next'] = '';
- }
-}
-
-/*** ORGANIC GROUPS *********************************************************/
-
-function advanced_forum_preprocess_views_view__advanced_forum_group_topic_list(&$variables) {
- _advanced_forum_add_files();
- advanced_forum_add_template_suggestions("group-topic-list-outer-view", $variables['template_files']);
-
- // Set a variable for displaying the topic legend.
- $variables['topic_legend'] = theme('advanced_forum_topic_legend');
-}
-
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum.views.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum.views.inc
deleted file mode 100644
index 494d729..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum.views.inc
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * @file
- * Views integration for advanced_forum.
- */
-
-
-/**
- * Loads the included views
- *
- * This function is used instead of views ability to autodiscover a views
- * export .inc because this allows us to put each view in its own file.
- * Thanks to Moshe and OG for the code.
- */
-function advanced_forum_views_default_views() {
- $files = file_scan_directory(drupal_get_path('module', 'advanced_forum') . '/includes/views', '.view$');
- foreach ($files as $absolute => $file) {
- $view = NULL;
- require $absolute;
- if (isset($view)) {
- $views[$view->name] = $view;
- }
- }
- return $views;
-}
-
-/**
- * Use views_data_alter to add items to the node table that are
- * relevant to topic icons.
- */
-function advanced_forum_views_data_alter(&$data) {
- // Topic icon
- $data['node']['topic_icon'] = array(
- 'title' => t('Topic Icon'),
- 'help' => t('Icon that shows new posts, hot, sticky, locked, etc.'),
- 'field' => array(
- 'handler' => 'advanced_forum_handler_field_node_topic_icon',
- ),
- );
-
- $data['node']['topic_pager'] = array(
- 'title' => t('Topic Pager'),
- 'help' => t('Small pager for individual topics.'),
- 'field' => array(
- 'handler' => 'advanced_forum_handler_field_node_topic_pager',
- ),
- );
-}
-
-/**
- * Implementation of hook_views_handlers() to register all of the basic handlers
- * views uses.
- */
-function advanced_forum_views_handlers() {
- return array(
- 'info' => array(
- 'path' => drupal_get_path('module', 'advanced_forum') . '/includes/views',
- ),
- 'handlers' => array(
- 'advanced_forum_handler_field_node_topic_icon' => array(
- 'parent' => 'views_handler_field',
- ),
- 'advanced_forum_handler_field_node_topic_pager' => array(
- 'parent' => 'views_handler_field',
- ),
- ),
- );
-}
-
-/**
- * Implementation of hook_views_plugins().
- */
-function advanced_forum_views_plugins() {
- $path = drupal_get_path('module', 'advanced_forum') . '/includes/views';
- return array(
- 'style' => array(
- 'forum_topic_list' => array(
- 'parent' => 'table',
- 'path' => $path,
- 'title' => t('Forum topic list'),
- 'help' => t('Displays the forum topic list as a view.'),
- 'handler' => 'advanced_forum_plugin_style_forum_topic_list',
- 'theme path' => drupal_get_path('module', 'advanced_forum') . '/includes',
- 'theme file' => 'theme.inc',
- 'theme' => 'advanced_forum_topic_list_view',
- 'uses row plugin' => FALSE,
- 'uses fields' => TRUE,
- 'uses options' => TRUE,
- 'type' => 'normal',
- ),
- ),
- );
-}
-
-/**
- * Implementation of hook_views_data().
- */
-function advanced_forum_views_data() {
- $data = array();
- // ----------------------------------------------------------------------
- // forum table
-
- // Have not defined $data['forum']['table']['group'] since
- // no fields are defined here yet.
- $data['forum']['table']['join'] = array(
- 'node_revisions' => array(
- 'left_field' => 'vid',
- 'field' => 'vid',
- ),
- 'node' => array(
- 'left_field' => 'vid',
- 'field' => 'vid',
- ),
- );
-
- return $data;
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_active_topics.view b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_active_topics.view
deleted file mode 100644
index a6efe69..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_active_topics.view
+++ /dev/null
@@ -1,743 +0,0 @@
-<?php
-// $Id$
-/**
- * DO NOT RE-EXPORT THIS VIEW WITHOUT CHECKING THE FORUM VID.
- *
- * When you export, please note the calls to variable_get('forum_nav_vocabulary', '')
- * to ensure that the forum vocabulary gets the right vid.
- */
-$view = new view;
-$view->name = 'advanced_forum_active_topics';
-$view->description = 'Shows the active topics in all forums.';
-$view->tag = 'Advanced Forum';
-$view->view_php = '';
-$view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-$handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('fields', array(
- 'nid' => array(
- 'label' => 'Nid',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'exclude' => 1,
- 'id' => 'nid',
- 'table' => 'node',
- 'field' => 'nid',
- 'relationship' => 'none',
- ),
- 'teaser' => array(
- 'label' => 'Teaser',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '200',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'teaser',
- 'table' => 'node_revisions',
- 'field' => 'teaser',
- 'relationship' => 'none',
- ),
- 'topic_icon' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'hot_topic_threshold' => '15',
- 'exclude' => 0,
- 'id' => 'topic_icon',
- 'table' => 'node',
- 'field' => 'topic_icon',
- 'relationship' => 'none',
- ),
- 'title' => array(
- 'label' => 'Topic',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '<span class="forum-topic-title">[title]</span> ',
- 'make_link' => 1,
- 'path' => 'node/[nid]',
- 'link_class' => 'topic-title',
- 'alt' => '[teaser]',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'exclude' => 0,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- ),
- 'timestamp' => array(
- 'label' => 'Has new content',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '[timestamp] ',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'comments' => 1,
- 'exclude' => 0,
- 'id' => 'timestamp',
- 'table' => 'history_user',
- 'field' => 'timestamp',
- 'relationship' => 'none',
- ),
- 'topic_pager' => array(
- 'label' => 'Topic Pager',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'total_pages_shown' => '3',
- 'exclude' => 0,
- 'id' => 'topic_pager',
- 'table' => 'node',
- 'field' => 'topic_pager',
- 'relationship' => 'none',
- ),
- 'name_1' => array(
- 'label' => 'Name',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<br /> by [name_1] ',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => 1,
- 'overwrite_anonymous' => 0,
- 'anonymous_text' => '',
- 'exclude' => 0,
- 'id' => 'name_1',
- 'table' => 'users',
- 'field' => 'name',
- 'relationship' => 'none',
- ),
- 'created' => array(
- 'label' => 'Post date',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'on [created]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
- 'comment_count' => array(
- 'label' => 'Replies',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'comment_count',
- 'table' => 'node_comment_statistics',
- 'field' => 'comment_count',
- 'relationship' => 'none',
- ),
- 'new_comments' => array(
- 'label' => 'New comments',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'html' => 0,
- 'strip_tags' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 1,
- 'empty_zero' => 0,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => 'View ',
- 'suffix' => ' new',
- 'link_to_comment' => 1,
- 'exclude' => 0,
- 'id' => 'new_comments',
- 'table' => 'node',
- 'field' => 'new_comments',
- 'relationship' => 'none',
- ),
- 'totalcount' => array(
- 'label' => 'Views',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'totalcount',
- 'table' => 'node_counter',
- 'field' => 'totalcount',
- 'relationship' => 'none',
- ),
- 'last_comment_name' => array(
- 'label' => 'Last comment author',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'by [last_comment_name]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => TRUE,
- 'exclude' => 0,
- 'id' => 'last_comment_name',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_comment_name',
- 'relationship' => 'none',
- ),
- 'last_updated' => array(
- 'label' => 'Last post',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'last_updated',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_updated',
- 'relationship' => 'none',
- ),
- 'sticky' => array(
- 'label' => 'Sticky',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'type' => 'yes-no',
- 'not' => 0,
- 'exclude' => 1,
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
- 'comment' => array(
- 'label' => 'Comment status',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'comment',
- 'table' => 'node',
- 'field' => 'comment',
- 'relationship' => 'none',
- ),
- 'name' => array(
- 'label' => 'Forum',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_taxonomy' => 1,
- 'exclude' => 0,
- 'id' => 'name',
- 'table' => 'term_data',
- 'field' => 'name',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('sorts', array(
- 'last_comment_timestamp' => array(
- 'order' => 'DESC',
- 'granularity' => 'second',
- 'id' => 'last_comment_timestamp',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_comment_timestamp',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('filters', array(
- 'status' => array(
- 'operator' => '=',
- 'value' => '1',
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'status',
- 'table' => 'node',
- 'field' => 'status',
- 'relationship' => 'none',
- ),
- 'vid' => array(
- 'operator' => 'in',
- 'value' => array(
- variable_get('forum_nav_vocabulary', '') => variable_get('forum_nav_vocabulary', ''),
- ),
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'vid',
- 'table' => 'term_data',
- 'field' => 'vid',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
- 'term_node_tid_depth' => array(
- 'operator' => 'or',
- 'value' => array(),
- 'group' => '0',
- 'exposed' => TRUE,
- 'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'term_node_tid_depth_op',
- 'identifier' => 'forum',
- 'label' => 'Show active topics in:',
- 'optional' => 1,
- 'single' => 0,
- 'remember' => 1,
- 'reduce' => 0,
- ),
- 'type' => 'select',
- 'limit' => TRUE,
- 'vid' => variable_get('forum_nav_vocabulary', ''),
- 'depth' => '2',
- 'id' => 'term_node_tid_depth',
- 'table' => 'node',
- 'field' => 'term_node_tid_depth',
- 'hierarchy' => 1,
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- 'reduce_duplicates' => 0,
- ),
-));
-$handler->override_option('access', array(
- 'type' => 'none',
-));
-$handler->override_option('cache', array(
- 'type' => 'none',
-));
-$handler->override_option('title', 'Active forum topics');
-$handler->override_option('empty', 'No active topics.');
-$handler->override_option('empty_format', '1');
-$handler->override_option('items_per_page', 20);
-$handler->override_option('use_pager', '1');
-$handler->override_option('distinct', 1);
-$handler->override_option('style_plugin', 'forum_topic_list');
-$handler->override_option('style_options', array(
- 'grouping' => '',
- 'override' => 0,
- 'sticky' => 1,
- 'order' => 'desc',
- 'columns' => array(
- 'nid' => 'nid',
- 'teaser' => 'teaser',
- 'topic_icon' => 'topic_icon',
- 'title' => 'title',
- 'name' => 'name',
- 'timestamp' => 'title',
- 'topic_pager' => 'title',
- 'name_1' => 'title',
- 'created' => 'title',
- 'comment_count' => 'comment_count',
- 'new_comments' => 'comment_count',
- 'totalcount' => 'totalcount',
- 'last_comment_name' => 'last_updated',
- 'last_updated' => 'last_updated',
- 'sticky' => 'sticky',
- 'comment' => 'comment',
- ),
- 'info' => array(
- 'nid' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'topic_icon' => array(
- 'separator' => '',
- ),
- 'title' => array(
- 'sortable' => 1,
- 'separator' => ' ',
- ),
- 'name' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'timestamp' => array(
- 'separator' => '',
- ),
- 'topic_pager' => array(
- 'separator' => '',
- ),
- 'name_1' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'created' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'comment_count' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'new_comments' => array(
- 'separator' => '',
- ),
- 'totalcount' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'last_comment_name' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'last_updated' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'sticky' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'teaser' => array(
- 'separator' => '',
- ),
- 'comment' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- ),
- 'default' => 'last_updated',
- 'tid' => 'filter.term_node_tid_depth',
-));
-
-// Get rid of the views counter if statistics not enabled.
-if (!module_exists('statistics')) {
- unset($handler->display->display_options['fields']['totalcount']);
- unset($handler->display->display_options['style_options']['columns']['totalcount']);
-}
-
-$handler = $view->new_display('page', 'Page', 'page_1');
-$handler->override_option('path', 'forum/active');
-
-if (variable_get('advanced_forum_views_as_tabs', TRUE)) {
- $handler->override_option('menu', array(
- 'type' => 'tab',
- 'title' => 'Active topics',
- 'description' => '',
- 'weight' => '1',
- 'name' => 'navigation',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => '0',
- 'name' => 'navigation',
- ));
-}
-else {
- $handler->override_option('menu', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- ));
-}
-
-$handler = $view->new_display('feed', 'Feed', 'feed_1');
-$handler->override_option('link_display', 'feed_1');
-$handler->override_option('style_plugin', 'rss');
-$handler->override_option('style_options', array(
- 'mission_description' => FALSE,
- 'description' => '',
-));
-$handler->override_option('row_plugin', 'node_rss');
-$handler->override_option('path', 'forum/active/feed');
-$handler->override_option('menu', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
-));
-$handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
-));
-$handler->override_option('displays', array(
- 'page_1' => 'page_1',
- 'default' => 0,
-));
-$handler->override_option('sitename_title', FALSE);
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_group_topic_list.view b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_group_topic_list.view
deleted file mode 100644
index a4fedd7..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_group_topic_list.view
+++ /dev/null
@@ -1,638 +0,0 @@
-<?php
-// $Id$
-
-$view = new view;
-$view->name = 'advanced_forum_group_topic_list';
-$view->description = 'Shows the topics in a given group as if it were a forum';
-$view->tag = 'Advanced Forum';
-$view->view_php = '';
-$view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-$handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('fields', array(
- 'nid' => array(
- 'label' => 'Nid',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_node' => 0,
- 'exclude' => 1,
- 'id' => 'nid',
- 'table' => 'node',
- 'field' => 'nid',
- 'relationship' => 'none',
- ),
- 'teaser' => array(
- 'label' => 'Teaser',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '200',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'teaser',
- 'table' => 'node_revisions',
- 'field' => 'teaser',
- 'relationship' => 'none',
- ),
- 'topic_icon' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'hot_topic_threshold' => '15',
- 'exclude' => 0,
- 'id' => 'topic_icon',
- 'table' => 'node',
- 'field' => 'topic_icon',
- 'relationship' => 'none',
- ),
- 'title' => array(
- 'label' => 'Topic / Topic starter',
- 'alter' => array(
- 'alter_text' => 1,
-
- 'text' => '<span class="forum-topic-title">[title]</span> ',
- 'make_link' => 1,
- 'path' => 'node/[nid]',
- 'link_class' => '',
- 'alt' => '[teaser]',
- 'prefix' => '',
- 'suffix' => '',
-
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
-
-
-
- 'link_to_node' => 0,
- 'exclude' => 0,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- ),
- 'timestamp' => array(
- 'label' => 'Has new content',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '[timestamp] ',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
-
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'comments' => 1,
- 'exclude' => 0,
- 'id' => 'timestamp',
- 'table' => 'history_user',
- 'field' => 'timestamp',
- 'relationship' => 'none',
- ),
- 'topic_pager' => array(
- 'label' => 'Topic Pager',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'total_pages_shown' => '3',
- 'exclude' => 0,
- 'id' => 'topic_pager',
- 'table' => 'node',
- 'field' => 'topic_pager',
- 'relationship' => 'none',
- ),
- 'name_1' => array(
- 'label' => 'Name',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<br /> by [name_1] ',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
-
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => 1,
- 'overwrite_anonymous' => 0,
- 'anonymous_text' => '',
- 'exclude' => 0,
- 'id' => 'name_1',
- 'table' => 'users',
- 'field' => 'name',
- 'relationship' => 'none',
- ),
- 'created' => array(
- 'label' => 'Post date',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'on [created]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
-
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
- 'comment_count' => array(
- 'label' => 'Replies',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
-
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'comment_count',
- 'table' => 'node_comment_statistics',
- 'field' => 'comment_count',
- 'relationship' => 'none',
- ),
- 'new_comments' => array(
- 'label' => 'New comments',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => ' (',
- 'suffix' => ' new)',
- 'link_to_comment' => 1,
- 'no_empty' => 1,
- 'exclude' => 0,
- 'id' => 'new_comments',
- 'table' => 'node',
- 'field' => 'new_comments',
- 'relationship' => 'none',
- ),
- 'totalcount' => array(
- 'label' => 'Views',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'totalcount',
- 'table' => 'node_counter',
- 'field' => 'totalcount',
- 'relationship' => 'none',
- ),
- 'last_comment_name' => array(
- 'label' => 'Last comment author',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'by [last_comment_name]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
-
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => TRUE,
- 'exclude' => 0,
- 'id' => 'last_comment_name',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_comment_name',
- 'relationship' => 'none',
- ),
- 'last_updated' => array(
- 'label' => 'Last post',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
-
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'last_updated',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_updated',
- 'relationship' => 'none',
- ),
- 'sticky' => array(
- 'label' => 'Sticky',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'type' => 'yes-no',
- 'not' => 0,
- 'exclude' => 1,
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
- 'comment' => array(
- 'label' => 'Comment status',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'comment',
- 'table' => 'node',
- 'field' => 'comment',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('sorts', array(
- 'sticky' => array(
- 'order' => 'DESC',
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('arguments', array(
- 'group_nid' => array(
- 'default_action' => 'ignore',
- 'style_plugin' => 'default_summary',
- 'style_options' => array(),
- 'wildcard' => 'all',
- 'wildcard_substitution' => 'All',
- 'title' => '%1',
- 'breadcrumb' => '',
- 'default_argument_type' => 'fixed',
- 'default_argument' => '',
- 'validate_type' => 'og_group_types',
- 'validate_fail' => 'not found',
- 'break_phrase' => 0,
-
-
-
-
- 'not' => 0,
- 'id' => 'group_nid',
- 'table' => 'og_ancestry',
- 'field' => 'group_nid',
- 'validate_user_argument_type' => 'uid',
- 'validate_user_roles' => array(
- '2' => 0,
- '15' => 0,
- ),
- 'relationship' => 'none',
- 'default_options_div_prefix' => '',
- 'default_argument_user' => 0,
- 'default_argument_fixed' => '',
- 'default_argument_php' => '',
- 'validate_argument_node_type' => array(
- 'forum' => 0,
- 'comment' => 0,
- 'discussion' => 0,
- 'group' => 0,
- ),
- 'validate_argument_node_access' => 0,
- 'validate_argument_nid_type' => 'nid',
- 'validate_argument_vocabulary' => array(
- '1' => 0,
- '2' => 0,
- ),
- 'validate_argument_type' => 'tid',
- 'validate_argument_transform' => 0,
- 'validate_user_restrict_roles' => 0,
- 'validate_argument_node_flag_name' => '*relationship*',
- 'validate_argument_node_flag_test' => 'flaggable',
- 'validate_argument_node_flag_id_type' => 'id',
- 'validate_argument_user_flag_name' => '*relationship*',
- 'validate_argument_user_flag_test' => 'flaggable',
- 'validate_argument_user_flag_id_type' => 'id',
- 'validate_argument_is_member' => 0,
- 'validate_argument_php' => '',
- ),
-));
-$handler->override_option('filters', array(
- 'status' => array(
- 'operator' => '=',
- 'value' => '1',
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'status',
- 'table' => 'node',
- 'field' => 'status',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('access', array(
- 'type' => 'none',
-));
-$handler->override_option('cache', array(
- 'type' => 'none',
-));
-$handler->override_option('title', 'Group Name');
-$handler->override_option('empty', 'No posts in this group.');
-$handler->override_option('empty_format', '1');
-$handler->override_option('items_per_page', 20);
-$handler->override_option('use_pager', '1');
-$handler->override_option('style_plugin', 'forum_topic_list');
-$handler->override_option('style_options', array(
- 'grouping' => '',
- 'override' => 0,
- 'sticky' => 1,
- 'order' => 'desc',
- 'columns' => array(
- 'nid' => 'nid',
- 'teaser' => 'teaser',
- 'topic_icon' => 'topic_icon',
- 'title' => 'title',
- 'timestamp' => 'title',
- 'topic_pager' => 'title',
- 'name_1' => 'title',
- 'created' => 'title',
- 'comment_count' => 'comment_count',
- 'new_comments' => 'comment_count',
- 'totalcount' => 'totalcount',
- 'last_comment_name' => 'last_updated',
- 'last_updated' => 'last_updated',
- 'sticky' => 'sticky',
- 'comment' => 'comment',
- ),
- 'info' => array(
- 'nid' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'teaser' => array(
- 'separator' => '',
- ),
- 'topic_icon' => array(
- 'separator' => '',
- ),
- 'title' => array(
- 'sortable' => 1,
- 'separator' => ' ',
- ),
- 'timestamp' => array(
- 'separator' => '',
- ),
- 'topic_pager' => array(
- 'separator' => '',
- ),
- 'name_1' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'created' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'comment_count' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'new_comments' => array(
- 'separator' => '',
- ),
- 'totalcount' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'last_comment_name' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'last_updated' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'sticky' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'comment' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- ),
- 'default' => 'last_updated',
- 'tid' => '',
-));
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_handler_field_node_topic_icon.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_handler_field_node_topic_icon.inc
deleted file mode 100644
index d44d678..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_handler_field_node_topic_icon.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Field handler to display the topic icon.
- */
-
-class advanced_forum_handler_field_node_topic_icon extends views_handler_field{
- function construct() {
- parent::construct();
- $this->additional_fields = array('nid' => 'nid', 'type' => 'type');
- }
-
- function option_definition() {
- $options = parent::option_definition();
-
- $options['hot_topic_threshold'] = array('default' => 15);
-
- return $options;
- }
-
- function options_form(&$form, &$form_state) {
- parent::options_form($form, $form_state);
- $form['hot_topic_threshold'] = array(
- '#title' => t('Hot topic threshold'),
- '#description' => t('The number of posts a topic must have to be considered "hot".'),
- '#type' => 'textfield',
- '#default_value' => $this->options['hot_topic_threshold'],
- );
- }
-
- function query() {
- $this->ensure_my_table();
- $this->add_additional_fields();
- $this->field_alias = $this->table . '_' . $this->field;
- }
-
- function render($values) {
- $new_posts = advanced_forum_reply_num_new($values->nid);
- return theme('forum_icon', $new_posts, $values->node_comment_statistics_comment_count, $values->node_comment, $values->node_sticky);
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_handler_field_node_topic_pager.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_handler_field_node_topic_pager.inc
deleted file mode 100644
index d89fdfd..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_handler_field_node_topic_pager.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Field handler to display the topic pager.
- */
-
-class advanced_forum_handler_field_node_topic_pager extends views_handler_field{
- function construct() {
- parent::construct();
- $this->additional_fields = array('nid' => 'nid', 'type' => 'type');
- }
-
- function option_definition() {
- $options = parent::option_definition();
-
- $options['total_pages_shown'] = array('default' => 6);
-
- return $options;
- }
-
- function options_form(&$form, &$form_state) {
- parent::options_form($form, $form_state);
- $form['total_pages_shown'] = array(
- '#title' => t('Total pages shown'),
- '#description' => t('Total number of page numbers to show, including initial numbers and one final. 0 hides pager.'),
- '#type' => 'textfield',
- '#default_value' => $this->options['total_pages_shown'],
- );
- }
-
- function query() {
- $this->ensure_my_table();
- $this->add_additional_fields();
- $this->field_alias = $this->table . '_' . $this->field;
- }
-
- function render($values) {
- // Make a fake topic object with the information that the core one has.
- $topic = new stdClass();
- $topic->nid = $values->nid;
- $topic->type = $values->node_type;
- $topic->num_comments = $values->node_comment_statistics_comment_count;
-
- return theme('advanced_forum_topic_pager', $this->options['total_pages_shown'], $topic);
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_new_topics.view b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_new_topics.view
deleted file mode 100644
index c04500f..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_new_topics.view
+++ /dev/null
@@ -1,704 +0,0 @@
-<?php
-// $Id$
-/**
- * DO NOT RE-EXPORT THIS VIEW WITHOUT CHECKING THE FORUM VID.
- *
- * When you export, please note the calls to variable_get('forum_nav_vocabulary', '')
- * to ensure that the forum vocabulary gets the right vid.
- */
-
-$view = new view;
-$view->name = 'advanced_forum_new_topics';
-$view->description = 'Shows the new or update topics in a given forum (or all forums)';
-$view->tag = 'Advanced Forum';
-$view->view_php = '';
-$view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-$handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('fields', array(
- 'teaser' => array(
- 'label' => 'Teaser',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '200',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'teaser',
- 'table' => 'node_revisions',
- 'field' => 'teaser',
- 'relationship' => 'none',
- ),
- 'topic_icon' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'hot_topic_threshold' => '15',
- 'exclude' => 0,
- 'id' => 'topic_icon',
- 'table' => 'node',
- 'field' => 'topic_icon',
- 'relationship' => 'none',
- ),
- 'title' => array(
- 'label' => 'Topic / Topic starter',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<span class="forum-topic-title">[title]</span> ',
- 'make_link' => 1,
- 'path' => 'node/[nid]',
- 'link_class' => '',
- 'alt' => '[teaser]',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 1,
- 'exclude' => 0,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- ),
- 'timestamp' => array(
- 'label' => 'Has new content',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '[timestamp] ',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'comments' => 1,
- 'exclude' => 0,
- 'id' => 'timestamp',
- 'table' => 'history_user',
- 'field' => 'timestamp',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
- 'topic_pager' => array(
- 'label' => 'Topic Pager',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'total_pages_shown' => '3',
- 'exclude' => 0,
- 'id' => 'topic_pager',
- 'table' => 'node',
- 'field' => 'topic_pager',
- 'relationship' => 'none',
- ),
- 'name_1' => array(
- 'label' => 'Name',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<br /> by [name_1] ',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => 1,
- 'overwrite_anonymous' => 0,
- 'anonymous_text' => '',
- 'exclude' => 0,
- 'id' => 'name_1',
- 'table' => 'users',
- 'field' => 'name',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
- 'created' => array(
- 'label' => 'Post date',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'on [created]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
- 'comment_count' => array(
- 'label' => 'Replies',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'comment_count',
- 'table' => 'node_comment_statistics',
- 'field' => 'comment_count',
- 'relationship' => 'none',
- ),
- 'new_comments' => array(
- 'label' => 'New comments',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 1,
- 'empty_zero' => 0,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => ' View ',
- 'suffix' => ' new',
- 'link_to_comment' => 1,
- 'exclude' => 0,
- 'id' => 'new_comments',
- 'table' => 'node',
- 'field' => 'new_comments',
- 'relationship' => 'none',
- ),
- 'totalcount' => array(
- 'label' => 'Views',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'totalcount',
- 'table' => 'node_counter',
- 'field' => 'totalcount',
- 'relationship' => 'none',
- ),
- 'last_comment_name' => array(
- 'label' => 'Last comment author',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'by [last_comment_name]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => TRUE,
- 'exclude' => 0,
- 'id' => 'last_comment_name',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_comment_name',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
- 'last_updated' => array(
- 'label' => 'Last update',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'last_updated',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_updated',
- 'relationship' => 'none',
- ),
- 'name' => array(
- 'label' => 'Forum',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_taxonomy' => 1,
- 'exclude' => 0,
- 'id' => 'name',
- 'table' => 'term_data',
- 'field' => 'name',
- 'relationship' => 'none',
- ),
- 'sticky' => array(
- 'label' => 'Sticky',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'type' => 'yes-no',
- 'not' => 0,
- 'exclude' => 1,
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
- 'comment' => array(
- 'label' => 'Comment status',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'comment',
- 'table' => 'node',
- 'field' => 'comment',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('sorts', array(
- 'sticky' => array(
- 'order' => 'DESC',
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('filters', array(
- 'status' => array(
- 'operator' => '=',
- 'value' => '1',
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'status',
- 'table' => 'node',
- 'field' => 'status',
- 'relationship' => 'none',
- ),
- 'timestamp' => array(
- 'operator' => '=',
- 'value' => '',
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'timestamp',
- 'table' => 'history_user',
- 'field' => 'timestamp',
- 'relationship' => 'none',
- ),
- 'vid' => array(
- 'operator' => 'in',
- 'value' => array(
- variable_get('forum_nav_vocabulary', '') => variable_get('forum_nav_vocabulary', ''),
- ),
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'vid',
- 'table' => 'term_data',
- 'field' => 'vid',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
- 'term_node_tid_depth' => array(
- 'operator' => 'or',
- 'value' => array(),
- 'group' => '0',
- 'exposed' => TRUE,
- 'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'term_node_tid_depth_op',
- 'identifier' => 'forum',
- 'label' => 'Show new & updated topics in:',
- 'optional' => 1,
- 'single' => 0,
- 'remember' => 1,
- 'reduce' => 0,
- ),
- 'type' => 'select',
- 'limit' => TRUE,
- 'vid' => variable_get('forum_nav_vocabulary', ''),
- 'depth' => '2',
- 'id' => 'term_node_tid_depth',
- 'table' => 'node',
- 'field' => 'term_node_tid_depth',
- 'hierarchy' => 1,
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- 'reduce_duplicates' => 0,
- ),
-));
-$handler->override_option('access', array(
- 'type' => 'role',
- 'role' => array(
- '2' => 2,
- ),
-));
-$handler->override_option('cache', array(
- 'type' => 'none',
-));
-$handler->override_option('title', 'Topics with new and updated posts');
-$handler->override_option('empty', 'No new or updated posts.');
-$handler->override_option('empty_format', '1');
-$handler->override_option('items_per_page', 20);
-$handler->override_option('use_pager', '1');
-$handler->override_option('distinct', 1);
-$handler->override_option('style_plugin', 'forum_topic_list');
-$handler->override_option('style_options', array(
- 'grouping' => '',
- 'override' => 0,
- 'sticky' => 1,
- 'order' => 'desc',
- 'columns' => array(
- 'teaser' => 'teaser',
- 'topic_icon' => 'topic_icon',
- 'title' => 'title',
- 'timestamp' => 'title',
- 'topic_pager' => 'title',
- 'name_1' => 'title',
- 'created' => 'title',
- 'comment_count' => 'comment_count',
- 'new_comments' => 'comment_count',
- 'totalcount' => 'totalcount',
- 'last_comment_name' => 'last_updated',
- 'last_updated' => 'last_updated',
- 'name' => 'name',
- 'sticky' => 'sticky',
- 'comment' => 'comment',
- ),
- 'info' => array(
- 'teaser' => array(
- 'separator' => '',
- ),
- 'topic_icon' => array(
- 'separator' => '',
- ),
- 'title' => array(
- 'sortable' => 1,
- 'separator' => ' ',
- ),
- 'timestamp' => array(
- 'separator' => '',
- ),
- 'topic_pager' => array(
- 'separator' => '',
- ),
- 'name_1' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'created' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'comment_count' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'new_comments' => array(
- 'separator' => '',
- ),
- 'totalcount' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'last_comment_name' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'last_updated' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'name' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
-
- 'sticky' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'comment' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- ),
- 'default' => 'last_updated',
- 'tid' => 'filter.term_node_tid_depth',
-));
-
-// Get rid of the views counter if statistics not enabled.
-if (!module_exists('statistics')) {
- unset($handler->display->display_options['fields']['totalcount']);
- unset($handler->display->display_options['style_options']['columns']['totalcount']);
-}
-
-$handler = $view->new_display('page', 'Page', 'page_1');
-$handler->override_option('path', 'forum/new');
-
-if (variable_get('advanced_forum_views_as_tabs', TRUE)) {
- $handler->override_option('menu', array(
- 'type' => 'tab',
- 'title' => 'New & updated topics',
- 'description' => '',
- 'weight' => '2',
- 'name' => 'navigation',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
- ));
-}
-else {
- $handler->override_option('menu', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- ));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_plugin_style_forum_topic_list.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_plugin_style_forum_topic_list.inc
deleted file mode 100644
index 1814813..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_plugin_style_forum_topic_list.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * @file
- * Contains the topic list style plugin.
- */
-
-/**
- * Style plugin to render each item as a row in a table.
- *
- * @ingroup views_style_plugins
- */
-class advanced_forum_plugin_style_forum_topic_list extends views_plugin_style_table {
- function option_definition() {
- $options = parent::option_definition();
- $options['tid'] = array('default' => '');
- return $options;
- }
-
- function options_form(&$form, &$form_state) {
- parent::options_form($form, $form_state);
- $options = array('' => t('None'));
-
- $arguments = $this->display->handler->get_handlers('argument');
- foreach ($arguments as $id => $argument) {
- $options['argument.' . $id] = $argument->ui_name();
-
- }
- $filters = $this->display->handler->get_handlers('filter');
- foreach ($filters as $id => $filter) {
- $options['filter.' . $id] = $filter->ui_name();
- }
-
- $form['tid'] = array(
- '#type' => 'select',
- '#title' => t('Source of forum ID'),
- '#options' => $options,
- '#default_value' => $this->options['tid'],
- );
- }
-
- /**
- * Add a couple of fields to the query that we can later use. We are going to
- * specificly alias them because this style is not meant to be used on relationships.
- */
- function query() {
- $this->view->query->add_field('node', 'sticky', 'topic_is_sticky');
- $this->view->query->add_field('forum', 'tid', 'topic_actual_forum');
- }
-
- /**
- * Figure out what the forum ID is. It could have come from an argument
- * or a filter or nowhere. This source would be set by the user in the
- * options.
- */
- function get_forum_ids() {
- $where = $this->options['tid'];
- if (empty($where)) {
- return;
- }
-
- $term = '';
-
- list($type, $id) = explode('.', $where, 2);
- $handler = $this->display->handler->get_handler($type, $id);
- if ($type == 'argument') {
- return array($handler->argument);
- }
- else {
- $terms = $handler->value;
- if (isset($handler->options['depth'])) {
- foreach ($handler->value as $tid) {
- $term = taxonomy_get_term($tid);
- $tree = taxonomy_get_tree($term->vid, $tid, -1, $handler->options['depth']);
- $terms = array_merge($terms, array_map('_taxonomy_get_tid_from_term', $tree));
- }
- }
- return $terms;
- }
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_search.view b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_search.view
deleted file mode 100644
index ce2e591..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_search.view
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-// $Id$
-/**
- * DO NOT RE-EXPORT THIS VIEW WITHOUT CHECKING THE FORUM VID.
- *
- * When you export, please note the calls to variable_get('forum_nav_vocabulary', '')
- * to ensure that the forum vocabulary gets the right vid.
- */
-
-
-if (module_exists('nodecomment')) {
-
-// BEGIN VIEW EXPORT ********************************************************/
-
-$view = new view;
-$view->name = 'advanced_forum_search';
-$view->description = 'Search the forums';
-$view->tag = 'Advanced Forum';
-$view->view_php = '';
-$view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-$handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('relationships', array(
- 'nid_or_self' => array(
- 'label' => 'parent',
- 'id' => 'nid_or_self',
- 'table' => 'node_comments',
- 'field' => 'nid_or_self',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('fields', array(
- 'title' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_node' => 0,
- 'exclude' => 1,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- ),
- 'nodecomment_link' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'text' => '[title]',
- 'exclude' => 0,
- 'id' => 'nodecomment_link',
- 'table' => 'node',
- 'field' => 'nodecomment_link',
- 'relationship' => 'none',
- ),
- 'nodecomment_author' => array(
- 'label' => 'by',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_user' => 1,
- 'overwrite_anonymous' => 0,
- 'anonymous_text' => '',
- 'exclude' => 0,
- 'id' => 'nodecomment_author',
- 'table' => 'node',
- 'field' => 'nodecomment_author',
- 'relationship' => 'none',
- ),
- 'created' => array(
- 'label' => 'Posted',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'date_format' => 'time ago',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
- 'timestamp' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_node' => 0,
- 'comments' => 0,
- 'exclude' => 0,
- 'id' => 'timestamp',
- 'table' => 'history_user',
- 'field' => 'timestamp',
- 'relationship' => 'none',
- ),
- 'name_1' => array(
- 'label' => 'Forum',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_taxonomy' => 1,
- 'exclude' => 0,
- 'id' => 'name_1',
- 'table' => 'term_data',
- 'field' => 'name',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'nid_or_self',
- ),
- 'body' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '200',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'exclude' => 0,
- 'id' => 'body',
- 'table' => 'node_revisions',
- 'field' => 'body',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
-));
-$handler->override_option('sorts', array(
- 'score' => array(
- 'order' => 'DESC',
- 'id' => 'score',
- 'table' => 'search_index',
- 'field' => 'score',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('filters', array(
- 'term_node_tid_depth' => array(
- 'operator' => 'or',
- 'value' => array(),
- 'group' => '0',
- 'exposed' => TRUE,
- 'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'term_node_tid_depth_op',
- 'identifier' => 'forum',
- 'label' => 'Forum',
- 'optional' => 1,
- 'single' => 1,
- 'remember' => 0,
- 'reduce' => 0,
- ),
- 'type' => 'select',
- 'limit' => TRUE,
- 'vid' => variable_get('forum_nav_vocabulary', ''),
- 'depth' => '2',
- 'id' => 'term_node_tid_depth',
- 'table' => 'node',
- 'field' => 'term_node_tid_depth',
- 'hierarchy' => 1,
- 'relationship' => 'nid_or_self',
- 'reduce_duplicates' => 0,
- ),
- 'keys' => array(
- 'operator' => 'required',
- 'value' => '',
- 'group' => '0',
- 'exposed' => TRUE,
- 'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'keys_op',
- 'identifier' => 'keys',
- 'label' => 'Keywords',
- 'optional' => 0,
- 'remember' => 0,
- ),
- 'id' => 'keys',
- 'table' => 'search_index',
- 'field' => 'keys',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
- 'vid' => array(
- 'operator' => 'in',
- 'value' => array(
- variable_get('forum_nav_vocabulary', '') => variable_get('forum_nav_vocabulary', ''),
- ),
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'vid',
- 'table' => 'term_data',
- 'field' => 'vid',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'nid_or_self',
- ),
-));
-$handler->override_option('access', array(
- 'type' => 'none',
-));
-$handler->override_option('cache', array(
- 'type' => 'none',
-));
-$handler->override_option('title', 'Forum search');
-$handler->override_option('header', '<em>You may use the word and to require multiple keywords, i.e, <strong>red and car</strong>. You may enclose words in quotes to perform an exact phrase match, i.e, <strong>"red car"</strong>.</em>');
-$handler->override_option('header_format', '1');
-$handler->override_option('header_empty', 1);
-$handler->override_option('use_pager', '1');
-$handler->override_option('distinct', 0);
-$handler->override_option('row_options', array(
- 'inline' => array(
- 'name' => 'name',
- 'created' => 'created',
- 'timestamp' => 'timestamp',
- 'name_1' => 'name_1',
- ),
- 'separator' => ' ',
-));
-$handler = $view->new_display('page', 'Page', 'page_1');
-$handler->override_option('path', 'forum/search');
-$handler->override_option('menu', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
-));
-$handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
-));
-// END VIEW EXPORT ********************************************************/
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_search_topic.view b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_search_topic.view
deleted file mode 100644
index 5e8e97c..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_search_topic.view
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-// $Id$
-
-if (module_exists('nodecomment')) {
-
-// BEGIN VIEW EXPORT ********************************************************/
-$view = new view;
-$view->name = 'advanced_forum_search_topic';
-$view->description = 'Search a single topic';
-$view->tag = 'Advanced Forum';
-$view->view_php = '';
-$view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-$handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('relationships', array(
- 'nid_or_self' => array(
- 'label' => 'parent',
- 'id' => 'nid_or_self',
- 'table' => 'node_comments',
- 'field' => 'nid_or_self',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('fields', array(
- 'title' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_node' => 0,
- 'exclude' => 1,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- ),
- 'nodecomment_link' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'text' => '[title]',
- 'exclude' => 0,
- 'id' => 'nodecomment_link',
- 'table' => 'node',
- 'field' => 'nodecomment_link',
- 'relationship' => 'none',
- ),
- 'nodecomment_author' => array(
- 'label' => 'by',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_user' => 1,
- 'overwrite_anonymous' => 0,
- 'anonymous_text' => '',
- 'exclude' => 0,
- 'id' => 'nodecomment_author',
- 'table' => 'node',
- 'field' => 'nodecomment_author',
- 'relationship' => 'none',
- ),
- 'created' => array(
- 'label' => 'Posted',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'date_format' => 'time ago',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
- 'timestamp' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_node' => 0,
- 'comments' => 0,
- 'exclude' => 0,
- 'id' => 'timestamp',
- 'table' => 'history_user',
- 'field' => 'timestamp',
- 'relationship' => 'none',
- ),
- 'body' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '200',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'exclude' => 0,
- 'id' => 'body',
- 'table' => 'node_revisions',
- 'field' => 'body',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
-));
-$handler->override_option('sorts', array(
- 'score' => array(
- 'order' => 'DESC',
- 'id' => 'score',
- 'table' => 'search_index',
- 'field' => 'score',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('arguments', array(
- 'nid' => array(
- 'default_action' => 'not found',
- 'style_plugin' => 'default_summary',
- 'style_options' => array(),
- 'wildcard' => 'all',
- 'wildcard_substitution' => 'All',
- 'title' => '',
- 'breadcrumb' => '',
- 'default_argument_type' => 'fixed',
- 'default_argument' => '',
- 'validate_type' => 'none',
- 'validate_fail' => 'not found',
- 'break_phrase' => 0,
- 'not' => 0,
- 'id' => 'nid',
- 'table' => 'node',
- 'field' => 'nid',
- 'validate_user_argument_type' => 'uid',
- 'validate_user_roles' => array(
- '2' => 0,
- ),
- 'relationship' => 'nid_or_self',
- 'default_options_div_prefix' => '',
- 'default_argument_user' => 0,
- 'default_argument_fixed' => '',
- 'default_argument_php' => '',
- 'validate_argument_node_type' => array(
- 'poll' => 0,
- 'forum' => 0,
- 'comment' => 0,
- 'image' => 0,
- 'page' => 0,
- 'story' => 0,
- ),
- 'validate_argument_node_access' => 0,
- 'validate_argument_nid_type' => 'nid',
- 'validate_argument_vocabulary' => array(
- '4' => 0,
- '3' => 0,
- '2' => 0,
- ),
- 'validate_argument_type' => 'tid',
- 'validate_argument_transform' => 0,
- 'validate_user_restrict_roles' => 0,
- 'validate_argument_php' => '',
- ),
-));
-$handler->override_option('filters', array(
- 'keys' => array(
- 'operator' => 'required',
- 'value' => '',
- 'group' => '0',
- 'exposed' => TRUE,
- 'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'keys_op',
- 'identifier' => 'keys',
- 'label' => 'Keywords',
- 'optional' => 0,
- 'remember' => 0,
- ),
- 'id' => 'keys',
- 'table' => 'search_index',
- 'field' => 'keys',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('access', array(
- 'type' => 'none',
-));
-$handler->override_option('cache', array(
- 'type' => 'none',
-));
-$handler->override_option('title', 'Search');
-$handler->override_option('header', '<em>You may use the word and to require multiple keywords, i.e, <strong>red and car</strong>. You may enclose words in quotes to perform an exact phrase match, i.e, <strong>"red car"</strong>.</em>');
-$handler->override_option('header_format', '1');
-$handler->override_option('header_empty', 0);
-$handler->override_option('use_pager', '1');
-$handler->override_option('distinct', 0);
-$handler->override_option('row_options', array(
- 'inline' => array(
- 'name' => 'name',
- 'created' => 'created',
- 'timestamp' => 'timestamp',
- 'name_1' => 'name_1',
- ),
- 'separator' => ' ',
-));
-$handler = $view->new_display('page', 'Page', 'page_1');
-$handler->override_option('path', 'node/%/search');
-$handler->override_option('menu', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
-));
-$handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
-));
-// END VIEW EXPORT ********************************************************/
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_topic_list.view b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_topic_list.view
deleted file mode 100644
index 25c4b75..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_topic_list.view
+++ /dev/null
@@ -1,656 +0,0 @@
-<?php
-// $Id$
-
-
-$view = new view;
-$view->name = 'advanced_forum_topic_list';
-$view->description = 'Shows the topics in a given forum';
-$view->tag = 'Advanced Forum';
-$view->view_php = '';
-$view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-$handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('fields', array(
- 'nid' => array(
- 'label' => 'Nid',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'exclude' => 1,
- 'id' => 'nid',
- 'table' => 'node',
- 'field' => 'nid',
- 'relationship' => 'none',
- ),
- 'teaser' => array(
- 'label' => 'Teaser',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '200',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'teaser',
- 'table' => 'node_revisions',
- 'field' => 'teaser',
- 'relationship' => 'none',
- ),
- 'topic_icon' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'hot_topic_threshold' => '15',
- 'exclude' => 0,
- 'id' => 'topic_icon',
- 'table' => 'node',
- 'field' => 'topic_icon',
- 'relationship' => 'none',
- ),
- 'title' => array(
- 'label' => 'Topic',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<span class="forum-topic-title">[title]</span> ',
- 'make_link' => 1,
- 'path' => 'node/[nid]',
- 'link_class' => 'topic-title',
- 'alt' => '[teaser]',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'exclude' => 0,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- ),
- 'timestamp' => array(
- 'label' => 'Has new content',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '[timestamp] ',
-
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'comments' => 1,
- 'exclude' => 0,
- 'id' => 'timestamp',
- 'table' => 'history_user',
- 'field' => 'timestamp',
- 'relationship' => 'none',
- ),
- 'topic_pager' => array(
- 'label' => 'Topic Pager',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'total_pages_shown' => '3',
- 'exclude' => 0,
- 'id' => 'topic_pager',
- 'table' => 'node',
- 'field' => 'topic_pager',
- 'relationship' => 'none',
- ),
- 'name_1' => array(
- 'label' => 'Name',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<br /> by [name_1] ',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => 1,
- 'overwrite_anonymous' => 0,
- 'anonymous_text' => '',
- 'exclude' => 0,
- 'id' => 'name_1',
- 'table' => 'users',
- 'field' => 'name',
- 'relationship' => 'none',
- ),
- 'created' => array(
- 'label' => 'Post date',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'on [created]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
- 'comment_count' => array(
- 'label' => 'Replies',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'comment_count',
- 'table' => 'node_comment_statistics',
- 'field' => 'comment_count',
- 'relationship' => 'none',
- ),
- 'new_comments' => array(
- 'label' => 'New comments',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'html' => 0,
- 'strip_tags' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 1,
- 'empty_zero' => 0,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => 'View ',
- 'suffix' => ' new',
- 'link_to_comment' => 1,
- 'exclude' => 0,
- 'id' => 'new_comments',
- 'table' => 'node',
- 'field' => 'new_comments',
- 'relationship' => 'none',
- ),
- 'totalcount' => array(
- 'label' => 'Views',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'totalcount',
- 'table' => 'node_counter',
- 'field' => 'totalcount',
- 'relationship' => 'none',
- ),
- 'last_comment_name' => array(
- 'label' => 'Last comment author',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'by [last_comment_name]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => TRUE,
- 'exclude' => 0,
- 'id' => 'last_comment_name',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_comment_name',
- 'relationship' => 'none',
- ),
- 'last_comment_timestamp' => array(
- 'label' => 'Last post',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'last_comment_timestamp',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_comment_timestamp',
- 'relationship' => 'none',
- ),
- 'sticky' => array(
- 'label' => 'Sticky',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'type' => 'yes-no',
- 'not' => 0,
- 'exclude' => 1,
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
- 'comment' => array(
- 'label' => 'Comment status',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'comment',
- 'table' => 'node',
- 'field' => 'comment',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('sorts', array(
- 'sticky' => array(
- 'order' => 'DESC',
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('arguments', array(
- 'tid' => array(
- 'default_action' => 'ignore',
- 'style_plugin' => 'default_summary',
- 'style_options' => array(),
- 'wildcard' => 'all',
- 'wildcard_substitution' => 'All',
- 'title' => '',
- 'breadcrumb' => '',
- 'default_argument_type' => 'fixed',
- 'default_argument' => '',
- 'validate_type' => 'none',
- 'validate_fail' => 'not found',
- 'break_phrase' => 0,
- 'add_table' => 0,
- 'require_value' => 0,
- 'reduce_duplicates' => 0,
- 'set_breadcrumb' => 0,
- 'id' => 'tid',
- 'table' => 'term_node',
- 'field' => 'tid',
- 'validate_user_argument_type' => 'uid',
- 'validate_user_roles' => array(
- '2' => 0,
- '15' => 0,
- ),
- 'relationship' => 'none',
- 'default_options_div_prefix' => '',
- 'default_argument_user' => 0,
- 'default_argument_fixed' => '',
- 'default_argument_php' => '',
- 'validate_argument_node_type' => array(
- 'blog' => 0,
- 'advpoll_binary' => 0,
- 'advpoll_ranking' => 0,
- 'forum' => 0,
- 'book' => 0,
- 'comment' => 0,
- 'discussion' => 0,
- 'group' => 0,
- 'page' => 0,
- 'profile' => 0,
- 'story' => 0,
- 'uprofile' => 0,
- ),
- 'validate_argument_node_access' => 0,
- 'validate_argument_nid_type' => 'nid',
- 'validate_argument_vocabulary' => array(
- '1' => 0,
- '2' => 0,
- ),
- 'validate_argument_type' => 'tid',
- 'validate_argument_transform' => 0,
- 'validate_user_restrict_roles' => 0,
- 'validate_argument_node_flag_name' => '*relationship*',
- 'validate_argument_node_flag_test' => 'flaggable',
- 'validate_argument_node_flag_id_type' => 'id',
- 'validate_argument_user_flag_name' => '*relationship*',
- 'validate_argument_user_flag_test' => 'flaggable',
- 'validate_argument_user_flag_id_type' => 'id',
- 'validate_argument_is_member' => 0,
- 'validate_argument_php' => '',
- ),
-));
-$handler->override_option('filters', array(
- 'status' => array(
- 'operator' => '=',
- 'value' => '1',
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'status',
- 'table' => 'node',
- 'field' => 'status',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('access', array(
- 'type' => 'none',
-));
-$handler->override_option('cache', array(
- 'type' => 'none',
-));
-$handler->override_option('title', 'Forum Name');
-$handler->override_option('empty', 'No posts found.');
-$handler->override_option('empty_format', '1');
-$handler->override_option('items_per_page', 20);
-$handler->override_option('use_pager', '1');
-$handler->override_option('style_plugin', 'forum_topic_list');
-$handler->override_option('style_options', array(
- 'grouping' => '',
- 'override' => 0,
- 'sticky' => 1,
- 'order' => 'desc',
- 'columns' => array(
- 'nid' => 'nid',
- 'teaser' => 'teaser',
- 'topic_icon' => 'topic_icon',
- 'title' => 'title',
- 'timestamp' => 'title',
- 'topic_pager' => 'title',
- 'name_1' => 'title',
- 'created' => 'title',
- 'comment_count' => 'comment_count',
- 'new_comments' => 'comment_count',
- 'totalcount' => 'totalcount',
- 'last_comment_name' => 'last_comment_timestamp',
- 'last_comment_timestamp' => 'last_comment_timestamp',
- 'sticky' => 'sticky',
- 'comment' => 'comment',
- ),
- 'info' => array(
- 'nid' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'teaser' => array(
- 'separator' => '',
- ),
- 'topic_icon' => array(
- 'separator' => '',
- ),
- 'title' => array(
- 'sortable' => 1,
- 'separator' => ' ',
- ),
- 'timestamp' => array(
- 'separator' => '',
- ),
- 'topic_pager' => array(
- 'separator' => '',
- ),
- 'name_1' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'created' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'comment_count' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'new_comments' => array(
- 'separator' => '',
- ),
- 'totalcount' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'last_comment_name' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'last_comment_timestamp' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'sticky' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'comment' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- ),
- 'default' => 'last_comment_timestamp',
- 'tid' => 'argument.tid',
-));
-
-// Get rid of the views counter if statistics not enabled.
-if (!module_exists('statistics')) {
- unset($handler->display->display_options['fields']['totalcount']);
- unset($handler->display->display_options['style_options']['columns']['totalcount']);
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_unanswered_topics.view b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_unanswered_topics.view
deleted file mode 100644
index 0576580..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_unanswered_topics.view
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-// $Id$
-/**
- * DO NOT RE-EXPORT THIS VIEW WITHOUT CHECKING THE FORUM VID.
- *
- * When you export, please note the calls to variable_get('forum_nav_vocabulary', '')
- * to ensure that the forum vocabulary gets the right vid.
- */
-$view = new view;
-$view->name = 'advanced_forum_unanswered_topics';
-$view->description = 'Shows unanswered topics in a given forum';
-$view->tag = 'Advanced Forum';
-$view->view_php = '';
-$view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-$handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('fields', array(
- 'teaser' => array(
- 'label' => 'Teaser',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '200',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'exclude' => 1,
- 'id' => 'teaser',
- 'table' => 'node_revisions',
- 'field' => 'teaser',
- 'relationship' => 'none',
- ),
- 'title' => array(
- 'label' => 'Topic',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<span class="forum-topic-title">[title]</span> ',
- 'make_link' => 1,
- 'path' => 'node/[nid]',
- 'link_class' => '',
- 'alt' => '[teaser]',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 1,
- 'exclude' => 0,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- ),
- 'name_1' => array(
- 'label' => 'Name',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<br /> by [name_1] ',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_user' => 1,
- 'overwrite_anonymous' => 0,
- 'anonymous_text' => '',
- 'exclude' => 0,
- 'id' => 'name_1',
- 'table' => 'users',
- 'field' => 'name',
- 'relationship' => 'none',
- ),
- 'created' => array(
- 'label' => 'Post date',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'on [created]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'date_format' => 'large',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
- 'totalcount' => array(
- 'label' => 'Views',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '0',
- 'hide_empty' => 0,
- 'empty_zero' => 1,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => '',
- 'suffix' => '',
- 'exclude' => 0,
- 'id' => 'totalcount',
- 'table' => 'node_counter',
- 'field' => 'totalcount',
- 'relationship' => 'none',
- ),
- 'sticky' => array(
- 'label' => 'Sticky',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'type' => 'yes-no',
- 'not' => 0,
- 'exclude' => 1,
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
- 'name' => array(
- 'label' => 'Forum',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'link_to_taxonomy' => 1,
- 'exclude' => 0,
- 'id' => 'name',
- 'table' => 'term_data',
- 'field' => 'name',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('sorts', array(
- 'sticky' => array(
- 'order' => 'DESC',
- 'id' => 'sticky',
- 'table' => 'node',
- 'field' => 'sticky',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('filters', array(
- 'status' => array(
- 'operator' => '=',
- 'value' => '1',
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'status',
- 'table' => 'node',
- 'field' => 'status',
- 'relationship' => 'none',
- ),
- 'vid' => array(
- 'operator' => 'in',
- 'value' => array(
- variable_get('forum_nav_vocabulary', '') => variable_get('forum_nav_vocabulary', ''),
-
- ),
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'vid',
- 'table' => 'term_data',
- 'field' => 'vid',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
- 'term_node_tid_depth' => array(
- 'operator' => 'or',
- 'value' => array(),
- 'group' => '0',
- 'exposed' => TRUE,
- 'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'term_node_tid_depth_op',
- 'identifier' => 'forum',
- 'label' => 'Show unanswered topics in:',
- 'optional' => 1,
- 'single' => 0,
- 'remember' => 1,
- 'reduce' => 0,
- ),
- 'type' => 'select',
- 'limit' => TRUE,
- 'vid' => variable_get('forum_nav_vocabulary', ''),
- 'depth' => '2',
- 'id' => 'term_node_tid_depth',
- 'table' => 'node',
- 'field' => 'term_node_tid_depth',
- 'hierarchy' => 1,
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- 'reduce_duplicates' => 0,
- ),
- 'comment_count' => array(
- 'operator' => '=',
- 'value' => array(
- 'value' => '0',
- 'min' => '',
- 'max' => '',
- ),
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'comment_count',
- 'table' => 'node_comment_statistics',
- 'field' => 'comment_count',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('access', array(
- 'type' => 'none',
-));
-$handler->override_option('cache', array(
- 'type' => 'none',
-));
-$handler->override_option('title', 'Unanswered forum topics');
-$handler->override_option('empty', 'No unanswered topics found.');
-$handler->override_option('empty_format', '1');
-$handler->override_option('items_per_page', 20);
-$handler->override_option('use_pager', '1');
-$handler->override_option('distinct', 1);
-$handler->override_option('style_plugin', 'forum_topic_list');
-$handler->override_option('style_options', array(
- 'grouping' => '',
- 'override' => 0,
- 'sticky' => 1,
- 'order' => 'desc',
- 'columns' => array(
- 'topic_icon' => 'topic_icon',
- 'title' => 'title',
- 'timestamp' => 'title',
- 'topic_pager' => 'title',
- 'name_1' => 'title',
- 'created' => 'title',
- 'comment_count' => 'comment_count',
- 'new_comments' => 'comment_count',
- 'totalcount' => 'totalcount',
- 'last_comment_name' => 'last_updated',
- 'last_updated' => 'last_updated',
- 'sticky' => 'sticky',
- 'teaser' => 'teaser',
- 'comment' => 'comment',
- ),
- 'info' => array(
- 'topic_icon' => array(
- 'separator' => '',
- ),
- 'title' => array(
- 'sortable' => 1,
- 'separator' => ' ',
- ),
- 'name' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'timestamp' => array(
- 'separator' => '',
- ),
- 'topic_pager' => array(
- 'separator' => '',
- ),
- 'name_1' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'created' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'comment_count' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'new_comments' => array(
- 'separator' => '',
- ),
- 'totalcount' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'last_comment_name' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'last_updated' => array(
- 'sortable' => 1,
- 'separator' => '<br />',
- ),
- 'sticky' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'teaser' => array(
- 'separator' => '',
- ),
- 'comment' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- ),
- 'default' => 'created',
- 'tid' => 'filter.term_node_tid_depth',
-));
-
-// Get rid of the views counter if statistics not enabled.
-if (!module_exists('statistics')) {
- unset($handler->display->display_options['fields']['totalcount']);
- unset($handler->display->display_options['style_options']['columns']['totalcount']);
-}
-
-$handler = $view->new_display('page', 'Page', 'page_1');
-$handler->override_option('path', 'forum/unanswered');
-
-if (variable_get('advanced_forum_views_as_tabs', TRUE)) {
- $handler->override_option('menu', array(
- 'type' => 'tab',
- 'title' => 'Unanswered topics',
- 'description' => '',
- 'weight' => '4',
- 'name' => 'navigation',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
- ));
-}
-else {
- $handler->override_option('menu', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- ));
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_user_posts.view b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_user_posts.view
deleted file mode 100644
index 70e71ce..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/includes/views/advanced_forum_user_posts.view
+++ /dev/null
@@ -1,774 +0,0 @@
-<?php
-// $Id$
-/**
- * DO NOT RE-EXPORT THIS VIEW WITHOUT CHECKING THE FORUM VID.
- *
- * When you export, please note the calls to variable_get('forum_nav_vocabulary', '')
- * to ensure that the forum vocabulary gets the right vid.
- */
-
-if (module_exists('nodecomment')) {
-
-// BEGIN VIEW EXPORT ********************************************************/
-$view = new view;
-$view->name = 'advanced_forum_user_posts';
-$view->description = 'Shows the posts posted by the given user in the given forum.';
-$view->tag = 'Advanced Forum';
-$view->view_php = '';
-$view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-$handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('relationships', array(
- 'nid_or_self' => array(
- 'label' => 'parent node',
- 'id' => 'nid_or_self',
- 'table' => 'node_comments',
- 'field' => 'nid_or_self',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('fields', array(
- 'type' => array(
- 'label' => 'Type',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'exclude' => 0,
- 'id' => 'type',
- 'table' => 'node',
- 'field' => 'type',
- 'relationship' => 'none',
- ),
- 'nid' => array(
- 'label' => 'Nid',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'exclude' => 1,
- 'id' => 'nid',
- 'table' => 'node',
- 'field' => 'nid',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'none',
- ),
- 'teaser' => array(
- 'label' => 'Teaser',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '100',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'exclude' => 1,
- 'id' => 'teaser',
- 'table' => 'node_revisions',
- 'field' => 'teaser',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
- 'title' => array(
- 'label' => 'Post title',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 1,
- 'path' => 'node/[nid]',
- 'link_class' => '',
- 'alt' => '[teaser]',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'exclude' => 0,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
- 'created' => array(
- 'label' => 'Posted on',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
- 'title_1' => array(
- 'label' => 'Topic title',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 1,
- 'exclude' => 0,
- 'id' => 'title_1',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'nid_or_self',
- ),
- 'last_updated' => array(
- 'label' => 'Topic title / last updated',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => '<br />[last_updated]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'small',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'last_updated',
- 'table' => 'node_comment_statistics',
- 'field' => 'last_updated',
- 'relationship' => 'nid_or_self',
- ),
- 'new_comments' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 1,
- 'empty_zero' => 0,
- 'set_precision' => FALSE,
- 'precision' => 0,
- 'decimal' => '.',
- 'separator' => ',',
- 'prefix' => ' (',
- 'suffix' => ' new)',
- 'link_to_comment' => 1,
- 'exclude' => 0,
- 'id' => 'new_comments',
- 'table' => 'node',
- 'field' => 'new_comments',
- 'relationship' => 'nid_or_self',
- ),
- 'name' => array(
- 'label' => 'Forum',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_taxonomy' => 1,
- 'exclude' => 0,
- 'id' => 'name',
- 'table' => 'term_data',
- 'field' => 'name',
- 'relationship' => 'nid_or_self',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
-));
-$handler->override_option('sorts', array(
- 'created_1' => array(
- 'order' => 'DESC',
- 'granularity' => 'second',
- 'id' => 'created_1',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- ),
-));
-$handler->override_option('arguments', array(
- 'uid' => array(
- 'default_action' => 'default',
- 'style_plugin' => 'default_summary',
- 'style_options' => array(),
- 'wildcard' => 'all',
- 'wildcard_substitution' => 'All',
- 'title' => '',
- 'breadcrumb' => '',
- 'default_argument_type' => 'php',
- 'default_argument' => '',
- 'validate_type' => 'php',
- 'validate_fail' => 'not found',
- 'break_phrase' => 0,
- 'not' => 0,
- 'id' => 'uid',
- 'table' => 'users',
- 'field' => 'uid',
- 'validate_user_argument_type' => 'uid',
- 'validate_user_roles' => array(
- '2' => 2,
- ),
- 'relationship' => 'none',
- 'default_options_div_prefix' => '',
- 'default_argument_user' => 0,
- 'default_argument_fixed' => '',
- 'default_argument_php' => 'return $GLOBALS[\'user\']->uid;',
- 'validate_argument_node_type' => array(
- 'poll' => 0,
- 'forum' => 0,
- 'comment' => 0,
- 'forum_reply' => 0,
- ),
- 'validate_argument_node_access' => 0,
- 'validate_argument_nid_type' => 'nid',
- 'validate_argument_vocabulary' => array(
- '1' => 0,
- ),
- 'validate_argument_type' => 'tid',
- 'validate_argument_transform' => 0,
- 'validate_user_restrict_roles' => 1,
- 'validate_argument_php' => '$account = user_load($argument);
- if (!$account || !$account->uid) {
- return FALSE;
- }
-
- global $user;
- if ($user->uid == $account->uid) {
- $handler->validated_title = t(\'My forum posts\');
- }
- else {
- $handler->validated_title = t(\'Forum posts by @user\', array(\'@user\' => $account->name));
- }
-
- return TRUE;',
- ),
-));
-$handler->override_option('filters', array(
- 'status' => array(
- 'operator' => '=',
- 'value' => '1',
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'status',
- 'table' => 'node',
- 'field' => 'status',
- 'relationship' => 'none',
- ),
- 'vid' => array(
- 'operator' => 'in',
- 'value' => array(
- variable_get('forum_nav_vocabulary', '') => variable_get('forum_nav_vocabulary', ''),
- ),
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'vid',
- 'table' => 'term_data',
- 'field' => 'vid',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'nid_or_self',
- ),
- 'term_node_tid_depth' => array(
- 'operator' => 'or',
- 'value' => array(),
- 'group' => '0',
- 'exposed' => TRUE,
- 'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'term_node_tid_depth_op',
- 'identifier' => 'forum',
- 'label' => 'Forum',
- 'optional' => 1,
- 'single' => 1,
- 'remember' => 0,
- 'reduce' => 0,
- ),
- 'type' => 'select',
- 'limit' => TRUE,
- 'vid' => variable_get('forum_nav_vocabulary', ''),
- 'depth' => '2',
- 'id' => 'term_node_tid_depth',
- 'table' => 'node',
- 'field' => 'term_node_tid_depth',
- 'hierarchy' => 1,
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'nid_or_self',
- 'reduce_duplicates' => 0,
- ),
- 'status_1' => array(
- 'operator' => '=',
- 'value' => '1',
- 'group' => '0',
- 'exposed' => FALSE,
- 'expose' => array(
- 'operator' => FALSE,
- 'label' => '',
- ),
- 'id' => 'status_1',
- 'table' => 'node',
- 'field' => 'status',
- 'override' => array(
- 'button' => 'Override',
- ),
- 'relationship' => 'nid_or_self',
- ),
- 'type' => array(
- 'operator' => 'in',
- 'value' => array(
- 'forum' => 'forum',
- 'comment' => 'comment',
- 'forum_reply' => 'forum_reply',
- ),
- 'group' => '0',
- 'exposed' => TRUE,
- 'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'type_op',
- 'identifier' => 'type',
- 'label' => 'Show only',
- 'optional' => 1,
- 'single' => 1,
- 'remember' => 1,
- 'reduce' => 1,
- ),
- 'id' => 'type',
- 'table' => 'node',
- 'field' => 'type',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Override',
- ),
- ),
-));
-
-$handler->override_option('access', array(
- 'type' => 'role',
- 'role' => array(
- '2' => 2,
- ),
-));
-$handler->override_option('cache', array(
- 'type' => 'none',
-));
-$handler->override_option('title', '%1');
-$handler->override_option('empty', 'You have no posts.');
-$handler->override_option('empty_format', '1');
-$handler->override_option('items_per_page', 20);
-$handler->override_option('use_pager', '1');
-$handler->override_option('use_more', 0);
-$handler->override_option('use_more_text', 'More topics');
-$handler->override_option('distinct', 1);
-$handler->override_option('style_plugin', 'forum_topic_list');
-$handler->override_option('style_options', array(
- 'grouping' => '',
- 'override' => 1,
- 'sticky' => 1,
- 'order' => 'desc',
- 'columns' => array(
- 'type' => 'type',
- 'nid' => 'nid',
- 'teaser' => 'teaser',
- 'title' => 'title',
- 'created' => 'created',
- 'title_1' => 'last_updated',
- 'last_updated' => 'last_updated',
- 'new_comments' => 'last_updated',
- 'name' => 'name',
- ),
- 'info' => array(
- 'type' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'nid' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'teaser' => array(
- 'separator' => '',
- ),
- 'title' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'created' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'title_1' => array(
- 'sortable' => 0,
- 'separator' => '',
- ),
- 'last_updated' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- 'new_comments' => array(
- 'separator' => '',
- ),
- 'name' => array(
- 'sortable' => 1,
- 'separator' => '',
- ),
- ),
- 'default' => 'created',
- 'tid' => '',
-));
-$handler = $view->new_display('page', 'Page', 'page_1');
-$handler->override_option('path', 'forum/user');
-
-if (variable_get('advanced_forum_views_as_tabs', TRUE)) {
- $handler->override_option('menu', array(
- 'type' => 'tab',
- 'title' => 'My Posts',
- 'description' => '',
- 'weight' => '3',
- 'name' => 'navigation',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
- ));
-}
-else {
- $handler->override_option('menu', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- ));
-}
-
-$handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1');
-$handler->override_option('fields', array(
- 'title' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 1,
- 'exclude' => 0,
- 'id' => 'title',
- 'table' => 'node',
- 'field' => 'title',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Use default',
- ),
- ),
- 'name' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_taxonomy' => 1,
- 'exclude' => 0,
- 'id' => 'name',
- 'table' => 'term_data',
- 'field' => 'name',
- 'relationship' => 'nid_or_self',
- 'override' => array(
- 'button' => 'Use default',
- ),
- ),
- 'created' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 1,
- 'text' => 'on [created]',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 0,
- 'max_length' => '',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 0,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'date_format' => 'large',
- 'custom_date_format' => '',
- 'exclude' => 0,
- 'id' => 'created',
- 'table' => 'node',
- 'field' => 'created',
- 'relationship' => 'none',
- 'override' => array(
- 'button' => 'Use default',
- ),
- ),
- 'teaser' => array(
- 'label' => '',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '',
- 'make_link' => 0,
- 'path' => '',
- 'link_class' => '',
- 'alt' => '',
- 'prefix' => '',
- 'suffix' => '',
- 'target' => '',
- 'help' => '',
- 'trim' => 1,
- 'max_length' => '100',
- 'word_boundary' => 1,
- 'ellipsis' => 1,
- 'strip_tags' => 1,
- 'html' => 0,
- ),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'exclude' => 0,
- 'id' => 'teaser',
- 'table' => 'node_revisions',
- 'field' => 'teaser',
- 'relationship' => 'nid_or_self',
- 'override' => array(
- 'button' => 'Use default',
- ),
- ),
-));
-$handler->override_option('title', 'My posts');
-$handler->override_option('items_per_page', 1);
-$handler->override_option('use_pager', '0');
-$handler->override_option('style_plugin', 'default');
-$handler->override_option('style_options', array());
-$handler->override_option('pane_title', 'My forum posts');
-$handler->override_option('pane_description', 'A block to display a user\'s most recent forum post');
-$handler->override_option('pane_category', array(
- 'name' => 'Forum',
- 'weight' => '0',
-));
-$handler->override_option('allow', array(
- 'use_pager' => 0,
- 'items_per_page' => 0,
- 'offset' => 0,
- 'link_to_view' => 0,
- 'more_link' => 'more_link',
- 'path_override' => 'path_override',
- 'title_override' => 'title_override',
- 'exposed_form' => FALSE,
-));
-$handler->override_option('argument_input', array());
-$handler->override_option('link_to_view', 0);
-$handler->override_option('inherit_panels_path', 0);
-
-// Get rid of the views counter if statistics not enabled.
-if (!module_exists('statistics')) {
- unset($handler->display->display_options['fields']['totalcount']);
- unset($handler->display->display_options['style_options']['columns']['totalcount']);
-}
-
-// END VIEW EXPORT ********************************************************/
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/js/advanced_forum.js b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/js/advanced_forum.js
deleted file mode 100644
index 818577a..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/js/advanced_forum.js
+++ /dev/null
@@ -1,120 +0,0 @@
-(function ($) {
- Drupal.advanced_forum = Drupal.advanced_forum || {};
-
- Drupal.behaviors.advanced_forum = function(context) {
- // Retrieve collapsed status from stored cookie.
- // cookie format is: "/page1=1,2,3/page2=1,4,5/page3=5,6,1"
- var cookieString = 'Drupal.advanced_forum.collapsed=';
- if (document.cookie.length > 0) {
- offset = document.cookie.indexOf(cookieString);
- if (offset != -1) {
- offset += cookieString.length;
- var end = document.cookie.indexOf(';', offset);
- if (end == -1) {
- end = document.cookie.length;
- }
- var cookie = unescape(document.cookie.substring(offset, end));
- }
- }
- var pages = cookie ? cookie.split('/') : new Array();
-
- // Create associative array where key=page path and value=comma-separated list of collapsed forum ids
- Drupal.advanced_forum.collapsed_page = new Array();
- if (pages) {
- for (x in pages) {
- tmp = pages[x].split('=');
- Drupal.advanced_forum.collapsed_page[tmp[0]] = tmp[1].split(',');
- }
- }
-
- // Get data for current page
- Drupal.advanced_forum.collapsed_current = Drupal.advanced_forum.collapsed_page[encodeURIComponent(window.location.pathname)];
- if (!Drupal.advanced_forum.collapsed_current) Drupal.advanced_forum.collapsed_current = new Array();
- var handleSpan = $('span.advanced-forum-toggle', context);
-
- // Set initial collapsed state
- handleSpan.not('.advanced-forum-collapsible-processed').addClass('advanced-forum-collapsible-processed').each(Drupal.advanced_forum.init);
-
- // Set click handler
- handleSpan.addClass('clickable').click(function() {
-
- // Get forum id
- var id = $(this).attr('id').split('-')[2];
-
- if ($(this).hasClass('advanced-forum-collapsed')) {
- Drupal.advanced_forum.expand(id);
- Drupal.advanced_forum.collapsed_current.splice($.inArray(id, Drupal.advanced_forum.collapsed_current),1);
- }
- else {
- Drupal.advanced_forum.collapse(id);
- Drupal.advanced_forum.collapsed_current.push(id);
- }
-
- // Store updated status
- Drupal.advanced_forum.collapsed_page[encodeURIComponent(window.location.pathname)] = Drupal.advanced_forum.collapsed_current;
-
- // Build cookie string
- cookie = '';
- for (x in Drupal.advanced_forum.collapsed_page) {
- cookie += '/' + x + '=' + Drupal.advanced_forum.collapsed_page[x];
- }
- // Save new cookie
- var exp_date = new Date(2020, 0, 1);
- document.cookie = cookieString + encodeURIComponent(cookie.substr(1)) + '; expires=' + exp_date.toUTCString() + '; path=/';
- });
- };
-
- /**
- * Initialize and set collapsible status
- */
- Drupal.advanced_forum.init = function() {
- // get forum id
- var id = $(this).attr('id').split('-')[2];
-
- // Check if item is collapsed
- if ($.inArray(id, Drupal.advanced_forum.collapsed_current) > -1) {
- $(this).addClass('advanced-forum-collapsed');
- $('#forum-table-' + id).hide();
- } else {
- $(this).removeClass('advanced-forum-collapsed');
- $('#forum-table-' + id).show();
- }
- };
-
- /**
- * Collapse forum.
- */
- Drupal.advanced_forum.collapse = function(id) {
- $('#forum-collapsible-' + id).addClass('advanced-forum-collapsed');
- switch (Drupal.settings.advanced_forum.effect) {
- case 'slide':
- $('#forum-table-' + id).slideUp();
- break;
- case 'fade':
- $('#forum-table-' + id).fadeOut(150);
- break;
- case 'toggle':
- $('#forum-table-' + id).hide();
- break;
- }
- };
-
- /**
- * Expand forum.
- */
- Drupal.advanced_forum.expand = function(id) {
- $('#forum-collapsible-' + id).removeClass('advanced-forum-collapsed');
- switch (Drupal.settings.advanced_forum.effect) {
- case 'slide':
- $('#forum-table-' + id).slideDown();
- break;
- case 'fade':
- $('#forum-table-' + id).fadeIn(150);
- break;
- case 'toggle':
- $('#forum-table-' + id).show();
- break;
- }
- };
-
-})(jQuery);
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/access/forum_container.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/access/forum_container.inc
deleted file mode 100644
index c18c99a..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/access/forum_container.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * @file
- * Plugin to provide access control based upon term vocabulary
- */
-
-/**
- * Implementation of specially named hook_ctools_access().
- */
-function advanced_forum_forum_container_ctools_access() {
- return array(
- 'title' => t("Forum: container"),
- 'description' => t('Control access by whether or not the forum is a container.'),
- 'callback' => 'advanced_forum_forum_container_ctools_access_check',
- 'default' => array('container' => 0),
- 'settings form' => 'advanced_forum_forum_container_ctools_access_settings',
- 'settings form submit' => 'advanced_forum_forum_container_ctools_access_settings_submit',
- 'summary' => 'advanced_forum_forum_container_ctools_acesss_summary',
- 'required context' => new ctools_context_required(t('Forum'), array('forum')),
- );
-}
-
-/**
- * Settings form for the 'by term_vocabulary' access plugin
- */
-function advanced_forum_forum_container_ctools_access_settings(&$form, &$form_state, $conf) {
- $form['settings']['container'] = array(
- '#type' => 'select',
- '#title' => t('Container'),
- '#options' => array(
- 0 => t('Pass if forum is a container'),
- 1 => t('Pass if forum is not a container')
- ),
- '#default_value' => $conf['container'],
- );
-}
-
-/**
- * Compress the term_vocabularys allowed to the minimum.
- */
-function advanced_forum_forum_container_ctools_access_settings_submit(&$form, &$form_state) {
- $form_state['values']['settings']['container'] = $form_state['values']['settings']['container'];
-}
-
-/**
- * Check for access.
- */
-function advanced_forum_forum_container_ctools_access_check($conf, $context) {
- // As far as I know there should always be a context at this point, but this
- // is safe.
- if (empty($context) || empty($context->data)) {
- return FALSE;
- }
-
- // xor returns false if the two bools are the same, and true if they are not.
- return $context->data->container xor !empty($conf['container']);
-}
-
-/**
- * Provide a summary description based upon the checked term_vocabularys.
- */
-function advanced_forum_forum_container_ctools_acesss_summary($conf, $context) {
- $comparison = empty($conf['container']) ? "is" : 'is not';
-
- return t('@id1 @comp a forum container', array('@comp' => $comparison, '@id1' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/access/forum_id.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/access/forum_id.inc
deleted file mode 100644
index e57f693..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/access/forum_id.inc
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * @file
- * Plugin to provide access control based upon term vocabulary
- */
-
-/**
- * Implementation of specially named hook_ctools_access().
- */
-function advanced_forum_forum_id_ctools_access() {
- return array(
- 'title' => t("Forum: forum"),
- 'description' => t('Control access by which forum is in use.'),
- 'callback' => 'advanced_forum_forum_id_ctools_access_check',
- 'default' => array('tids' => array()),
- 'settings form' => 'advanced_forum_forum_id_ctools_access_settings',
- 'settings form submit' => 'advanced_forum_forum_id_ctools_access_settings_submit',
- 'summary' => 'advanced_forum_forum_id_ctools_acesss_summary',
- 'required context' => new ctools_context_required(t('Forum'), array('forum')),
- );
-}
-
-/**
- * Settings form for the 'by term_vocabulary' access plugin
- */
-function advanced_forum_forum_id_ctools_access_settings(&$form, &$form_state, $conf) {
- $options = array();
- $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
- $options[0] = $vocabulary->name;
-
- $tree = taxonomy_get_tree($vocabulary->vid);
- if ($tree) {
- foreach ($tree as $term) {
- $choice = new stdClass();
- $choice->option = array($term->tid => str_repeat('-', $term->depth + 1) . $term->name);
- $options[] = $choice;
- }
- }
-
- $form['settings']['tids'] = array(
- '#type' => 'select',
- '#title' => t('Forums'),
- '#default_value' => $conf['tids'],
- '#options' => $options,
- '#multiple' => TRUE,
- '#size' => $multiple ? min(9, count($options)) : 0,
- );
-}
-
-/**
- * Compress the term_vocabularys allowed to the minimum.
- */
-function advanced_forum_forum_id_ctools_access_settings_submit(&$form, &$form_state) {
- $form_state['values']['settings']['tids'] = $form_state['values']['settings']['tids'];
-}
-
-/**
- * Check for access.
- */
-function advanced_forum_forum_id_ctools_access_check($conf, $context) {
- // As far as I know there should always be a context at this point, but this
- // is safe.
- if (empty($context) || empty($context->data) || !isset($context->data->tid)) {
- return FALSE;
- }
-
- if (!empty($conf['tids']) && !isset($conf['tids'][$context->data->tid])) {
- return FALSE;
- }
-
- return TRUE;
-}
-
-/**
- * Provide a summary description based upon the checked term_vocabularys.
- */
-function advanced_forum_forum_id_ctools_acesss_summary($conf, $context) {
- $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
- if (empty($conf['tids'])) {
- return t('@identifier is any forum', array('@identifier' => $context->identifier));
- }
-
- $names = array();
- if (in_array(0, $conf['tids'])) {
- $names[] = check_plain($vocabulary->name);
- }
-
- $result = db_query("SELECT name FROM {term_data} WHERE tid IN (" . db_placeholders($conf['tids']) . ")", $conf['tids']);
-
- while ($term = db_fetch_object($result)) {
- $names[] = check_plain($term->name);
- }
-
- if (empty($names)) {
- return t('@identifier is any forum', array('@identifier' => $context->identifier));
- }
-
- return format_plural(count($names), '@identifier is "@tids"', '@identifier is one of "@tids"', array('@tids' => implode(', ', $names), '@identifier' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/arguments/forum_id.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/arguments/forum_id.inc
deleted file mode 100644
index 02c14ff..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/arguments/forum_id.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * @file
- *
- * Plugin to provide an argument handler for a user id
- */
-
-/**
- * Implementation of specially named hook_ctools_arguments().
- */
-function advanced_forum_forum_id_ctools_arguments() {
- return array(
- 'title' => t("Forum ID"),
- // keyword to use for %substitution
- 'keyword' => 'forum',
- 'description' => t('Creates a forum context from a forum ID argument.'),
- 'context' => 'advanced_forum_argument_forum_id_context',
- 'placeholder form' => array(
- '#type' => 'textfield',
- '#description' => t('Enter the forum ID of a form for this argument'),
- ),
- 'settings form' => 'advanced_forum_forum_id_settings_form',
- 'breadcrumb' => 'advanced_forum_forum_id_breadcrumb',
- 'default' => array('breadcrumb' => TRUE),
- );
-}
-
-/**
- * Discover if this argument gives us the user we crave.
- */
-function advanced_forum_argument_forum_id_context($arg = NULL, $conf = NULL, $empty = FALSE) {
- // If unset it wants a generic, unfilled context.
- if ($empty) {
- return ctools_context_create_empty('forum');
- }
-
- if (!is_numeric($arg)) {
- return NULL;
- }
-
- if ($arg != 0) {
- $term = taxonomy_get_term($arg);
- }
-
- if ($arg == 0 || empty($term) || $term->vid != variable_get('forum_nav_vocabulary', '')) {
- $term = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
- $term->tid = 0;
- }
-
- if (!$term) {
- return NULL;
- }
-
- return ctools_context_create('forum', $term);
-}
-
-/**
- * Settings form for the argument
- */
-function advanced_forum_forum_id_settings_form(&$form, &$form_state, $conf) {
- $form['settings']['breadcrumb'] = array(
- '#title' => t('Inject hierarchy into breadcrumb trail'),
- '#type' => 'checkbox',
- '#default_value' => !empty($conf['breadcrumb']),
- '#description' => t('If checked, forum parents will appear in the breadcrumb trail.'),
- );
-}
-
-/**
- * Inject the breadcrumb trail if necessary.
- */
-function advanced_forum_forum_id_breadcrumb($conf, $context) {
- if (empty($conf['breadcrumb'])) {
- return;
- }
-
-
- $vocabulary = $context->vocabulary;
-
- // Breadcrumb navigation:
- $breadcrumb = array();
- if ($context->data->tid) {
- $breadcrumb[] = l($vocabulary->name, 'forum');
- }
-
- if (isset($context->parents)) {
- $parents = array_reverse($context->parents);
- foreach ($parents as $p) {
- if ($p->tid != $context->data->tid) {
- $breadcrumb[] = l($p->name, 'forum/' . $p->tid);
- }
- }
- }
-
- $breadcrumb = array_merge(drupal_get_breadcrumb(), $breadcrumb);
- drupal_set_breadcrumb($breadcrumb);
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_legend.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_legend.inc
deleted file mode 100644
index 5f54636..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_legend.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_legend_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum legend'),
- 'icon' => 'icon_forum.png',
- 'description' => t('The forum legend widget.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_legend_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-secondary-links';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- $block->content = theme('advanced_forum_forum_legend');
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_legend_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_legend_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_legend_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" legend', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_list.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_list.inc
deleted file mode 100644
index 0318966..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_list.inc
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_list_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum list'),
- 'icon' => 'icon_forum.png',
- 'description' => t('A list of forums for the forum.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_list_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-list';
- $block->delta = $tid;
-
- _advanced_forum_add_files();
-
- $forums = advanced_forum_get_forums($tid);
-
- if ($forums) {
- // No parents on the main forum page.
- $parents = isset($context->parents) ? $context->parents : array();
-
- $block->content = theme('forum_list', $forums, $parents, $tid);
-
- if (user_access('administer forums')) {
- $block->admin_links['administer_forums'] = array(
- 'title' => t('Administer forums'),
- 'alt' => t("Add, delete or modify forums"),
- 'href' => "admin/content/forum",
- );
-
- if ($tid) {
- $block->admin_links['edit_forum'] = array(
- 'title' => t('Edit forum'),
- 'alt' => t("Modify this forum"),
- 'href' => "admin/content/forum/edit/" . ($context->data->container ? 'container/' : 'forum/') . $tid,
- 'query' => drupal_get_destination(),
- );
- }
- }
- }
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_list_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_list_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_list_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" forum list', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_mark_read.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_mark_read.inc
deleted file mode 100644
index 09ef8df..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_mark_read.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_mark_read_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum mark read'),
- 'icon' => 'icon_forum.png',
- 'description' => t('Link to mark all forums / individual forum read.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_mark_read_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-mark-read';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- $mar_link = advanced_forum_get_mark_read_link($tid);
- $block->content = (empty($mar_link)) ? '' : '<div class="forum-mark-read">' . advanced_forum_get_mark_read_link($tid) . '</div>';
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_mark_read_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_mark_read_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_mark_read_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" mark read', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_most_active_poster.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_most_active_poster.inc
deleted file mode 100644
index 75492e2..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_most_active_poster.inc
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_most_active_poster_ctools_content_types() {
- if (module_exists('nodecomment')) {
- return array(
- 'single' => TRUE,
- 'title' => t('Most active forum poster'),
- 'icon' => 'icon_forum.png',
- 'description' => t('A block with information about the most active forum poster.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array('period' => 'ever', 'exclude' => 0, 'uidone' => TRUE),
- );
- }
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_most_active_poster_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $period = empty($conf['period']) ? 'ever' : $conf['period'];
-
- switch ($period) {
- case 'day':
- $period_arg = 60 * 60 * 24;
- break;
- case 'week':
- $period_arg = 60 * 60 * 24 * 7;
- break;
- case 'month':
- $period_arg = 60 * 60 * 24 * 30;
- break;
- case 'quarter':
- $period_arg = 60 * 60 * 24 * 91;
- break;
- case 'year':
- $period_arg = 60 * 60 * 24 * 365;
- break;
- }
-
- $block = new stdClass();
- $block->module = 'forum-active-poster';
- $block->delta = $tid;
- _advanced_forum_add_files();
-
- $args = array();
- $query = "SELECT n.uid, COUNT(DISTINCT n.nid) AS posts FROM {node} n ";
- $query .= "LEFT JOIN {node_comments} nc ON n.nid = nc.cid ";
- $query .= "INNER JOIN {node} n2 ON COALESCE(nc.nid, n.nid) = n2.nid ";
- $query .= "INNER JOIN {forum} f ON f.vid = n2.vid ";
-
- // Add a join to exclude our roles if needed.
- if (!empty($conf['exclude'])) {
- $query .= "LEFT JOIN {users_roles} ur ON n.uid = ur.uid AND ur.rid = %d ";
- $args[] = $conf['exclude'];
- }
-
- $query .= "WHERE n2.status <> 0 AND n.uid <> 0 ";
-
- if ($tid) {
- $forum = taxonomy_get_term($tid);
- $block->title = t('Most active poster in @forum', array('@forum' => $forum->name));
- $query .= "AND f.tid = %d ";
- $args = array($tid);
- }
- else {
- $block->title = t('Most active poster');
- }
-
- // Add a WHERE to make sure our excluded role is not present.
- if (!empty($conf['exclude'])) {
- $query .= "AND ur.rid IS NULL ";
- }
-
- // Exclude the superuser if configged to do so.
- if (!empty($conf['uidone'])) {
- $query .= "AND n.uid <> 1 ";
- }
-
- if (!empty($period_arg)) {
- $query .= "AND n2.created >= %d ";
- $args[] = time() - $period_arg;
- }
-
- $query .= "GROUP BY n.uid ";
- $query .= "ORDER BY COUNT(DISTINCT n.nid) DESC LIMIT 1";
-
- $info = db_fetch_object(db_query($query, $args));
-
- // This can happen if there are no posts.
- if (!$info) {
- return;
- }
-
- $account = user_load($info->uid);
-
- // Now that we have a user and that user's # of posts, get # of topics for
- // this forum.
- $args = array($info->uid);
- $query = "SELECT COUNT(n.nid) AS posts FROM {node} n ";
- $query .= "INNER JOIN {forum} f ON f.vid = n.vid ";
- $query .= "WHERE n.status <> 0 AND n.uid = %d";
- if ($tid) {
- $query .= " AND f.tid = %d";
- $args[] = $tid;
- }
-
- if (!empty($period_arg)) {
- $query .= " AND n.created >= %d";
- $args[] = time() - $period_arg;
- }
- $topics = db_result(db_query($query, $args));
-
- // And get their last post.
- $args = array($info->uid);
- $query = "SELECT n.nid FROM {node} n ";
- $query .= "LEFT JOIN {node_comments} nc ON n.nid = nc.cid ";
- $query .= "INNER JOIN {node} n2 ON COALESCE(nc.nid, n.nid) = n2.nid ";
- $query .= "INNER JOIN {forum} f ON f.vid = n2.vid ";
- $query .= "WHERE n.status <> 0 AND n.uid = %d ";
- if ($tid) {
- $query .= " AND f.tid = %d ";
- $args[] = $tid;
- }
-
- $query .= "ORDER BY n.created DESC LIMIT 1";
-
- $last_post = node_load(db_result(db_query($query, $args)));
- $block->content = theme('advanced_forum_active_poster', $tid, $account, $info->posts, $topics, $last_post);
- $block->more = array(
- 'title' => t('More posts'),
- 'href' => 'forum/user/' . $info->uid,
- );
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_most_active_poster_content_type_edit_form(&$form, &$form_state) {
- // make sure conf contains newer defaults. CTools should do this for us:
- $conf = $form_state['conf'];
- $conf += $form_state['plugin']['defaults'];
-
- $form['period'] = array(
- '#type' => 'select',
- '#title' => t('Period'),
- '#options' => array(
- 'day' => t('In the last day'),
- 'week' => t('In the last week'),
- 'month' => t('In the last month'),
- 'quarter' => t('In the last quarter'),
- 'year' => t('In the last year'),
- 'ever' => t('Ever'),
- ),
- '#description' => t('Select what period you want to search for the most active poster.'),
- '#default_value' => $conf['period'],
- );
-
- $roles = array('0' => t('Allow all roles')) + user_roles(TRUE);
- unset($roles[DRUPAL_AUTHENTICATED_RID]);
-
- $form['exclude'] = array(
- '#type' => 'select',
- '#title' => t('Exclude role'),
- '#options' => $roles,
- '#description' => t('Choose a role that will be excluded from being an active poster.'),
- '#default_value' => $conf['exclude'],
- );
-
- $form['uidone'] = array(
- '#type' => 'checkbox',
- '#title' => t('Exclude UID 1'),
- '#description' => t('If checked the super user will not be a possible most active poster.'),
- '#default_value' => $conf['uidone'],
- );
-}
-
-function advanced_forum_forum_most_active_poster_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_most_active_poster_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" most active poster', array('@s' => $context->identifier));
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_node_create_list.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_node_create_list.inc
deleted file mode 100644
index e7d9819..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_node_create_list.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_node_create_list_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum node create list'),
- 'icon' => 'icon_forum.png',
- 'description' => t('List of links to create new forum content nodes.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_node_create_list_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-node-create-list';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- $block->content = '<div class="forum-node-create-links">' . theme('advanced_forum_node_type_create_list', $tid) . '</div>';
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_node_create_list_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_node_create_list_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_node_create_list_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" forum node create list', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_search.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_search.inc
deleted file mode 100644
index 98e59e1..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_search.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_search_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum search'),
- 'icon' => 'icon_forum.png',
- 'description' => t('The forum search widget.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_search_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-secondary-links';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- $block->content = '<div id="search-all-forums">' . theme('advanced_forum_search_forum') . '</div>';
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_search_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_search_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_search_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" search', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_statistics.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_statistics.inc
deleted file mode 100644
index 5041c53..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_statistics.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_statistics_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum statistics'),
- 'icon' => 'icon_forum.png',
- 'description' => t('The forum statistics widget.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_statistics_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-secondary-links';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- $block->content = theme('advanced_forum_statistics');
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_statistics_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_statistics_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_statistics_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" statistics', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_tools.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_tools.inc
deleted file mode 100644
index 0447253..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_tools.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_tools_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum tools'),
- 'icon' => 'icon_forum.png',
- 'description' => t('Jump list with various forum destinations.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_tools_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-tools';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- $block->content = advanced_forum_forum_tools($tid);
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_tools_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_tools_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_tools_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" forum tools', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_legend.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_legend.inc
deleted file mode 100644
index e085731..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_legend.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_topic_legend_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum topic_legend'),
- 'icon' => 'icon_forum.png',
- 'description' => t('The forum topic_legend widget.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_topic_legend_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-secondary-links';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- $block->content = theme('advanced_forum_topic_legend');
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_topic_legend_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_topic_legend_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_topic_legend_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" topic legend', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_list.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_list.inc
deleted file mode 100644
index 3b193ec..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_list.inc
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_topic_list_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum topic list'),
- 'icon' => 'icon_forum.png',
- 'description' => t('The list of all topics for a forum.'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array('show_sort' => TRUE),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_topic_list_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (!empty($context->data->container)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- $block = new stdClass();
- $block->module = 'forum-secondary-links';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- // TODO: We could make these settings, but they're ignored if it isusing
- // the view, so we have to be careful about that.
- $forum_per_page = variable_get('forum_per_page', 25);
- $sortby = variable_get('forum_order', 1);
-
- $block->content = advanced_forum_get_topics($tid, $sortby, $forum_per_page, !empty($conf['show_sort']));
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_topic_list_content_type_edit_form(&$form, &$form_state) {
- $form['show_sort'] = array(
- '#type' => 'checkbox',
- '#title' => t('Show sort form'),
- '#description' => t('If checked the sort form will appear at the top of the table. Uncheck this if you wish it to appear in a separate pane.'),
- '#default_value' => !empty($conf['show_sort']),
- );
-}
-
-function advanced_forum_forum_topic_list_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_topic_list_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" topic list', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_list_sort.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_list_sort.inc
deleted file mode 100644
index 09eee31..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/content_types/forum_topic_list_sort.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Callback function to supply a list of content types.
- */
-function advanced_forum_forum_topic_list_sort_ctools_content_types() {
- return array(
- 'single' => TRUE,
- 'title' => t('Forum topic list sort widget'),
- 'icon' => 'icon_forum.png',
- 'description' => t('A small select widget to change the sort order of the forum topic list'),
- 'required context' => new ctools_context_required(t('Forum'), 'forum'),
- 'category' => t('Forum'),
- 'defaults' => array(),
- );
-}
-
-/**
- * Render the content.
- */
-function advanced_forum_forum_topic_list_sort_content_type_render($subtype, $conf, $panel_args, $context) {
- if (!empty($context) && empty($context->data)) {
- return;
- }
-
- if (empty($context)) {
- $tid = 0;
- }
- else {
- $tid = $context->data->tid;
- }
-
- if (empty($tid)) {
- return;
- }
-
- $block = new stdClass();
- $block->module = 'forum-secondary-links';
- $block->delta = $tid;
-
- $block->title = ''; // by default this has no title.
- _advanced_forum_add_files();
-
- $block->content = advanced_forum_forum_topic_list_sort();
-
- return $block;
-}
-
-/**
- * Returns an edit form for the custom type.
- */
-function advanced_forum_forum_topic_list_sort_content_type_edit_form(&$form, &$form_state) {
-}
-
-function advanced_forum_forum_topic_list_sort_content_type_edit_form_submit(&$form, &$form_state) {
- // Copy everything from our defaults.
- foreach (array_keys($form_state['plugin']['defaults']) as $key) {
- $form_state['conf'][$key] = $form_state['values'][$key];
- }
-}
-
-function advanced_forum_forum_topic_list_sort_content_type_admin_title($subtype, $conf, $context) {
- return t('"@s" topic list sort widget', array('@s' => $context->identifier));
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/contexts/forum.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/contexts/forum.inc
deleted file mode 100644
index 488cfa6..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/contexts/forum.inc
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-/**
- * @file
- *
- * Plugin to provide a user context
- */
-
-/**
- * Implementation of specially named hook_advanced_forum_forum_contexts().
- */
-function advanced_forum_forum_ctools_contexts() {
- return array(
- 'title' => t("Forum"),
- 'description' => t('A single forum object.'),
- 'context' => 'advanced_forum_forum_context_create_forum',
- 'settings form' => 'advanced_forum_forum_context_settings_form',
- 'settings form validate' => 'advanced_forum_forum_context_settings_form_validate',
- 'keyword' => 'forum',
- 'context name' => 'forum',
- 'convert list' => array(
- 'tid' => t('Forum ID'),
- 'name' => t('Forum name'),
- ),
- 'convert' => 'advanced_forum_forum_context_convert',
- 'defaults' => array('tid' => 0),
- );
-}
-
-/**
- * It's important to remember that $conf is optional here, because contexts
- * are not always created from the UI.
- */
-function advanced_forum_forum_context_create_forum($empty, $data = NULL, $conf = FALSE) {
- $context = new ctools_context(array('forum', 'term'));
- $context->plugin = 'forum';
-
- if ($empty) {
- return $context;
- }
-
- if ($conf) {
- if ($data['tid']) {
- $data = taxonomy_get_term($data['tid']);
- }
- else {
- $data = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
- $data->tid = 0;
- }
- }
-
- if (!empty($data)) {
- $data->container = (!$data->tid || in_array($data->tid, variable_get('forum_containers', array())));
- $context->data = drupal_clone($data);
- $context->title = $data->name;
- $context->argument = $data->tid;
- $context->vid = variable_get('forum_nav_vocabulary', '');
- $context->vocabulary = taxonomy_vocabulary_load($context->vid);
- if ($data->tid) {
- $context->parents = taxonomy_get_parents_all($data->tid);
- }
-
- return $context;
- }
-}
-
-function advanced_forum_forum_context_settings_form($conf) {
- if (empty($conf)) {
- $conf = array('tid' => 0);
- }
-
- $form = array();
-
- $options = array();
- $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
- $options[0] = $vocabulary->name;
-
- $tree = taxonomy_get_tree($vocabulary->vid);
- if ($tree) {
- foreach ($tree as $term) {
- $choice = new stdClass();
- $choice->option = array($term->tid => str_repeat('-', $term->depth + 1) . $term->name);
- $options[] = $choice;
- }
- }
-
- $form['tid'] = array(
- '#type' => 'select',
- '#title' => t('Forum'),
- '#default_value' => $conf['tid'],
- '#options' => $options,
- );
-
- return $form;
-}
-
-/**
- * Convert a context into a string.
- */
-function advanced_forum_forum_context_convert($context, $type) {
- switch ($type) {
- case 'tid':
- return $context->data->tid;
- case 'name':
- return $context->data->name;
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/tasks/forum.inc b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/tasks/forum.inc
deleted file mode 100644
index 90fbe03..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/plugins/tasks/forum.inc
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * Specialized implementation of hook_page_manager_task_tasks(). See api-task.html for
- * more information.
- */
-function advanced_forum_forum_page_manager_tasks() {
- return array(
- // This is a 'page' task and will fall under the page admin UI
- 'task type' => 'page',
- 'title' => t('Forum page'),
- 'admin title' => t('Forum page'),
- 'admin description' => t('When enabled, this overrides the default Drupal behavior for displaying forum listings at <em>forum</em> and <em>forum/%forum</em>. If you add variants, you may use selection criteria such as roles or user access to provide different views of the forums. If no variant is selected, the normal advanced forum view will be selected.'),
- 'admin path' => 'forum/%forum',
-
- 'hook menu' => 'advanced_forum_forum_menu',
- 'hook menu alter' => 'advanced_forum_forum_menu_alter',
-
- // This is task uses 'context' handlers and must implement these to give the
- // handler data it needs.
- 'handler type' => 'context', // handler type -- misnamed
- 'get arguments' => 'advanced_forum_forum_get_arguments',
- 'get context placeholders' => 'advanced_forum_forum_get_contexts',
-
- // Allow this to be enabled or disabled:
- 'disabled' => variable_get('advanced_forum_forum_disabled', TRUE),
- 'enable callback' => 'advanced_forum_forum_enable',
-
- // Allow additional operations
- 'operations' => array(
- 'settings' => array(
- 'title' => t('Settings'),
- 'description' => t('Edit name, path and other basic settings for the page.'),
- 'form' => 'advanced_forum_forum_page_settings',
- ),
- ),
- // Even though we don't have subtasks, this allows us to save our settings.
- 'save subtask callback' => 'advanced_forum_forum_page_save',
-
- );
-}
-
-/**
- * Callback defined by advanced_forum_forum_page_manager_tasks().
- *
- * Alter the user view input so that user view comes to us rather than the
- * normal user view process.
- */
-function advanced_forum_forum_menu_alter(&$items, $task) {
- if (variable_get('advanced_forum_forum_disabled', TRUE)) {
- return;
- }
-
- $items['forum']['page callback'] = 'advanced_forum_forum_page';
- $items['forum']['file path'] = $task['path'];
- $items['forum']['file'] = $task['file'];
-}
-
-/**
- * Entry point for our overridden user view.
- *
- * This function asks its assigned handlers who, if anyone, would like
- * to run with it. If no one does, it passes through to Drupal core's
- * user view, which is user_page_view().
- */
-function advanced_forum_forum_page($tid = 0) {
- // Load my task plugin:
- $task = page_manager_get_task('forum');
-
- // Load the account into a context.
- ctools_include('context');
- ctools_include('context-task-handler');
- $contexts = ctools_context_handler_get_task_contexts($task, '', array($tid));
-
- $output = ctools_context_handler_render($task, '', $contexts, array($tid));
- if ($output === FALSE) {
- // Fall back!
- $output = advanced_forum_page($tid);
- }
-
- return $output;
-}
-
-/**
- * Callback to get arguments provided by this task handler.
- *
- * Since this is the node view and there is no UI on the arguments, we
- * create dummy arguments that contain the needed data.
- */
-function advanced_forum_forum_get_arguments($task, $subtask_id) {
- return array(
- array(
- 'keyword' => 'forum',
- 'identifier' => t('Forum'),
- 'id' => 1,
- 'name' => 'forum_id',
- 'settings' => array('breadcrumb' => variable_get('advanced_forum_forum_page_breadcrumb', TRUE)),
- ),
- );
-}
-
-/**
- * Callback to get context placeholders provided by this handler.
- */
-function advanced_forum_forum_get_contexts($task, $subtask_id) {
- return ctools_context_get_placeholders_from_argument(advanced_forum_forum_get_arguments($task, $subtask_id));
-}
-
-/**
- * Callback to enable/disable the page from the UI.
- */
-function advanced_forum_forum_enable($cache, $status) {
- variable_set('advanced_forum_forum_disabled', $status);
-}
-
-/**
- * Settings page for this item.
- */
-function advanced_forum_forum_page_settings(&$form, &$form_state) {
- if (empty($form_state['page']->update_values)) {
- $settings = array(
- 'advanced_forum_forum_page_breadcrumb' => variable_get('advanced_forum_forum_page_breadcrumb', TRUE),
- );
- }
- else {
- $settings = $form_state['page']->update_values;
- }
-
- $form['advanced_forum_forum_page_breadcrumb'] = array(
- '#title' => t('Inject hierarchy of first term into breadcrumb trail'),
- '#type' => 'checkbox',
- '#default_value' => $settings['advanced_forum_forum_page_breadcrumb'],
- '#description' => t('If checked, taxonomy term parents will appear in the breadcrumb trail.'),
- );
-}
-
-/**
- * Copy form values into the page cache.
- */
-function advanced_forum_forum_page_settings_submit(&$form, &$form_state) {
- $form_state['page']->update_values = $form_state['values'];
-}
-
-/**
- * Save when the page cache is saved.
- */
-function advanced_forum_forum_page_save($subtask, $cache) {
- if (isset($cache->update_values)) {
- variable_set('advanced_forum_forum_page_breadcrumb', $cache->update_values['advanced_forum_forum_page_breadcrumb']);
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/advanced_forum.blue_lagoon.images.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/advanced_forum.blue_lagoon.images.css
deleted file mode 100644
index 862274e..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/advanced_forum.blue_lagoon.images.css
+++ /dev/null
@@ -1,269 +0,0 @@
-/* FORUM LIST ICONS *********************************************************/
-
-.forum-list-icon-wrapper {
- border-top: 1px solid #1659AC;
- background: #2587C4;
- background: -webkit-gradient(linear, left top, left bottom, from(#2587C4), to(#58B3ED));
- background: -moz-linear-gradient(top, #2587C4, #58B3ED);
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
- -moz-box-shadow: rgba(0,0,0,1) 0 1px 0;
- box-shadow: rgba(0,0,0,1) 0 1px 0;
- text-shadow: rgba(0,0,0,.4) 0 1px 0;
- color: #FFFFFF;
- font-family: Helvetica, Arial, Sans-Serif;
- text-decoration: none;
- vertical-align: middle;
- margin: 10px;
- width: 50px;
- height: 50px;
- display: block;
-}
-
-tr.even td.forum-list-icon-default .forum-list-icon-wrapper span,
-tr.odd td.forum-list-icon-default .forum-list-icon-wrapper span,
-.forum-list-icon-legend .forum-list-icon-default {
- background: transparent url(images/forum_list_default.png) no-repeat center center;
-}
-
-tr.even td.forum-list-icon-new-posts .forum-list-icon-wrapper span,
-tr.odd td.forum-list-icon-new-posts .forum-list-icon-wrapper span,
-.forum-list-icon-legend .forum-list-icon-new-posts {
- background: transparent url(images/forum_list_new_posts.png) no-repeat center center;
-}
-
-/* TOPIC LIST ICONS *********************************************************/
-span.topic-icon {
- width: 24px;
- height: 24px;
- text-indent: -9999px;
-}
-
-.topic-icon-default {
- background: transparent url(images/topic_list_default.png) no-repeat center center;
-}
-
-.topic-icon-new {
- background: transparent url(images/topic_list_new.png) no-repeat center center;
-}
-
-.topic-icon-hot {
- background: transparent url(images/topic_list_hot.png) no-repeat center center;
-}
-
-.topic-icon-hot-new {
- background: transparent url(images/topic_list_hot_new.png) no-repeat center center;
-}
-
-.topic-icon-sticky {
- background: transparent url(images/topic_list_sticky.png) no-repeat center center;
-}
-
-.topic-icon-closed {
- background: transparent url(images/topic_list_closed.png) no-repeat center center;
-}
-
-/* TOPIC LIST ICON LEGEND ***************************************************/
-.topic-icon-default {
- background: transparent url(images/topic_list_default.png) no-repeat top left;
-}
-
-.topic-icon-new {
- background: transparent url(images/topic_list_new.png) no-repeat top left;
-}
-
-.topic-icon-hot {
- background: transparent url(images/topic_list_hot.png) no-repeat top left;
-}
-
-.topic-icon-hot-new {
- background: transparent url(images/topic_list_hot_new.png) no-repeat top left;
-}
-
-.topic-icon-sticky {
- background: transparent url(images/topic_list_sticky.png) no-repeat top left;
-}
-
-.topic-icon-closed {
- background: transparent url(images/topic_list_closed.png) no-repeat top left;
-}
-
-/* AUTHOR PANE **************************************************************/
-
-.forum-post-panel-sub .author-online {
- background: transparent url(images/ap_user_online.png) no-repeat;
- padding-left: 20px;
- height: 20px;
- width: 125px;
- display: block;
-}
-
-.forum-post-panel-sub .author-offline {
- background: transparent url(images/ap_user_offline.png) no-repeat;
- padding-left: 20px;
- height: 20px;
- width: 125px;
- display: block;
-}
-
-/* BUTTONIZED LINKS - GENERAL ***********************************************/
-/* Based on http://css-tricks.com/examples/ButtonMaker */
-
-a.af-button-large,
-a.af-button-large:link,
-a.af-button-large:visited,
-a.af-button-small,
-a.af-button-small:link,
-a.af-button-small:visited,
-a.author-pane-link,
-a.author-pane-link:link,
-a.author-pane-link:visited {
- color: #FFFFFF;
- text-decoration: none;
-}
-
-.af-button-large,
-.af-button-small,
-.author-pane-link {
- display: block;
- border-top: 1px solid #1659AC;
- background: #2587C4;
- background: -webkit-gradient(linear, left top, left bottom, from(#2587C4), to(#58B3ED));
- background: -moz-linear-gradient(top, #2587C4, #58B3ED);
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
- -moz-box-shadow: rgba(0,0,0,1) 0 1px 0;
- box-shadow: rgba(0,0,0,1) 0 1px 0;
- text-shadow: rgba(0,0,0,.4) 0 1px 0;
- color: #333333;
- font-family: Helvetica, Arial, Sans-Serif;
- text-decoration: none;
- vertical-align: middle;
-}
-
-a.af-button-large:hover,
-a.af-button-small:hover,
-a.author-pane-link:hover {
- background: #2587C4;
- color: #333333;
- border-top-color: #EFEFEF;
-}
-
-a.af-button-large:active,
-a.af-button-small:active,
-a.author-pane-link:active {
- background: #2587C4;
- color: #333333;
- border-top-color: #EFEFEF;
-}
-
-.af-button-large span {
- font-size: 14px;
- padding: 2px 2px 2px 25px; /* Last number controls width for image */
- line-height: 30px; /* Approximate height of button */
- margin: 0 7px 0 7px; /* Left and right space outside text & image */
-}
-
-.af-button-small span {
- font-size: 12px;
- padding: 2px 2px 2px 20px; /* Last number controls width for image */
- line-height: 25px; /* Approximate height of button */
- margin: 0 7px 0 7px; /* Left and right space outside text & image */
-}
-
-.author-pane-link span {
- font-size: 12px;
- padding: 0 0 0 22px; /* Last number controls width for image */
- line-height: 22px; /* Approximate height of button */
- margin: 0 7px 0 7px; /* Left and right space outside text & image */
-}
-
-/* BUTTONIZED LINKS - INDIVIDUAL BUTTONS ************************************/
-
-.forum-add-forum .af-button-large span {
- background: url(images/add_topic.png) no-repeat;
-}
-
-.forum-add-poll .af-button-large span {
- background: url(images/add_poll.png) no-repeat;
-}
-
-/*** Reply/Locked at the top and bottom of individual topics. ***/
-
-/* Reply link */
-.topic-reply-allowed .af-button-large span {
- background: url(images/topic_reply.png) no-repeat;
-}
-
-/* Locked topic (not a link so an extra span is used instead of the "a". */
-.topic-reply-locked .af-button-large span {
- background: url(images/topic_locked.png) no-repeat;
-}
-
-/* Last post */
-.last-post-link .af-button-large span {
- background: url(images/topic_last_post.png) no-repeat;
-}
-
-/* First unread */
-.topic-new-post-link .af-button-large span {
- background: url(images/topic_first_unread_post.png) no-repeat;
-}
-
-
-/*** Links on the individual posts (nodes and comments). ***/
-
-/* General */
-.forum-post-links .af-button-small span {
-}
-
-/* Reply */
-.comment_add .af-button-small span,
-.comment_reply .af-button-small span {
- background: url(images/post_reply.png) no-repeat;
-}
-
-/* Quote */
-.quote .af-button-small span {
- background: url(images/post_quote.png) no-repeat;
-}
-
-/* Edit */
-.comment_edit .af-button-small span,
-.post_edit .af-button-small span {
- background: url(images/post_edit.png) no-repeat;
-}
-
-/* Delete */
-.comment_delete .af-button-small span,
-.post_delete .af-button-small span {
- background: url(images/post_delete.png) no-repeat;
-}
-
-/* Jump to top */
-.forum-jump-links .af-button-small span {
- background: url(images/topic_top.png) no-repeat;
-}
-
-/*** AUTHOR PANE ***/
-
-.forum-post-panel-sub .author-contact .author-pane-link span {
- background: transparent url(images/ap_email.png) no-repeat;
-}
-
-.forum-post-panel-sub .author-privatemsg .author-pane-link span {
- background: transparent url(images/ap_private_message.png) no-repeat;
-}
-
-.forum-post-panel-sub .author-relationship-add-icon.author-pane-link span {
- background: transparent url(images/ap_contact_add.png) no-repeat;
-}
-
-.forum-post-panel-sub .author-relationship-remove-icon.author-pane-link {
- background: transparent url(images/ap_contact_remove.png) no-repeat;
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/advanced_forum.blue_lagoon.style.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/advanced_forum.blue_lagoon.style.css
deleted file mode 100755
index b9b5146..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/advanced_forum.blue_lagoon.style.css
+++ /dev/null
@@ -1,237 +0,0 @@
-
-/*
-This file contains colors, graphics, and text effects. For structural markup,
-see advanced_forum-structure.css.
-*/
-
-/*** PAGER *******************************************************************/
-
-/* This is the pager on the topics in the list */
-.topic-pager {
- font-style: italic;
-}
-
-/* Other pagers in the forum */
-.forum-pager .pager a,
-#forum-comments .pager a {
- font-weight: bold;
-}
-
-.forum-pager .pager a:link,
-.forum-pager .pager a:visited,
-#forum-comments .pager a:link,
-#forum-comments .pager a:visited {
- text-decoration: none;
- border: 1px solid #91CDF5;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#CBE2F1), to(#EDF5FA));
- background: -moz-linear-gradient(top, #CBE2F1, #EDF5FA);
- font-weight: bold;
-}
-
-.forum-pager .pager-current,
-.forum-pager .pager a:hover,
-#forum-comments .pager-current,
-#forum-comments .pager a:hover {
- color: #0062A0;
-}
-
-.forum-pager .pager a.active,
-#forum-comments .pager a.active {
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#CBE2F1), to(#EDF5FA));
- background: -moz-linear-gradient(top, #CBE2F1, #EDF5FA);
- color: #0062A0;
-}
-
-/*** FORUM & TOPIC LIST ******************************************************/
-
-/* Forum list and topic list tables */
-.forum-table {
- border: 1px solid #2587C4;
-}
-
-/* Table name and description on forum list and table header on topic list */
-.forum-table-wrap .forum-table-superheader,
-.forum-table-topics thead tr {
- border-top: 1px solid #2587C4;
- background: #2587C4;
- background: -webkit-gradient(linear, left top, left bottom, from(#2587C4), to(#58B3ED));
- background: -moz-linear-gradient(top, #2587C4, #58B3ED);
- color: #EDF5FA;;
-}
-
-/* Table name on forum list */
-.forum-table-superheader .forum-table-name,
-.forum-table-superheader .forum-table-name a {
- color: #ffffff;
- font-weight: bold;
-}
-
-/* Table header on forum list */
-.forum-table-wrap thead tr {
- background-color: #F5F5F5;
- border: 1px solid #2587C4;
-}
-
-/* Table header on forum list and topic list */
-.forum-table thead tr a,
-.forum-table thead tr a:visited,
-.forum-table thead tr a:link {
- color: #ffffff;
- font-weight: bold;
-}
-
-/* Reset to avoid bleed-thru from theme */
-.forum-table thead th {
- border-bottom: none;
-}
-
-/* Rows on both tables */
-.forum-table tr.even,
-.forum-table tr.odd {
- border: none; /* reset */
- border-top: 1px solid #FFFFFF;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#CBE2F1), to(#EDF5FA));
- background: -moz-linear-gradient(top, #CBE2F1, #EDF5FA);
-}
-
-/* Active column on both tables - reset to prevent bleed thru from theme */
-.forum-table tr.even td.active,
-.forum-table tr.odd td.active{
- background-color: transparent;
-}
-
-/* Individual cells on both tables */
-.forum-table td {
- border: none;
-}
-
-/* Placeholder when there are no topics in the list */
-.view-advanced-forum-topic-list .view-empty {
- border: 3px solid #2587C4;
-}
-
-/*** Sticky topics ***/
-.forum-table tr.sticky {
- background-color: #E6EDEC;
-}
-
-.forum-table tr.forum-last-sticky {
- border-bottom: 10px solid #91CDF5;
-}
-
-.forum-table .sticky-label {
- font-weight: bold;
-}
-
-/*** FORUM STATISTICS *******************************************************/
-
-#forum-statistics {
- border: 1px solid #91CDF5;
-}
-
-#forum-statistics-header {
- border-top: 1px solid #2587C4;
- background: #2587C4;
- background: -webkit-gradient(linear, left top, left bottom, from(#2587C4), to(#58B3ED));
- background: -moz-linear-gradient(top, #2587C4, #58B3ED);
- color: #ffffff;
- font-weight: bold;
- border-bottom: 1px solid #2587C4;
-}
-
-.forum-statistics-sub-header {
- background-color: #CBE2F1;
- font-weight: bold;
-}
-
-.forum-statistics-sub-body {
- background-color: #F5F5F5;
-}
-
-
-/*** FORUM TOPICS **********************************************************/
-
-.forum-post {
- border: 2px solid #2587C4;
-}
-
-/* Header at the top of each post */
-.forum-post-info {
- border-top: 1px solid #2587C4;
- background: #2587C4;
- background: -webkit-gradient(linear, left top, left bottom, from(#2587C4), to(#58B3ED));
- background: -moz-linear-gradient(top, #2587C4, #58B3ED);
- color: #ffffff;
- font-weight: bold;
- border-bottom: 1px solid #2587C4;
-}
-
-.forum-posted-on {
- font-weight: bold;
-}
-
-.forum-forum-post .new {
- color: #ffffff;
-}
-
-.forum-post-number a {
- color: #ffffff !important;
-}
-
-/* Wrapper around author pane and content */
-.forum-post-wrapper {
- background-color: #EDF5FA;
-}
-
-/* Author information pane */
-.forum-post-panel-sub .author-pane .author-name {
- font-weight: bold;
-}
-
-.forum-post-panel-sub .author-pane .picture img {
- border: 1px solid #2587C4;
- background-color: #FFFFFF;
-}
-
-.forum-post-panel-sub .author-pane .author-pane-label {
- font-weight: bold;
-}
-
-/* Post text area */
-.forum-post-panel-main {
- background-color: #FFFFFF;
- border-left: 1px solid #2587C4;
-}
-
-.forum-post-title {
- font-weight: bold;
- border-bottom: 1px solid #2587C4;
-}
-
-/* Post footer */
-.forum-post-footer {
- background-color: #FFFFFF;
- border-top: 1px solid #2587C4;
-}
-
-/* Box under top post before first reply */
-.forum-top-post-footer {
- border: 2px solid #2587C4;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#CBE2F1), to(#EDF5FA));
- background: -moz-linear-gradient(top, #CBE2F1, #EDF5FA);
-}
-
-/* Topic navigation */
-.forum-topic-navigation {
- border: 2px solid #2587C4;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#CBE2F1), to(#EDF5FA));
- background: -moz-linear-gradient(top, #CBE2F1, #EDF5FA);
-}
-
-
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/blue_lagoon.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/blue_lagoon.info
deleted file mode 100644
index 045ced6..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/blue_lagoon.info
+++ /dev/null
@@ -1,12 +0,0 @@
-
-name = Blue Lagoon
-description = Based on the Blue Lagoon colors of Garland.
-version = 2.x
-base style = naked
-
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/add_poll.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/add_poll.png
deleted file mode 100644
index d0f0bf4..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/add_poll.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/add_topic.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/add_topic.png
deleted file mode 100644
index fbb4ce0..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/add_topic.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_contact_add.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_contact_add.png
deleted file mode 100644
index 0c9ca48..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_contact_add.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_contact_remove.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_contact_remove.png
deleted file mode 100644
index 1304c03..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_contact_remove.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_email.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_email.png
deleted file mode 100644
index 6ff58cb..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_email.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_private_message.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_private_message.png
deleted file mode 100644
index 5dfcf6a..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_private_message.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_user_offline.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_user_offline.png
deleted file mode 100644
index bdb53d4..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_user_offline.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_user_online.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_user_online.png
deleted file mode 100644
index 08b9c9d..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/ap_user_online.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_default.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_default.png
deleted file mode 100644
index f81445e..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_default.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_locked.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_locked.png
deleted file mode 100644
index 3568b13..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_locked.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_new_posts.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_new_posts.png
deleted file mode 100644
index 58fbaa8..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/forum_list_new_posts.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/pager_bg.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/pager_bg.png
deleted file mode 100644
index 7ca1413..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/pager_bg.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_delete.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_delete.png
deleted file mode 100644
index 3f9406e..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_delete.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_edit.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_edit.png
deleted file mode 100644
index bf35d79..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_edit.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_quote.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_quote.png
deleted file mode 100644
index a3c39f8..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_quote.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_reply.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_reply.png
deleted file mode 100644
index ba2c9a6..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/post_reply.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_first_unread_post.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_first_unread_post.png
deleted file mode 100644
index aa7cbb9..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_first_unread_post.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_last_post.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_last_post.png
deleted file mode 100644
index aa7cbb9..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_last_post.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_closed.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_closed.png
deleted file mode 100644
index 26c4c1b..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_closed.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_default.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_default.png
deleted file mode 100644
index d7cf853..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_default.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_hot.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_hot.png
deleted file mode 100644
index 6f61d0c..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_hot.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_hot_new.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_hot_new.png
deleted file mode 100644
index e31deae..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_hot_new.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_new.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_new.png
deleted file mode 100644
index e7f93ea..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_new.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_sticky.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_sticky.png
deleted file mode 100644
index 9f9f0e6..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_list_sticky.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_locked.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_locked.png
deleted file mode 100644
index 1a74108..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_locked.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_reply.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_reply.png
deleted file mode 100644
index fbb4ce0..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_reply.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_top.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_top.png
deleted file mode 100644
index b3d9cef..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon/images/topic_top.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/advanced_forum.blue_lagoon_stacked.style.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/advanced_forum.blue_lagoon_stacked.style.css
deleted file mode 100644
index 2101472..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/advanced_forum.blue_lagoon_stacked.style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/* Since this style inherits from Blue Lagoon, only a few adjustments are
- needed to account for having the Author Pane on top.
-*/
-
-/* Reset styles not needed with AP on top */
-.forum-post-wrapper {
- background-color: transparent;
-}
-
-.forum-post-panel-main,
-.forum-post-links {
- background-color: transparent;
- border-left: none;
-}
-
-/* Add in our AP styling */
-.forum-post-panel-sub {
- background-color: #EDF5FA;
- border-bottom: 2px solid #91CDF5;
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/blue_lagoon_stacked.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/blue_lagoon_stacked.info
deleted file mode 100644
index eea35ae..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/blue_lagoon_stacked.info
+++ /dev/null
@@ -1,13 +0,0 @@
-
-name = Blue Lagoon Stacked
-description = Same as Blue Lagoon except the Author Pane is on top.
-version = 2.x
-base style = blue_lagoon
-extra style = naked_stacked
-
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/advanced_forum.cloudless_day.images.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/advanced_forum.cloudless_day.images.css
deleted file mode 100644
index 7b150f5..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/advanced_forum.cloudless_day.images.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/* FORUM LIST ICONS *********************************************************/
-
-.forum-list-icon-wrapper {
- border-top: 1px solid #FFFFFF;
- background: #B5CDDF;
- background: -webkit-gradient(linear, left top, left bottom, from(#B5CDDF), to(#C8DBEA));
- background: -moz-linear-gradient(top, #B5CDDF, #C8DBEA);
- color: #3C78A7;
-}
-
-tr.even td.forum-list-icon-default .forum-list-icon-wrapper span,
-tr.odd td.forum-list-icon-default .forum-list-icon-wrapper span,
-.forum-list-icon-legend .forum-list-icon-default {
- background: transparent url(images/forum_list_default.png) no-repeat center center;
-}
-
-tr.even td.forum-list-icon-new-posts .forum-list-icon-wrapper span,
-tr.odd td.forum-list-icon-new-posts .forum-list-icon-wrapper span,
-.forum-list-icon-legend .forum-list-icon-new-posts {
- background: transparent url(images/forum_list_new_posts.png) no-repeat center center;
-}
-
-/* BUTTONIZED LINKS - GENERAL ***********************************************/
-/* Based on http://css-tricks.com/examples/ButtonMaker */
-
-a.af-button-large,
-a.af-button-large:link,
-a.af-button-large:visited,
-a.af-button-small,
-a.af-button-small:link,
-a.af-button-small:visited,
-a.author-pane-link,
-a.author-pane-link:link,
-a.author-pane-link:visited {
- color: #3C78A7;
-}
-
-.af-button-large,
-.af-button-small,
-.author-pane-link {
- border-top: 1px solid #FFFFFF;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#EDF5FA), to(#C8DBEA));
- background: -moz-linear-gradient(top, #EDF5FA, #C8DBEA);
- color: #3C78A7;
-}
-
-a.af-button-large:hover,
-a.af-button-small:hover,
-a.author-pane-link:hover {
- background: #C8DBEA;
- color: #3C78A7;
- border-top-color: #EFEFEF;
-}
-
-a.af-button-large:active,
-a.af-button-small:active,
-a.author-pane-link:active {
- background: #C8DBEA;
- color: #3C78A7;
- border-top-color: #EFEFEF;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/advanced_forum.cloudless_day.style.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/advanced_forum.cloudless_day.style.css
deleted file mode 100644
index 2cdbea9..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/advanced_forum.cloudless_day.style.css
+++ /dev/null
@@ -1,223 +0,0 @@
-
-/*
-This file contains colors, graphics, and text effects.
-
-Colors used:
- #3C78A7 fonts
- #C8DBEA main border, header background
- #EDF5FA background #1
- #E7F2F9 background #2
-*/
-
-/*** PAGER *******************************************************************/
-
-.forum-pager .pager a:link,
-.forum-pager .pager a:visited,
-#forum-comments .pager a:link,
-#forum-comments .pager a:visited {
- border: 1px solid #C8DBEA;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#CBE2F1), to(#EDF5FA));
- background: -moz-linear-gradient(top, #CBE2F1, #EDF5FA);
- color: #3C78A7;
-}
-
-.forum-pager .pager-current,
-.forum-pager .pager a:hover,
-#forum-comments .pager-current,
-#forum-comments .pager a:hover {
- background: #3C78A7;
- color: #FFFFFF !important;
-}
-
-.forum-pager .pager a.active,
-#forum-comments .pager a.active {
- color: #333333;
-}
-
-
-/*** FORUM & TOPIC LIST ******************************************************/
-
-/* General */
-.forum-table {
- border: 1px solid #C8DBEA !important;
- color: #494949;
- border-collapse: separate;
- margin: 0 0 10px;
- padding: 0;
- width: 100%;
- background-color: white;
-}
-
-/* Main header on forum list */
-.forum-table-wrap .forum-table-superheader {
- /* Background instead of background-color to reset from Silver Bells */
- background: #C8DBEA;
- border: 1px solid #C8DBEA;
-}
-
-/* Table header on forum list and topic list*/
-.forum-table thead tr {
- border-top: 1px solid #FFFFFF;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#EDF5FA), to(#C8DBEA));
- background: -moz-linear-gradient(top, #EDF5FA, #C8DBEA);
- color: #3C78A7;
- line-height: 1.5em;
- padding: 2px 5px;
-}
-
-.forum-table thead tr a,
-.forum-table thead tr a:visited,
-.forum-table thead tr a:link {
- color: #3C78A7;
-}
-
-/* Rows, both tables */
-.forum-table tr.odd {
- background: #EDF5FA;
-}
-
-.forum-table tr.even {
- background: #E7F2F9;
-}
-
-/* Active column on both tables - reset to prevent bleed thru from theme */
-.forum-table tr.even td.active,
-.forum-table tr.odd td.active{
- background-color: transparent;
-}
-
-/* Individual cells on both tables */
-.forum-table td {
- /* Structure here because this is unique to this style */
- line-height: 1.5em;
- padding: 4px;
- border: none;
-}
-
-/* Placeholder when there are no topics in the list */
-.view-advanced-forum-topic-list .view-empty {
- border: 3px solid #C8DBEA;
-}
-
-/*** Sticky topics ***/
-.forum-table tr.forum-last-sticky {
- border-bottom: 10px solid #C8DBEA;
-}
-
-.forum-table .sticky-label {
- font-weight: bold;
-}
-
-/*** FORUM STATISTICS *********************************************************/
-#forum-statistics {
- border: 1px solid #C8DBEA;
-}
-
-#forum-statistics-header {
- border-top: 1px solid #FFFFFF;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#EDF5FA), to(#C8DBEA));
- background: -moz-linear-gradient(top, #EDF5FA, #C8DBEA);
- color: #3C78A7;
-}
-
-.forum-statistics-sub-header {
- background-color: #E7F2F9;
- color: #3C78A7;
- border-top: 2px solid white;
- border-bottom: 2px solid white;
-}
-
-.forum-statistics-sub-body {
- background-color: #EDF5FA;
- color: #494949;
-}
-
-/*** FORUM TOPICS **********************************************************/
-
-.forum-post {
- border: 1px solid #C8DBEA !important;
-}
-
-/* Header at the top of each post */
-.forum-post-info,
-.forum-post-wrapper,
-.forum-post-footer {
- border: 2px solid white;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#EDF5FA), to(#C8DBEA));
- background: -moz-linear-gradient(top, #EDF5FA, #C8DBEA);
-}
-
-.forum-post-info {
- background-color: #C8DBEA;
- color: #3C78A7;
- margin-bottom: 0;
- border-bottom: none;
-}
-
-.forum-post-number a {
- color: #3C78A7 !important;
-}
-
-/* Wrapper around AP and content */
-.forum-post-wrapper {
- background-color: #E7F2F9;
- border-bottom: 2px solid white;
-}
-
-/* Author information pane */
-.forum-post-panel-sub {
- color: #3C78A7;
-}
-
-.forum-post-panel-sub .author-pane .picture img {
- border: 1px solid #C8DBEA;
- padding: 5px;
- background-color: #FFFFFF;
-}
-
-/* Post text area */
-.forum-post-panel-main {
- border: none;
- background-color: white;
-}
-
-.forum-post-title {
- border-bottom: none;
- border-left: 2px solid white;
- background-color: #EDF5FA;
- line-height: 225%;
- padding-bottom: 2px;
- color: #3C78A7;
-}
-
-/* Post footer */
-.forum-post-footer {
- background-color: #EDF5FA;
- color: #3C78A7;
-}
-
-.forum-jump-links {
- border-right: none;
-}
-
-/* Box under top post before first reply */
-.forum-top-post-footer {
- border: 1px solid #C8DBEA;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#EDF5FA), to(#C8DBEA));
- background: -moz-linear-gradient(top, #EDF5FA, #C8DBEA);
- color: #3C78A7;
-}
-
-/* Topic navigation */
-.forum-topic-navigation {
- border: 1px solid #C8DBEA;
- background: #EDF5FA;
- background: -webkit-gradient(linear, left top, left bottom, from(#EDF5FA), to(#C8DBEA));
- background: -moz-linear-gradient(top, #EDF5FA, #C8DBEA);
- color: #3C78A7;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/cloudless_day.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/cloudless_day.info
deleted file mode 100644
index e14a437..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/cloudless_day.info
+++ /dev/null
@@ -1,12 +0,0 @@
-
-name = Cloudless Day
-description = A style with light blues reminiscent of the sky.
-version = 2.x
-base style = silver_bells
-
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/images/forum_list_default.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/images/forum_list_default.png
deleted file mode 100644
index a4d6938..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/images/forum_list_default.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/images/forum_list_new_posts.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/images/forum_list_new_posts.png
deleted file mode 100644
index dfde0a8..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day/images/forum_list_new_posts.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/advanced_forum.cloudless_day_stacked.style.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/advanced_forum.cloudless_day_stacked.style.css
deleted file mode 100644
index 1c277f7..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/advanced_forum.cloudless_day_stacked.style.css
+++ /dev/null
@@ -1,6 +0,0 @@
-
-.post-title {
- border-top: 2px solid white;
- border-left: none;
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/cloudless_day_stacked.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/cloudless_day_stacked.info
deleted file mode 100644
index fe09629..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/cloudless_day_stacked.info
+++ /dev/null
@@ -1,13 +0,0 @@
-
-name = Cloudless Day Stacked
-description = A style with light blues reminiscent of the sky.
-version = 2.x
-base style = cloudless_day
-extra style = naked_stacked
-
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.active-poster.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.active-poster.tpl.php
deleted file mode 100644
index 10efa4f..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.active-poster.tpl.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Theme implementation to display information about the most active poster for a forum.
- *
- * See active-poster-pane.tpl.php in active-poster Pane module for a full list of variables.
- */
-?>
-
-<div class="active-poster">
- <div class="active-poster-name">
- <?php print $account_name; ?>
- </div>
-
- <?php /* Avatar (has div in variable) */ ?>
- <?php if (!empty($picture)): ?>
- <?php print $picture; ?>
- <?php endif; ?>
-
- <?php /* Posts */ ?>
- <div class="active-poster-posts">
- <span class="active-poster-label"><?php print t('Posts'); ?>:</span> <?php print $posts; ?>
- </div>
-
- <?php /* Posts */ ?>
- <div class="active-poster-topics">
- <span class="active-poster-label"><?php print t('Topics'); ?>:</span> <?php print $topics; ?>
- </div>
-
- <div class="last-post">
- <div class="active-poster-label"><?php print t('Last post'); ?></div>
- <div class="active-poster-title">
- <?php print $last_post_title; ?>
- </div>
- <div class="active-poster-date">
- <span class="active-poster-label"><?php print t('On'); ?>:</span> <?php print $last_post_date; ?>
- </div>
-
- </div>
-</div>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.author-pane.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.author-pane.tpl.php
deleted file mode 100644
index eb6fb4d..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.author-pane.tpl.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * @file
- * Theme implementation to display information about the post/profile author.
- *
- * See author-pane.tpl.php in Author Pane module for a full list of variables.
- */
-?>
-
-<?php
- // This bit of debugging info will show the full path to and name of this
- // template file to make it easier to figure out which template is
- // controlling which author pane.
- if (!empty($show_template_location)) {
- print __FILE__;
- }
-?>
-
-<div class="author-pane">
- <div class="author-pane-inner">
- <?php /* General section */ ?>
- <div class="author-pane-section author-pane-general">
- <?php /* Account name */ ?>
- <div class="author-pane-line author-name">
- <?php print $account_name; ?>
- </div>
-
- <?php /* User picture / avatar (has div in variable) */ ?>
- <?php if (!empty($picture)): ?>
- <?php print $picture; ?>
- <?php endif; ?>
-
- <?php /* Online status */ ?>
- <?php if (!empty($online_status)): ?>
- <div class="author-pane-line <?php print $online_status_class ?>">
- <?php print $online_status; ?>
- </div>
- <?php endif; ?>
-
- <?php /* User title */ ?>
- <?php if (!empty($user_title)): ?>
- <div class="author-pane-line author-title">
- <?php print $user_title; ?>
- </div>
- <?php endif; ?>
-
- <?php /* User badges */ ?>
- <?php if (!empty($user_badges)): ?>
- <div class="author-pane-line author-badges">
- <?php print $user_badges; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Location */ ?>
- <?php if (!empty($location_user_location)): ?>
- <div class="author-pane-line author-location">
- <?php print $location_user_location; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Joined */ ?>
- <?php if (!empty($joined)): ?>
- <div class="author-pane-line author-joined">
- <span class="author-pane-label"><?php print t('Joined'); ?>:</span> <?php print $joined; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Posts */ ?>
- <?php if (isset($user_stats_posts)): ?>
- <div class="author-pane-line author-posts">
- <span class="author-pane-label"><?php print t('Posts'); ?>:</span> <?php print $user_stats_posts; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Points */ ?>
- <?php if (isset($userpoints_points)): ?>
- <div class="author-pane-line author-points">
- <span class="author-pane-label"><?php print t('!Points', userpoints_translation()); ?></span>: <?php print $userpoints_points; ?>
- </div>
- <?php endif; ?>
- </div>
-
- <?php /* Contact section */ ?>
- <div class="author-pane-section author-pane-contact">
- <?php /* Contact / Email */ ?>
- <?php if (!empty($contact)): ?>
- <div class="author-pane-line author-pane-link-line author-contact">
- <?php print $contact; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Private message */ ?>
- <?php if (!empty($privatemsg)): ?>
- <div class="author-pane-line author-pane-link-line author-privatemsg">
- <?php print $privatemsg; ?>
- </div>
- <?php endif; ?>
-
- <?php /* User relationships */ ?>
- <?php if (!empty($user_relationships_api)): ?>
- <div class="author-pane-line author-pane-link-line author-user-relationship">
- <?php print $user_relationships_api; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Flag friend */ ?>
- <?php if (!empty($flag_friend)): ?>
- <div class="author-pane-line author-pane-link-line author-flag-friend">
- <?php print $flag_friend; ?>
- </div>
- <?php endif; ?>
- </div>
-
- <?php /* Admin section */ ?>
- <div class="author-pane-section author-pane-admin">
- <?php /* IP */ ?>
- <?php if (!empty($user_stats_ip)): ?>
- <div class="author-pane-line author-ip">
- <span class="author-pane-label"><?php print t('IP'); ?>:</span> <?php print $user_stats_ip; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Fasttoggle block */ ?>
- <?php if (!empty($fasttoggle_block_author)): ?>
- <div class="author-fasttoggle-block"><?php print $fasttoggle_block_author; ?></div>
- <?php endif; ?>
-
- <?php /* Troll ban */ ?>
- <?php if (!empty($troll_ban_author)): ?>
- <div class="author-pane-line author-troll-ban"><?php print $troll_ban_author; ?></div>
- <?php endif; ?>
- </div>
- </div>
-</div>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.comment-wrapper.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.comment-wrapper.tpl.php
deleted file mode 100644
index e3948be..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.comment-wrapper.tpl.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @file
- * Default theme implementation to wrap comments.
- *
- * Available variables:
- * - $content: All comments for a given page. Also contains sorting controls
- * and comment forms if the site is configured for it.
- *
- * The following variables are provided for contextual information.
- * - $node: Node object the comments are attached to.
- * The constants below the variables show the possible values and should be
- * used for comparison.
- * - $display_mode
- * - COMMENT_MODE_FLAT_COLLAPSED
- * - COMMENT_MODE_FLAT_EXPANDED
- * - COMMENT_MODE_THREADED_COLLAPSED
- * - COMMENT_MODE_THREADED_EXPANDED
- * - $display_order
- * - COMMENT_ORDER_NEWEST_FIRST
- * - COMMENT_ORDER_OLDEST_FIRST
- * - $comment_controls_state
- * - COMMENT_CONTROLS_ABOVE
- * - COMMENT_CONTROLS_BELOW
- * - COMMENT_CONTROLS_ABOVE_BELOW
- * - COMMENT_CONTROLS_HIDDEN
- *
- * @see template_preprocess_comment_wrapper()
- * @see advanced_forum_preprocess_comment_wrapper()
- */
-?>
-<?php global $language; ?>
-
-<div id="forum-comments" class="<?php print $language->language; ?>">
- <?php print $content; ?>
- <?php print $reply_link; ?>
- <?php print $topic_navigation ?>
-</div>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forum-legend.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forum-legend.tpl.php
deleted file mode 100644
index c6336dc..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forum-legend.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @file
- * Theme implementation to show forum legend.
- *
- */
-?>
-
-<div class="forum-list-icon-legend clear-block">
- <div class="forum-list-legend-item">
- <span class="forum-list-icon-wrapper">
- <span class="forum-list-icon-new-posts">
- </span>
- </span>
-
- <span class="forum-list-text-legend-new-posts">
- <?php print t('New posts'); ?>
- </span>
- </div>
-
- <div class="forum-list-legend-item">
- <span class="forum-list-icon-wrapper">
- <span class="forum-list-icon-default">
- </span>
- </span>
-
- <span class="forum-list-text-legend-default">
- <?php print t('No new posts'); ?>
- </span>
- </div>
-</div>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forum-list.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forum-list.tpl.php
deleted file mode 100644
index 4ca7464..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forum-list.tpl.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * @file
- * Default theme implementation to display a list of forums and containers.
- *
- * Available variables:
- * - $forums: An array of forums and containers to display. It is keyed to the
- * numeric id's of all child forums and containers.
- * - $forum_id: Forum id for the current forum. Parent to all items within
- * the $forums array.
- *
- * Each $forum in $forums contains:
- * - $forum->is_container: Is TRUE if the forum can contain other forums. Is
- * FALSE if the forum can contain only topics.
- * - $forum->depth: How deep the forum is in the current hierarchy.
- * - $forum->zebra: 'even' or 'odd' string used for row class.
- * - $forum->name: The name of the forum.
- * - $forum->link: The URL to link to this forum.
- * - $forum->description: The description of this forum.
- * - $forum->new_topics: True if the forum contains unread posts.
- * - $forum->new_url: A URL to the forum's unread posts.
- * - $forum->new_text: Text for the above URL which tells how many new posts.
- * - $forum->old_topics: A count of posts that have already been read.
- * - $forum->total_posts: The total number of posts in the forum.
- * - $forum->last_reply: Text representing the last time a forum was posted or
- * commented in.
- *
- * @see template_preprocess_forum_list()
- * @see theme_forum_list()
- */
-?>
-
-<?php
-/*
-The $tables variable holds the individual tables to be shown. A table is
-either created from a root level container or added as needed to hold root
-level forums. The following code will loop through each of the tables.
-In each table, it loops through the items in the table. These items may be
-subcontainers or forums. Subcontainers are printed simply with the name
-spanning the entire table. Forums are printed out in more detail. Subforums
-have already been attached to their parent forums in the preprocessing code
-and will display under their parents.
-*/
-?>
-
-<?php foreach ($tables as $table_id => $table): ?>
- <?php $table_info = $table['table_info']; ?>
-
- <div class="forum-table-wrap">
- <div class="forum-table-superheader">
- <div class="forum-table-name">
- <?php if (empty($table_info->link)): ?>
- <?php print$table_info->name; ?>
- <?php else: ?>
- <a href="<?php print $table_info->link; ?>"><?php print$table_info->name; ?></a>
- <?php endif; ?>
- </div>
-
- <?php if ($collapsible): ?>
- <span id="forum-collapsible-<?php print $table_info->tid; ?>" class="advanced-forum-toggle"> </span>
- <?php endif; ?>
-
- <div class="forum-table-description"><?php print $table_info->description; ?></div>
- </div>
-
- <div id="forum-table-<?php print $table_info->tid; ?>">
- <table class="forum-table forum-table-forums">
- <thead class="forum-header">
- <tr>
- <th class="forum-icon"><span class="element-invisible"><?php print t('Icon');?></span></th>
- <th class="forum-name"><?php print t('Forum');?></th>
- <th class="forum-number-topics"><?php print t('Topics');?></th>
- <th class="forum-posts"><?php print t('Posts'); ?></th>
- <th class="forum-last-post"><?php print t('Last post'); ?></th>
- </tr>
- </thead>
-
- <tbody id="forum-table-<?php print $table_info->tid; ?>-content">
-
- <?php foreach ($table['items'] as $item_id => $item): ?>
-
- <?php if ($item->is_container): ?>
- <tr id="subcontainer-<?php print $item_id; ?>" class="forum-row <?php print $item->zebra; ?> class="container-<?php print $item_id; ?>-child">
- <?php else: ?>
- <tr id="forum-<?php print $item_id; ?>" class="forum-row <?php print $item->zebra; ?> class="container-<?php print $item_id; ?>-child">
- <?php endif; ?>
-
- <td class="<?php print $item->icon_classes ?>">
- <span class="forum-list-icon-wrapper"><span><?php print $item->icon_text; ?></span></span>
- </td>
-
- <?php if ($use_taxonomy_image): ?>
- <td class="forum-image-<?php print $item_id; ?>">
- <?php print $item->forum_image; ?>
- </td>
- <?php endif; ?>
-
- <?php $colspan = ($item->is_container) ? 4 : 1 ?>
-
- <td class="forum-details" colspan="<?php print $colspan ?>">
- <div class="forum-name">
- <a href="<?php print $item->link; ?>"><?php print $item->name; ?></a>
- </div>
-
- <?php if (!empty($item->description)): ?>
- <div class="forum-description">
- <?php print $item->description; ?>
- </div>
- <?php endif; ?>
-
- <?php if (!empty($item->subcontainers)): ?>
- <div class="forum-subcontainers">
- <span class="forum-subcontainers-label"><?php print t("Subcontainers"); ?>:</span> <?php print $item->subcontainers; ?>
- </div>
- <?php endif; ?>
-
- <?php if (!empty($item->subforums)): ?>
- <div class="forum-subforums">
- <span class="forum-subforums-label"><?php print t("Subforums"); ?>:</span> <?php print $item->subforums; ?>
- </div>
- <?php endif; ?>
- </td>
-
- <?php if (!$item->is_container): ?>
- <td class="forum-number-topics">
- <div class="forum-number-topics"><?php print $item->total_topics ?>
- <?php if ($item->new_topics): ?>
- <div class="forum-number-new-topics">
- <a href="<?php print $item->new_topics_link; ?>"><?php print $item->new_topics_text; ?></a>
- </div>
- <?php endif; ?>
- </div>
- </td>
-
- <td class="forum-number-posts">
- <?php print $item->total_posts ?>
-
- <?php if ($item->new_posts): ?>
- <br />
- <a href="<?php print $item->new_posts_link; ?>"><?php print $item->new_posts_text; ?></a>
- <?php endif; ?>
- </td>
-
- <td class="forum-last-reply">
- <?php print $item->last_post ?>
- </td>
- <?php endif; ?>
-
- </tr>
-
- <?php endforeach; ?>
- </tbody>
- </table>
- </div>
-</div>
-<?php endforeach; ?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forums.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forums.tpl.php
deleted file mode 100644
index 15b50d2..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.forums.tpl.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * @file
- * Default theme implementation to display a forum which may contain forum
- * containers as well as forum topics.
- *
- * Variables available:
- * - $forum_links: An array of links that allow a user to post new forum topics.
- * It may also contain a string telling a user they must log in in order
- * to post. Empty if there are no topics on the page. (ie: forum overview)
- * This is no longer printed in the template by default because it was moved
- * to the topic list section. The variable is still available for customizations.
- * - $forums: The forums to display (as processed by forum-list.tpl.php)
- * - $topics: The topics to display (as processed by forum-topic-list.tpl.php)
- * - $forums_defined: A flag to indicate that the forums are configured.
- * - $forum_legend: Legend to go with the forum graphics.
- * - $topic_legend: Legend to go with the topic graphics.
- * - $forum_tools: Drop down menu for various forum actions.
- * - $forum_description: Description that goes with forum term. Not printed by default.
- *
- * @see template_preprocess_forums()
- * @see advanced_forum_preprocess_forums()
- */
-?>
-
-<?php if ($forums_defined): ?>
- <div id="forum">
- <?php if ($search): ?>
- <div id="search-all-forums"><?php print $search; ?></div>
- <?php endif; ?>
-
- <?php print $forums; ?>
-
- <?php if (!empty($forum_tools)): ?>
- <div class="forum-tools"><?php print $forum_tools; ?></div>
- <?php endif; ?>
-
- <?php print $topics; ?>
-
- <?php if (!empty($topics)): ?>
- <?php print $topic_legend; ?>
- <?php endif; ?>
-
- <?php if (!empty($forum_legend)): ?>
- <?php print $forum_legend; ?>
- <?php endif; ?>
-
- <?php if (!empty($forum_statistics)): ?>
- <?php print $forum_statistics; ?>
- <?php endif; ?>
- </div>
-<?php endif; ?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.group-topic-list-outer-view.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.group-topic-list-outer-view.tpl.php
deleted file mode 100644
index 5581bd7..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.group-topic-list-outer-view.tpl.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * @file views-view.tpl.php
- * Main view template
- *
- * Variables available:
- * - $css_name: A css-safe version of the view name.
- * - $header: The view header
- * - $footer: The view footer
- * - $rows: The results of the view query, if any
- * - $empty: The empty text to display if the view is empty
- * - $pager: The pager next/prev links to display, if any
- * - $exposed: Exposed widget form/info to display
- * - $feed_icon: Feed icon to display, if any
- * - $more: A link to view more, if any
- * - $admin_links: A rendered list of administrative links
- * - $admin_links_raw: A list of administrative links suitable for theme('links')
- *
- * @ingroup views_templates
- */
-
-?>
-
-<div id="forum" class="view view-<?php print $css_name; ?> view-id-<?php print $name; ?> view-display-id-<?php print $display_id; ?> view-dom-id-<?php print $dom_id; ?>">
- <?php if ($admin_links): ?>
- <div class="views-admin-links views-hide">
- <?php print $admin_links; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($header): ?>
- <div class="view-header">
- <?php print $header; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($exposed): ?>
- <div class="view-filters">
- <?php print $exposed; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($attachment_before): ?>
- <div class="attachment attachment-before">
- <?php print $attachment_before; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($pager): ?>
- <div class="forum-pager" id="forum-pager-top"><?php print $pager; ?></div>
- <?php endif; ?>
-
- <?php if ($search): ?>
- <div id="search-single-forum" class="clear-block"><?php print $search; ?></div>
- <?php endif; ?>
-
- <?php if ($rows): ?>
- <div class="view-content">
- <?php print $rows; ?>
- </div>
- <?php elseif ($empty): ?>
- <div class="view-empty">
- <?php print $empty; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($pager): ?>
- <div class="forum-pager" id="forum-pager-bottom"><?php print $pager; ?></div>
- <?php endif; ?>
-
- <?php print $topic_legend; ?>
-
- <?php if ($attachment_after): ?>
- <div class="attachment attachment-after">
- <?php print $attachment_after; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($more): ?>
- <?php print $more; ?>
- <?php endif; ?>
-
- <?php if ($footer): ?>
- <div class="view-footer">
- <?php print $footer; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($feed_icon): ?>
- <div class="feed-icon">
- <?php print $feed_icon; ?>
- </div>
- <?php endif; ?>
-
-</div> <?php /* class view */ ?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.images.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.images.css
deleted file mode 100644
index 250c5bf..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.images.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* FORUM LIST ICONS *********************************************************/
-td.forum-list-icon {
- vertical-align: middle;
- text-align: center;
- width: 70px;
-}
-
-.forum-list-icon-wrapper span {
- text-indent: -9999px;
- width: 50px;
- height: 50px;
- display: block;
-}
-
-tr.even td.forum-list-icon-default .forum-list-icon-wrapper span,
-tr.odd td.forum-list-icon-default .forum-list-icon-wrapper span {
- background: transparent url(images/forum_list_default.png) no-repeat center center;
-}
-
-tr.even td.forum-list-icon-new-posts .forum-list-icon-wrapper span,
-tr.odd td.forum-list-icon-new-posts .forum-list-icon-wrapper span {
- background: transparent url(images/forum_list_new_posts.png) no-repeat center center;
-}
-
-/* FORUM LIST ICON LEGEND ***************************************************/
-.forum-list-icon-legend .forum-list-icon-default {
- background: transparent url(images/forum_list_default.png) no-repeat center center;
-}
-
-.forum-list-icon-legend .forum-list-icon-new-posts {
- background: transparent url(images/forum_list_new_posts.png) no-repeat center center;
-}
-
-/* TOPIC LIST ICONS *********************************************************/
-span.topic-icon {
- width: 24px;
- height: 24px;
- text-indent: -9999px;
-}
-
-.topic-icon-default {
- background: transparent url(images/topic_list_default.png) no-repeat center center;
-}
-
-.topic-icon-new {
- background: transparent url(images/topic_list_new.png) no-repeat center center;
-}
-
-.topic-icon-hot {
- background: transparent url(images/topic_list_hot.png) no-repeat center center;
-}
-
-.topic-icon-hot-new {
- background: transparent url(images/topic_list_hot_new.png) no-repeat center center;
-}
-
-.topic-icon-sticky {
- background: transparent url(images/topic_list_sticky.png) no-repeat center center;
-}
-
-.topic-icon-closed {
- background: transparent url(images/topic_list_closed.png) no-repeat center center;
-}
-
-/* TOPIC LIST ICON LEGEND ***************************************************/
-.topic-icon-default {
- background: transparent url(images/topic_list_default.png) no-repeat top left;
-}
-
-.topic-icon-new {
- background: transparent url(images/topic_list_new.png) no-repeat top left;
-}
-
-.topic-icon-hot {
- background: transparent url(images/topic_list_hot.png) no-repeat top left;
-}
-
-.topic-icon-hot-new {
- background: transparent url(images/topic_list_hot_new.png) no-repeat top left;
-}
-
-.topic-icon-sticky {
- background: transparent url(images/topic_list_sticky.png) no-repeat top left;
-}
-
-.topic-icon-closed {
- background: transparent url(images/topic_list_closed.png) no-repeat top left;
-}
-
-/* FORUM LIST COLLAPSIBLE CONTAINERS *********************************************************/
-span.advanced-forum-toggle {
- width: 9px;
- height: 100%;
- text-indent: -9999px;
- display: block;
- margin-left: 10px;
- margin-right: 10px;
- float: right;
- cursor: pointer;
- background: transparent url(images/container_collapse.png) no-repeat center center;
-}
-span.advanced-forum-toggle.advanced-forum-collapsed {
- background: transparent url(images/container_expand.png) no-repeat center center;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-preview.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-preview.tpl.php
deleted file mode 100644
index 0bf37bd..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-preview.tpl.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * @file
- *
- * Theme implementation: Template the preview version of a post.
- *
- * All variables available in node.tpl.php and comment.tpl.php for your theme
- * are available here. In addition, Advanced Forum makes available the following
- * variables:
- *
- * - $top_post: TRUE if we are formatting the main post (ie, not a comment)
- * - $reply_link: Text link / button to reply to topic.
- * - $total_posts: Number of posts in topic (not counting first post).
- * - $new_posts: Number of new posts in topic, and link to first new.
- * - $account: User object of the post author.
- * - $name: User name of post author.
- * - $author_pane: Entire contents of the Author Pane template.
- */
-?>
-
-<?php if ($top_post): ?>
- <a id="forum-topic-top"></a>
-<?php else: ?>
- <a id="forum-reply-preview"></a>
-<?php endif; ?>
-
-<?php
-// Gather other possible class list variables into ours. This must be done here
-// rather than in the preprocess because themes run after the AF preprocess.
- $all_classes = "";
- if (!empty($advanced_forum_classes)) {
- $all_classes = $advanced_forum_classes;
- }
-
- if (!empty($classes)) {
- $all_classes .= ' ' . $classes;
- }
-
- if (!empty($node_classes)) {
- $all_classes .= ' ' . $node_classes;
- }
-
- if (!empty($comment_classes)) {
- $all_classes .= ' ' . $comment_classes;
- }
-?>
-
-<div id="<?php print $post_id; ?>" class="<?php print $all_classes; ?>">
- <div class="forum-post-info clear-block">
- <div class="forum-posted-on">
- <?php print $date ?>
- </div>
- </div>
-
- <div class="forum-post-wrapper">
- <div class="forum-post-panel-sub">
- <?php print $author_pane; ?>
- </div>
-
- <div class="forum-post-panel-main clear-block">
- <?php if ($title): ?>
- <div class="post-title">
- <?php print $title ?>
- </div>
- <?php endif; ?>
-
- <div class="forum-post-content">
- <?php print $content ?>
- </div>
-
- <?php if ($signature): ?>
- <div class="author-signature">
- <?php print $signature ?>
- </div>
- <?php endif; ?>
- </div>
- </div>
-
- <div class="forum-post-footer clear-block">
- <?php // Purposely empty on preview just to keep the structure intact. ?>
- </div>
-</div>
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-repeated.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-repeated.tpl.php
deleted file mode 100644
index 27d5006..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-repeated.tpl.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Used for the repeated node on the top of each page of a paginated forum
- * thread. By default, it contains only the "header" information for the thread
- * and the rest is empty.
- *
- * If you leave it empty, subsequent pages will start with the next comment
- * like you typically find in forum software. You could also put a specially
- * formatted teaser to remind people what post they are reading. If you like
- * having the entire node repeated, simply copy the entire contents of
- * advanced_forum-post.tpl.php into this file. All the same variables are available.
- */
-?>
-
-<?php print $topic_header ?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-teaser.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-teaser.tpl.php
deleted file mode 100644
index 0bf37bd..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post-teaser.tpl.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * @file
- *
- * Theme implementation: Template the preview version of a post.
- *
- * All variables available in node.tpl.php and comment.tpl.php for your theme
- * are available here. In addition, Advanced Forum makes available the following
- * variables:
- *
- * - $top_post: TRUE if we are formatting the main post (ie, not a comment)
- * - $reply_link: Text link / button to reply to topic.
- * - $total_posts: Number of posts in topic (not counting first post).
- * - $new_posts: Number of new posts in topic, and link to first new.
- * - $account: User object of the post author.
- * - $name: User name of post author.
- * - $author_pane: Entire contents of the Author Pane template.
- */
-?>
-
-<?php if ($top_post): ?>
- <a id="forum-topic-top"></a>
-<?php else: ?>
- <a id="forum-reply-preview"></a>
-<?php endif; ?>
-
-<?php
-// Gather other possible class list variables into ours. This must be done here
-// rather than in the preprocess because themes run after the AF preprocess.
- $all_classes = "";
- if (!empty($advanced_forum_classes)) {
- $all_classes = $advanced_forum_classes;
- }
-
- if (!empty($classes)) {
- $all_classes .= ' ' . $classes;
- }
-
- if (!empty($node_classes)) {
- $all_classes .= ' ' . $node_classes;
- }
-
- if (!empty($comment_classes)) {
- $all_classes .= ' ' . $comment_classes;
- }
-?>
-
-<div id="<?php print $post_id; ?>" class="<?php print $all_classes; ?>">
- <div class="forum-post-info clear-block">
- <div class="forum-posted-on">
- <?php print $date ?>
- </div>
- </div>
-
- <div class="forum-post-wrapper">
- <div class="forum-post-panel-sub">
- <?php print $author_pane; ?>
- </div>
-
- <div class="forum-post-panel-main clear-block">
- <?php if ($title): ?>
- <div class="post-title">
- <?php print $title ?>
- </div>
- <?php endif; ?>
-
- <div class="forum-post-content">
- <?php print $content ?>
- </div>
-
- <?php if ($signature): ?>
- <div class="author-signature">
- <?php print $signature ?>
- </div>
- <?php endif; ?>
- </div>
- </div>
-
- <div class="forum-post-footer clear-block">
- <?php // Purposely empty on preview just to keep the structure intact. ?>
- </div>
-</div>
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post.tpl.php
deleted file mode 100644
index cbb96bc..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.post.tpl.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * @file
- *
- * Theme implementation: Template for each forum post whether node or comment.
- *
- * All variables available in node.tpl.php and comment.tpl.php for your theme
- * are available here. In addition, Advanced Forum makes available the following
- * variables:
- *
- * - $top_post: TRUE if we are formatting the main post (ie, not a comment)
- * - $reply_link: Text link / button to reply to topic.
- * - $total_posts: Number of posts in topic (not counting first post).
- * - $new_posts: Number of new posts in topic, and link to first new.
- * - $account: User object of the post author.
- * - $name: User name of post author.
- * - $author_pane: Entire contents of the Author Pane template.
-
- */
-?>
-
-<?php if ($top_post): ?>
- <?php print $topic_header ?>
-
-<?php else: ?>
- <?php // If using nodecomment, add the anchor that comment normally provides ?>
- <?php if (!empty($comment_anchor)): ?>
- <?php print $comment_anchor; ?>
- <?php endif; ?>
-<?php endif; ?>
-
-<?php
-// Gather other possible class list variables into ours. This must be done here
-// rather than in the preprocess because themes run after the AF preprocess.
- $all_classes = "";
- if (!empty($advanced_forum_classes)) {
- $all_classes = $advanced_forum_classes;
- }
-
- if (!empty($classes)) {
- $all_classes .= ' ' . $classes;
- }
-
- if (!empty($node_classes)) {
- $all_classes .= ' ' . $node_classes;
- }
-
- if (!empty($comment_classes)) {
- $all_classes .= ' ' . $comment_classes;
- }
-?>
-
-<div id="<?php print $post_id; ?>" class="<?php print $all_classes; ?>">
- <div class="forum-post-info clear-block">
- <div class="forum-posted-on">
- <?php print $date ?>
-
- <?php print $new_marker ?>
- </div>
-
- <?php if (!empty($in_reply_to)): ?>
- <span class="forum-in-reply-to"><?php print $in_reply_to; ?></span>
- <?php endif; ?>
-
- <?php // Add a note when a post is unpublished so it doesn't rely on theming. ?>
- <?php if (!$node->status): ?>
- <span class="unpublished-post-note"><?php print t("Unpublished post") ?></span>
- <?php endif; ?>
-
- <span class="forum-post-number"><?php print $post_link; ?></span>
- </div> <?php // End of post info div ?>
-
- <div class="forum-post-wrapper">
- <div class="forum-post-panel-sub">
- <?php if (!empty($author_pane)): ?>
- <?php print $author_pane; ?>
- <?php endif; ?>
- </div>
-
- <div class="forum-post-panel-main clear-block">
- <?php if (!empty($title)): ?>
- <div class="forum-post-title">
- <?php print $title ?>
- </div>
- <?php endif; ?>
-
- <div class="forum-post-content">
- <?php print $content ?>
- </div>
-
- <?php if (!empty($post_edited)): ?>
- <div class="post-edited">
- <?php print $post_edited ?>
- </div>
- <?php endif; ?>
-
- <?php if (!empty($signature)): ?>
- <div class="author-signature">
- <?php print $signature ?>
- </div>
- <?php endif; ?>
- </div>
- </div> <?php // End of post wrapper div ?>
-
- <div class="forum-post-footer clear-block">
- <div class="forum-jump-links">
- <a href="#forum-topic-top" title="<?php print t('Jump to top of page'); ?>" class="af-button-small"><span><?php print t("Top"); ?></span></a>
- </div>
-
- <?php if (!empty($links)): ?>
- <div class="forum-post-links">
- <?php print $links ?>
- </div>
- <?php endif; ?>
- </div> <?php // End of footer div ?>
-</div> <?php // End of main wrapping div ?>
-
-<?php
-// Print the taxonomy terms for this node. This will print all terms,
-// including the term of the forum itself. If you don't use any other
-// taxonomy on forum posts, you can safely delete this section.
-?>
-<?php if ($top_post): ?>
- <div class="forum-top-post-footer">
- <?php print t('Tags') ?>: <?php print $terms ?>
- </div>
-<?php endif; ?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-forum.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-forum.tpl.php
deleted file mode 100644
index 1ffa9b3..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-forum.tpl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * @file
- * Display the search forum widget.
- *
- * The real widget is part of a view, but this widget actually leads to the
- * view, and can be redone. It does not need to use FAPI because it
- * is just a simple get form, which allows us to style it however we
- * like as long as it has the two important keys: forum and keys.
- *
- * Variables:
- * - $forum: The forum ID. Will be 'All' for no particular forum.
- * - $path: The path to the search widget for the form action.
- */
-?>
-<form action="<?php print $path ?>" accept-charset="UTF-8" method="get" id="advanced-forum-search-forum">
-<input type="hidden" name="forum" id="edit-forum" value="<?php print $forum; ?>"/>
-<div class="container-inline">
- <div class="form-item" id="edit-keys-wrapper">
- <input type="text" maxlength="128" name="keys" id="edit-keys" value="" title="<?php print t('Enter the terms you wish to search for.'); ?>" class="form-text" />
- </div>
- <input type="submit" id="edit-submit-forum-search" value="<?php print t('Search forum'); ?>" class="form-submit" />
-</div>
-</form>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-result.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-result.tpl.php
deleted file mode 100644
index 1529427..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-result.tpl.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Style a single search result in the forum and topic search views.
- *
- * - $view: The view in use.
- * - $fields: an array of $field objects. Each one contains:
- * - $field->content: The output of the field.
- * - $field->raw: The raw data for the field, if it exists. This is NOT output safe.
- * - $field->class: The safe class id to use.
- * - $field->handler: The Views field handler object controlling this field. Do not use
- * var_export to dump this object, as it can't handle the recursion.
- * - $field->inline: Whether or not the field should be inline.
- * - $field->inline_html: either div or span based on the above flag.
- * - $field->separator: an optional separator that may appear before a field.
- * - $row: The raw result object from the query, with all data it fetched.
- */
-
-?>
-
-<div class="forum-search-result">
- <?php foreach ($fields as $id => $field): ?>
- <?php if (!empty($field->separator)): ?>
- <?php print $field->separator; ?>
- <?php endif; ?>
-
- <<?php print $field->inline_html;?> class="views-field-<?php print $field->class; ?>">
- <?php if ($field->label): ?>
- <label class="views-label-<?php print $field->class; ?>">
- <?php print $field->label; ?>:
- </label>
- <?php endif; ?>
- <?php
- // $field->element_type is either SPAN or DIV depending upon whether or not
- // the field is a 'block' element type or 'inline' element type.
- ?>
- <<?php print $field->element_type; ?> class="field-content"><?php print $field->content; ?></<?php print $field->element_type; ?>>
- </<?php print $field->inline_html;?>>
- <?php endforeach; ?>
-</div>
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-topic.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-topic.tpl.php
deleted file mode 100644
index 2ef3332..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.search-topic.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-// $Id $
-/**
- * @file
- * Display the topic forum widget
- *
- * The real widget is part of a view, but this widget actually leads to the
- * view, and can be redone. It does not need to use FAPI because it
- * is just a simple get form, which allows us to style it however we
- * like.
- *
- * Variables:
- * - $node: The node to be searched.
- * - $path: The path to the search widget for the form action.
- */
-?>
-<div class="search-topic">
- <form action="<?php print $path ?>" accept-charset="UTF-8" method="get" id="advanced-forum-search-topic">
- <div class="container-inline">
- <div class="form-item" id="edit-keys-wrapper">
- <input type="text" maxlength="128" name="keys" id="edit-keys" value="" title="<?php print t('Enter the terms you wish to search for.'); ?>" class="form-text" />
- </div>
- <input type="submit" id="edit-submit-forum-topic-search" value="<?php print t('Search topic'); ?>" class="form-submit" />
- </div>
- </form>
-</div>
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.statistics.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.statistics.tpl.php
deleted file mode 100644
index b9c4be1..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.statistics.tpl.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- *
- * Theme implementation: Template for each forum forum statistics section.
- *
- * Available variables:
- * - $current_total: Total number of users currently online.
- * - $current_users: Number of logged in users.
- * - $current_guests: Number of anonymous users.
- * - $online_users: List of logged in users.
- * - $topics: Total number of nodes (threads / topics).
- * - $posts: Total number of nodes + comments.
- * - $users: Total number of registered active users.
- * - $latest_users: Linked user names of latest active users.
- */
-?>
-
-<div id="forum-statistics">
- <div id="forum-statistics-header"><?php print t("What's Going On?"); ?></div>
-
- <div id="forum-statistics-active-header" class="forum-statistics-sub-header">
- <?php print t('Currently active users: !current_total (!current_users users and !current_guests guests)', array('!current_total' => $current_total, '!current_users' => $current_users, '!current_guests' => $current_guests)); ?>
- </div>
-
- <div id="forum-statistics-active-body" class="forum-statistics-sub-body">
- <?php print $online_users; ?>
- </div>
-
- <div id="forum-statistics-statistics-header" class="forum-statistics-sub-header">
- <?php print t('Statistics'); ?>
- </div>
-
- <div id="forum-statistics-statistics-body" class="forum-statistics-sub-body">
- <div id="forum-statistics-topics">
- <?php print t('Topics: !topics, Posts: !posts, Users: !users', array('!topics' => $topics, '!posts' => $posts, '!users' => $users)); ?>
- </div>
- <div id="forum-statistics-latest-users">
- <?php print t('Welcome to our latest members: !users', array('!users' => $latest_users)); ?>
- </div>
- </div>
-</div>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.structure.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.structure.css
deleted file mode 100644
index f822ccd..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.structure.css
+++ /dev/null
@@ -1,464 +0,0 @@
-
-/*
-This document contains structural markup such as widths, margins, padding, and
-floats.
-*/
-
-/*** PAGER ******************************************************************/
-
-/* This is the pager on the topics in the list */
-.topic-pager {
- font-size: 90%;
- font-style: italic;
-}
-
-/* Other pagers in the forum */
-#forum-comments .pager {
- text-align: right;
-}
-
-#forum-comments .pager li {
- padding: 3px;
- margin: 0;
-}
-
-.forum-pager .pager,
-.forum-comment-wrapper .pager {
- text-align: right;
- float: right;
- clear: none;
- width: 30%;
-}
-
-#forum-pager-top .pager{
- padding: 14px 0 0 0;
-}
-
-#forum-pager-bottom .pager{
- padding: 0 0 10px 0;
-}
-
-/* The rest of the pager styles are invisible on naked but will show up
- for substyles that set a background and/or border. */
-.forum-pager .pager a,
-.forum-comment-wrapper .pager a {
- padding: 1px 3px;
- margin: 0pt;
-}
-
-.forum-pager .pager li,
-.forum-comment-wrapper .pager li {
- padding:0pt;
- margin: 0pt;
-}
-
-.forum-pager.pager li.pager-current,
-.forum-comment-wrapper .pager li.pager-current {
- padding: 2px 3px 2px 3px;
-}
-
-/*** FORUM LINK LISTS *******************************************************/
-
-/* Applies to all forum links */
-ul.forum-links li {
- display: inline;
-}
-
-/*** FORUM NODE CREATION ****************************************************/
-
-.forum-node-create-links {
- width: 30%;
- float: left;
-}
-
-.forum-node-create-links-top {
- clear: both;
- padding-top: 20px; /* Lines up horizontally with pager. */
-}
-
-.forum-node-create-links .forum-add-node {
- float: left;
- margin-right: 10px;
-}
-
-/*** FORUM & TOPIC LIST TABLES **********************************************/
-
-.forum-table {
- margin: 0px;
-}
-
-.forum-table-wrap,
-.forum-table-topics {
- margin-bottom: 15px;
- clear: both;
-}
-
-.forum-table-superheader {
- padding: 10px;
-}
-
-.forum-table-superheader .forum-table-name {
- margin: 5px 0 3px 5px;
- width: 90%;
- display: inline;
- font-size: 1.2em;
-}
-
-.forum-table-superheader .forum-table-description {
- margin: 0 0 3px 5px;
- width: 90%;
-}
-
-/* Header, both tables */
-.forum-table th {
- text-align: center;
-}
-
-/* Forum listing */
-th.forum-name {
- text-align: left;
-}
-
-td.forum-details .forum-description {
- margin: 0;
-}
-
-td.forum-details .forum-subforums,
-td.forum-details .forum-subcontainers {
- margin-left: 10px;
-}
-
-td.forum-number-topics,
-td.forum-number-posts {
- text-align: center;
-}
-
-th.forum-icon {
- width: 70px;
-}
-
-th.forum-number-topics,
-th.forum-posts {
- width: 10%;
- text-align: center;
-}
-
-th.forum-last-post {
- width: 20%;
-}
-
-/**** Topic listing ****/
-
-.view-advanced-forum-topic-list .view-empty {
- clear: both;
- margin: 20px 0 20px 0;
- padding: 10px;
-}
-
-/* Set column widths */
-.forum-table-topics td.views-field-topic-icon {
- width: 26px;
-}
-
-.forum-table-topics td.views-field-comment-count,
-.forum-table-topics td.views-field-totalcount {
- width: 10%;
-}
-
-.forum-table-topics td.views-field-last-updated {
- width: 30%;
-}
-
-/* Set alignments & spacing */
-.forum-table-topics .views-field-title {
- text-align: left;
-}
-
-.forum-table-topics td.views-field-comment-count,
-.forum-table-topics td.views-field-totalcount {
- text-align: center;
- white-space: nowrap;
-}
-
-.forum-table-topics td.views-field-last-updated {
- line-height: 140%;
- white-space: normal !important;
-}
-
-/* Topic icon */
-.forum-table-topics span.topic-icon {
- display: block;
-}
-
-/*** FORUM SORT *************************************************************/
-#advanced-forum-forum-topic-list-sort-form,
-#advanced-forum-forum-topic-list-sort-form input,
-#advanced-forum-forum-topic-list-sort-form .form-item {
- margin-top: 0 !important;
- margin-bottom: 0 !important;
- padding-top: 0 !important;
- padding-bottom: 0 !important;
- vertical-align: center;
-}
-
-#forum-sort {
- clear: both;
- float: left;
-}
-
-/*** FORUM TOOLS ***********************************************************/
-
-.forum-tools{
- float: right;
- margin-top: 10px;
-}
-
-/*** FORUM STATISTICS *******************************************************/
-
-#forum-statistics-header,
-.forum-statistics-sub-header {
- padding: 0.3em 0.5em;
-}
-
-.forum-statistics-sub-body {
- padding: 0.3em 0.5em 0 2em;
-}
-
-
-/*** ICONS LEGEND ***********************************************************/
-
-.forum-list-icon-legend {
- margin-bottom: 30px;
-}
-
-.forum-list-legend-item {
- float: left;
- margin-right: 30px;
-}
-
-.forum-topic-legend div {
- clear: both;
- float: left;
- padding: 5px 0 5px 25px;
- margin-right: 7px;
-}
-
-
-/*** FORUM TOPICS **********************************************************/
-
-/* Header at the top of each topic/thread */
-.forum-topic-header {
- margin: 10px 0 2px 0;
-}
-
-.forum-topic-header .search-topic {
- float: right;
-}
-
-.forum-topic-header .topic-post-count {
- clear: right;
- float: right;
- margin: 7px 7px 0 0;
-}
-
-.forum-topic-header .topic-reply-link,
-.forum-topic-header .topic-new-post-link,
-.forum-topic-header .last-post-link {
- float: left;
- margin: 0 7px 7px 0;
-}
-
-
-.forum-topic-header .reply-count {
- float: right;
- margin: 10px 0 2px 0;
-}
-
-/* Individual forum post */
-.forum-post {
- margin: 0 0 5px 0;
- padding: 0;
-}
-
-.forum-post-wrapper {
- clear: both;
- height: 100%;
-}
-
-/* Header at the top of each post */
-.forum-post-info {
- height:100%;
- clear: both;
- margin-bottom: 3px;
-}
-
-.forum-posted-on {
- padding: 0 5px;
- float: left;
- font-size: .8em;
-}
-
-.forum-post .new {
- float: none;
-}
-
-.forum-post-number {
- float: right;
- margin-right: 5px;
-}
-
-.forum-post-title {
- padding: 1px 1px 1px 10px;
-}
-
-/* Author information pane */
-.forum-post-panel-sub {
- float: left;
- line-height: 100%;
- width: 150px;
-}
-
-.forum-post-panel-sub .author-pane {
- margin: 10px;
-}
-
-.forum-post-panel-sub .author-pane .author-name {
- font-size: 120%;
-}
-
-.forum-post-panel-sub .author-pane .picture {
- float: none;
- padding-left: 0px;
- margin: 2px 0 10px 0;
-}
-
-.forum-post-panel-sub .author-pane .picture img {
- padding: 5px;
-}
-
-.forum-post-panel-sub .author-pane .author-pane-section {
- margin-bottom: 10px;
-}
-
-.forum-post-panel-sub .author-pane .author-pane-line {
- margin-bottom: 7px;
-}
-
-/* Post text area */
-.forum-post-panel-main {
- margin-left: 150px; /*Set left margin to LeftColumnWidth*/
-
-/* These heights keep the AP items from jumping out of the bottom. Depending
- on how many items you display, there, this number may need to be adjusted
- to avoid having unnecessary white space in your posts. */
- min-height: 230px;
- height: auto !important;
- height: 230px;
-}
-
-.forum-post-panel-main .forum-post-content {
- padding-top: 2px;
-}
-
-.forum-post-panel-main .post-title,
-.forum-post-panel-main .forum-post-content {
- margin-left: 0;
- padding-left: 10px;
-}
-
-.forum-post-panel-main p {
- margin-right: 10px;
-}
-
-/* Signature */
-.author-signature {
- margin: 10px 0 5px 10px;
-}
-
-/* Edited */
-.post-edited {
- margin: 10px;
-}
-
-/* Post footer */
-.forum-post-footer {
- margin-top: 0;
- clear: both;
-}
-
-.forum-jump-links {
- float: left;
- line-height: 2em;
- margin: 5px;
-}
-
-.forum-post-links {
- float: right;
- line-height: 2em;
- text-align: right;
- margin: 10px 0 5px 5px;
-}
-
-.forum-post-links ul.links li {
- display: block;
- float: left;
-}
-
-.forum-top-post-footer {
- margin: 10px 0 10px 0;
- padding: 5px;
-}
-
-/* Defeat garland */
-#comments.forum-comment-wrapper {
- margin-top: 0;
-}
-
-.forum-comment-wrapper .box {
- clear: both;
-}
-
-/*** SEARCH ****************************************************************/
-
-#search-all-forums {
- float: right;
-}
-
-#search-single-forum {
- float: left;
-}
-
-#advanced-forum-search-forum,
-.forum-topic-header #advanced-forum-search-topic {
- margin: 0;
- padding: 14px 0 0 0;
-}
-
-#advanced-forum-search-forum input,
-.forum-topic-header #advanced-forum-search-topic input {
- margin: 0;
- padding: 0;
-}
-
-.forum-topic-header #advanced-forum-search-topic {
- margin-bottom: 10px;
-}
-
-.view-avf-search .views-row,
-.view-avf-search-topic .views-row {
- margin-bottom: 2em;
-}
-
-.forum-search-result {
- margin-bottom: 10px;
-}
-
-/*** GENERAL ****************************************************************/
-
-/* Accessibly hide text. Copied from D7 core and so not needed in D7 AF */
-.element-invisible {
- position: absolute !important;
- clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
- clip: rect(1px, 1px, 1px, 1px);
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.submitted.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.submitted.tpl.php
deleted file mode 100644
index 20b6a94..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.submitted.tpl.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * @file
- * Default theme implementation to format a simple string indicated when and
- * by whom a topic was submitted.
- *
- * Available variables:
- *
- * - $topic_link: On the forum overview page, this is the title of the last
- * updated topic (node).
- * - $author: The author of the post.
- * - $time: How long ago the post was created.
- * - $topic: An object with the raw data of the thread. Unsafe, be sure
- * to clean this data before printing.
- *
- * @see template_preprocess_forum_submitted()
- * @see advanced_forum_preprocess_forum_submitted()
- */
-?>
-
-<?php if ($time): ?>
- <?php if (!empty($topic_link)): ?>
- <?php if (isset($date_posted)): ?>
- <?php print t(
- '!title<br />by !author<br />@date_posted', array(
- '!title' => $topic_link,
- '@date_posted' => $date_posted,
- '!author' => $author,
- )); ?>
- <?php else: ?>
- <?php print t(
- '!title<br />by !author<br />@time ago', array(
- '!title' => $topic_link,
- '@time' => $time,
- '!author' => $author,
- )); ?>
- <?php endif; ?>
- <?php else: ?>
- <?php if (isset($date_posted)): ?>
- <?php print t(
- 'by !author<br />@date_posted', array(
- '@date_posted' => $date_posted,
- '!author' => $author,
- )); ?>
- <?php else: ?>
- <?php print t(
- 'by !author<br />@time ago', array(
- '@time' => $time,
- '!author' => $author,
- )); ?>
- <?php endif; ?>
- <?php endif; ?>
-<?php else: ?>
- <?php print t('n/a'); ?>
-<?php endif; ?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-header.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-header.tpl.php
deleted file mode 100644
index 5f224af..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-header.tpl.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- *
- * Theme implementation: Template for forum topic header.
- *
- * - $node: Node object.
- * - $search: Search box to search this topic (Requires Node Comments)
- * - $reply_link: Text link / button to reply to topic.
- * - $total_posts_count: Number of posts in topic.
- * - $new_posts_count: Number of new posts in topic.
- * - $first_new_post_link: Link to first unread post.
- * - $last_post_link: Link to last post.
- */
-?>
-
-<div id="forum-topic-header" class="forum-topic-header clear-block">
- <?php print $search; ?>
-
- <div class="topic-post-count">
- <?php print $total_posts_count; ?> / <?php print t('!new new', array('!new' => $new_posts_count)); ?>
- </div>
-
- <?php if (!empty($reply_link)): ?>
- <div class="topic-reply-link">
- <?php print $reply_link; ?>
- </div>
- <?php endif; ?>
-
- <?php if (!empty($first_new_post_link)): ?>
- <div class="topic-new-post-link">
- <?php print $first_new_post_link; ?>
- </div>
- <?php endif; ?>
-
- <?php if (!empty($last_post_link)): ?>
- <div class="last-post-link">
- <?php print $last_post_link; ?>
- </div>
- <?php endif; ?>
-
-
- <a id="forum-topic-top"></a>
-</div>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-icon.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-icon.tpl.php
deleted file mode 100644
index b314f72..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-icon.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Display an appropriate icon for a forum post.
- *
- * Available variables:
- * - $new_posts: Indicates whether or not the topic contains new posts.
- * - $icon: The icon to display. May be one of 'hot', 'hot-new', 'new',
- * 'default', 'closed', or 'sticky'.
- *
- * @see template_preprocess_forum_icon()
- * @see advanced_forum_preprocess_forum_icon()
- */
-?>
-
-<?php if ($new_posts): ?>
- <a name="new">
-<?php endif; ?>
-
-<span class="<?php print "topic-icon topic-icon-$icon"; ?>"><?php print "$icon"; ?></span>
-
-<?php if ($new_posts): ?>
- </a>
-<?php endif; ?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-legend.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-legend.tpl.php
deleted file mode 100644
index b6fe9a8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-legend.tpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * @file
- * Theme implementation to show forum legend.
- *
- */
-?>
-
-<div class="forum-topic-legend clear-block">
- <div class="topic-icon-new"><?php print t('New posts'); ?></div>
- <div class="topic-icon-default"><?php print t('No new posts'); ?></div>
- <div class="topic-icon-hot-new"><?php print t('Hot topic with new posts'); ?></div>
- <div class="topic-icon-hot"><?php print t('Hot topic without new posts'); ?></div>
- <div class="topic-icon-sticky"><?php print t('Sticky topic'); ?></div>
- <div class="topic-icon-closed"><?php print t('Locked topic'); ?></div>
-</div>
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-list-outer-view.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-list-outer-view.tpl.php
deleted file mode 100644
index 5aac8c6..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-list-outer-view.tpl.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * @file views-view.tpl.php
- * Main view template
- *
- * Variables available:
- * - $css_name: A css-safe version of the view name.
- * - $header: The view header
- * - $footer: The view footer
- * - $rows: The results of the view query, if any
- * - $empty: The empty text to display if the view is empty
- * - $pager: The pager next/prev links to display, if any
- * - $exposed: Exposed widget form/info to display
- * - $feed_icon: Feed icon to display, if any
- * - $more: A link to view more, if any
- * - $admin_links: A rendered list of administrative links
- * - $admin_links_raw: A list of administrative links suitable for theme('links')
- *
- * @ingroup views_templates
- */
-
-?>
-
-<div class="view view-<?php print $css_name; ?> view-id-<?php print $name; ?> view-display-id-<?php print $display_id; ?> view-dom-id-<?php print $dom_id; ?>">
- <?php if ($admin_links): ?>
- <div class="views-admin-links views-hide">
- <?php print $admin_links; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($header): ?>
- <div class="view-header">
- <?php print $header; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($exposed): ?>
- <div class="view-filters">
- <?php print $exposed; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($attachment_before): ?>
- <div class="attachment attachment-before">
- <?php print $attachment_before; ?>
- </div>
- <?php endif; ?>
-
- <div class="forum-node-create-links forum-node-create-links-top"><?php print $node_create_list ?></div>
-
- <?php if ($pager): ?>
- <div class="forum-pager" id="forum-pager-top"><?php print $pager; ?></div>
- <?php endif; ?>
-
- <?php if ($rows): ?>
- <div class="view-content">
- <?php print $rows; ?>
- </div>
- <?php elseif ($empty): ?>
- <div class="view-empty">
- <?php print $empty; ?>
- </div>
- <?php endif; ?>
-
- <div class="forum-node-create-links"><?php print $node_create_list ?></div>
-
- <?php if ($pager): ?>
- <div class="forum-pager" id="forum-pager-bottom"><?php print $pager; ?></div>
- <?php endif; ?>
-
- <?php if (!empty($view->sort_form)): ?>
- <div id="forum-sort"><?php print advanced_forum_forum_topic_list_sort(); ?></div>
- <?php endif; ?>
-
- <?php if (!empty($forum_tools)): ?>
- <div class="forum-tools"><?php print $forum_tools; ?></div>
- <?php endif; ?>
-
-
- <?php if ($attachment_after): ?>
- <div class="attachment attachment-after">
- <?php print $attachment_after; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($more): ?>
- <?php print $more; ?>
- <?php endif; ?>
-
- <?php if ($footer): ?>
- <div class="view-footer">
- <?php print $footer; ?>
- </div>
- <?php endif; ?>
-
- <?php if ($feed_icon): ?>
- <div class="feed-icon">
- <?php print $feed_icon; ?>
- </div>
- <?php endif; ?>
-
-</div> <?php /* class view */ ?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-list-view.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-list-view.tpl.php
deleted file mode 100644
index 7e22de7..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-list-view.tpl.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * @file views-view-table.tpl.php
- * Template to display a view as a table.
- *
- * - $title : The title of this group of rows. May be empty.
- * - $header: An array of header labels keyed by field id.
- * - $fields: An array of CSS IDs to use for each field id.
- * - $class: A class or classes to apply to the table, based on settings.
- * - $row_classes: An array of classes to apply to each row, indexed by row
- * number. This matches the index in $rows.
- * - $rows: An array of row items. Each row is an array of content.
- * $rows are keyed by row number, fields within rows are keyed by field ID.
- * @ingroup views_templates
- */
-?>
- <div id="forum-topic-list">
- <?php if (!empty($title)) : ?>
- <caption><?php print $title; ?></caption>
- <?php endif; ?>
-
- <table class="forum-table forum-table-topics <?php print $class; ?>">
- <thead>
- <tr>
- <?php foreach ($header as $field => $label): ?>
- <th class="views-field views-field-<?php print $fields[$field]; ?>">
- <?php print $label; ?>
- </th>
- <?php endforeach; ?>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($rows as $count => $row): ?>
- <tr class="<?php print implode(' ', $row_classes[$count]); ?>">
- <?php if (empty($shadow[$count])): ?>
- <?php foreach ($row as $field => $content): ?>
- <?php /* To add popup from teaser in the title of the td, add: title="<?php print $teasers[$count] ?>"*/ ?>
- <td class="views-field views-field-<?php print $fields[$field]; ?>">
- <?php /* Extra label for stickies. */ ?>
- <?php if ($field == 'title' && !empty($sticky[$count])): ?>
- <span class="sticky-label"><?php print t('Sticky:'); ?></span>
- <?php endif; ?>
- <?php print $content; ?>
- </td>
- <?php endforeach; ?>
- <?php else: ?>
- <?php /* For shadow posts, we print only the icon and themed notice. */ ?>
- <td class="views-field views-field-<?php print $fields['topic_icon']; ?>">
- <?php print $row['topic_icon']; ?>
- </td>
- <td class="views-field views-field-<?php print $fields['title']; ?>" colspan="<?php print count($header)-1; ?>">
- <?php print $shadow[$count]; ?>
- </td>
- <?php endif; ?>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
-</div>
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-navigation.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-navigation.tpl.php
deleted file mode 100644
index b00b3bc..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/advanced_forum.naked.topic-navigation.tpl.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file advanced_forum.naked.topic-navigation.tpl.php
- * Default theme implementation to display the topic navigation string at the
- * bottom of all forum topics.
- *
- * Available variables:
- *
- * - $prev: The node ID of the previous post.
- * - $prev_url: The URL of the previous post.
- * - $prev_title: The title of the previous post.
- *
- * - $next: The node ID of the next post.
- * - $next_url: The URL of the next post.
- * - $next_title: The title of the next post.
- *
- * - $node: The raw node currently being viewed. Contains unsafe data
- * and any data in this must be cleaned before presenting.
- *
- * @see template_preprocess_forum_topic_navigation()
- * @see theme_forum_topic_navigation()
- */
-?>
-<?php if ($prev || $next): ?>
- <div class="forum-topic-navigation clear-block">
- <?php if ($prev): ?>
- <a href="<?php print $prev_url; ?>" class="topic-previous" title="<?php print t('Go to previous forum topic') ?>">‹ <?php print t('Previous topic: !title', array('!title' => $prev_title)) ?></a>
- <?php endif; ?>
- <?php if ($next): ?>
- <a href="<?php print $next_url; ?>" class="topic-next" title="<?php print t('Go to next forum topic') ?>"><?php print t('Next topic: !title', array('!title' => $next_title)) ?> ›</a>
- <?php endif; ?>
- </div>
-<?php endif; ?>
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/container_collapse.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/container_collapse.png
deleted file mode 100644
index 7adc98a..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/container_collapse.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/container_expand.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/container_expand.png
deleted file mode 100644
index 6b2da3d..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/container_expand.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_default.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_default.png
deleted file mode 100644
index fcd3e5f..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_default.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_locked.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_locked.png
deleted file mode 100644
index 2d1592f..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_locked.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_new_posts.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_new_posts.png
deleted file mode 100644
index bb7ed51..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/forum_list_new_posts.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_closed.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_closed.png
deleted file mode 100644
index 26c4c1b..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_closed.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_default.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_default.png
deleted file mode 100644
index d7cf853..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_default.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_hot.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_hot.png
deleted file mode 100644
index 6f61d0c..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_hot.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_hot_new.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_hot_new.png
deleted file mode 100644
index e31deae..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_hot_new.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_new.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_new.png
deleted file mode 100644
index e7f93ea..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_new.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_sticky.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_sticky.png
deleted file mode 100644
index 9f9f0e6..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/images/topic_list_sticky.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/naked.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/naked.info
deleted file mode 100644
index 1299ffc..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked/naked.info
+++ /dev/null
@@ -1,11 +0,0 @@
-
-name = Naked
-description = Base style with no CSS except positioning. Meant as a starter style. Images are desaturated for easier recoloring.
-version = 2.x
-
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/advanced_forum.naked_stacked.author-pane.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/advanced_forum.naked_stacked.author-pane.tpl.php
deleted file mode 100644
index e513ead..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/advanced_forum.naked_stacked.author-pane.tpl.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/**
- * @file
- * Theme implementation to display information about the post/profile author.
- *
- * See author-pane.tpl.php in Author Pane module for a full list of variables.
- */
-?>
-
-<?php
- // This bit of debugging info will show the full path to and name of this
- // template file to make it easier to figure out which template is
- // controlling which author pane.
- if (!empty($show_template_location)) {
- print __FILE__;
- }
-?>
-
-<div class="author-pane clear-block">
- <div class="author-pane-inner">
- <?php /* User picture / avatar (has div in variable) */ ?>
- <?php if (!empty($picture)): ?>
- <?php print $picture; ?>
- <?php endif; ?>
-
- <?php /* General section */ ?>
- <div class="author-pane-section author-pane-section-1">
- <?php /* Account name */ ?>
- <div class="author-pane-line author-name">
- <?php print $account_name; ?>
- </div>
-
- <?php /* Online status */ ?>
- <?php if (!empty($online_status)): ?>
- <div class="author-pane-line <?php print $online_status_class ?>">
- <?php print $online_status; ?>
- </div>
- <?php endif; ?>
-
- <?php /* User title */ ?>
- <?php if (!empty($user_title)): ?>
- <div class="author-pane-line author-title">
- <?php print $user_title; ?>
- </div>
- <?php endif; ?>
-
- <?php /* User badges */ ?>
- <?php if (!empty($user_badges)): ?>
- <div class="author-pane-line author-badges">
- <?php print $user_badges; ?>
- </div>
- <?php endif; ?>
- </div>
-
- <div class="author-pane-section author-pane-section-2">
- <?php /* Location */ ?>
- <?php if (!empty($location_user_location)): ?>
- <div class="author-pane-line author-location">
- <?php print $location_user_location; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Joined */ ?>
- <?php if (!empty($joined)): ?>
- <div class="author-pane-line author-joined">
- <span class="author-pane-label"><?php print t('Joined'); ?>:</span> <?php print $joined; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Posts */ ?>
- <?php if (isset($user_stats_posts)): ?>
- <div class="author-pane-line author-posts">
- <span class="author-pane-label"><?php print t('Posts'); ?>:</span> <?php print $user_stats_posts; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Points */ ?>
- <?php if (isset($userpoints_points)): ?>
- <div class="author-pane-line author-points">
- <span class="author-pane-label"><?php print t('!Points', userpoints_translation()); ?></span>: <?php print $userpoints_points; ?>
- </div>
- <?php endif; ?>
- </div>
-
- <?php /* Contact section */ ?>
- <div class="author-pane-section author-pane-contact">
- <?php /* Contact / Email */ ?>
- <?php if (!empty($contact)): ?>
- <div class="author-pane-line author-pane-link-line author-contact">
- <?php print $contact; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Private message */ ?>
- <?php if (!empty($privatemsg)): ?>
- <div class="author-pane-line author-pane-link-line author-privatemsg">
- <?php print $privatemsg; ?>
- </div>
- <?php endif; ?>
-
- <?php /* User relationships */ ?>
- <?php if (!empty($user_relationships_api)): ?>
- <div class="author-pane-line author-pane-link-line author-user-relationship">
- <?php print $user_relationships_api; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Flag friend */ ?>
- <?php if (!empty($flag_friend)): ?>
- <div class="author-pane-line author-pane-link-line author-flag-friend">
-
- <?php print $flag_friend; ?>
- </div>
- <?php endif; ?>
- </div>
-
- <?php /* Admin section */ ?>
- <div class="author-pane-section author-pane-admin">
- <?php /* IP */ ?>
- <?php if (!empty($user_stats_ip)): ?>
- <div class="author-pane-line author-ip">
- <span class="author-pane-label"><?php print t('IP'); ?>:</span> <?php print $user_stats_ip; ?>
- </div>
- <?php endif; ?>
-
- <?php /* Fasttoggle block */ ?>
- <?php if (!empty($fasttoggle_block_author)): ?>
- <div class="author-fasttoggle-block"><?php print $fasttoggle_block_author; ?></div>
- <?php endif; ?>
-
- <?php /* Troll ban */ ?>
- <?php if (!empty($troll_ban_author)): ?>
- <div class="author-pane-line author-troll-ban"><?php print $troll_ban_author; ?></div>
- <?php endif; ?>
- </div>
- </div>
-</div>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/advanced_forum.naked_stacked.structure.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/advanced_forum.naked_stacked.structure.css
deleted file mode 100644
index 893d0fe..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/advanced_forum.naked_stacked.structure.css
+++ /dev/null
@@ -1,75 +0,0 @@
-
-/*
-This document contains structural markup such as widths, margins, padding, and
-floats.
-*/
-
-/*** FORUM THREADS ***********************************************************/
-
-/* Header at the top of each post */
-.post-info {
- margin-bottom: none /* Reset */
-}
-
-.posted-on {
- padding: 0 10px;
-}
-
-.post-title {
- padding: 5px 0px 5px 10px;
-}
-
-/* Author information pane */
-.forum-post-panel-sub {
- float: none; /* Reset */
- line-height: 110%;
- width: auto; /* Reset */
-}
-
-.forum-post-panel-sub .author-pane {
- margin: 0; /* Reset */
- padding: 10px 0 5px 10px;
-}
-
-.forum-post-panel-sub .author-pane-top {
- overflow: auto;
- height: 100px;
-}
-
-.forum-post-panel-sub .author-pane .picture {
- float: left;
- display: block;
- margin: 2px 10px 2px 2px;
-}
-
-.forum-post-panel-sub .author-pane-section-1,
-.forum-post-panel-sub .author-pane-section-2,
-.forum-post-panel-sub .author-pane-stats {
- float: left;
- display: block;
- margin-right: 10px;
-}
-
-.forum-post-panel-sub .author-pane-contact,
-.forum-post-panel-sub .author-pane-admin {
- float: right;
- display: block;
- margin-right: 5px;
-}
-
-/* Post text area */
-.forum-post-wrapper .forum-post-panel-main {
- clear: both;
- margin-left: 0px; /* Reset */
- min-height: 0px; /* Reset */
- height: auto !important; /* Reset */
-}
-
-.forum-post-panel-main .content {
- padding-top: 0; /* Reset */
- padding: 5px;
-}
-
-.forum-post-links {
- float: right;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/naked_stacked.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/naked_stacked.info
deleted file mode 100644
index b07df96..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/naked_stacked/naked_stacked.info
+++ /dev/null
@@ -1,11 +0,0 @@
-
-name = Naked Stacked
-description = Same as Naked except the Author Pane is on top.
-version = 2.x
-base style = naked
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/advanced_forum.silver_bells.images.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/advanced_forum.silver_bells.images.css
deleted file mode 100644
index 5f43367..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/advanced_forum.silver_bells.images.css
+++ /dev/null
@@ -1,269 +0,0 @@
-/* FORUM LIST ICONS *********************************************************/
-.forum-list-icon-wrapper {
- border-top: 1px solid #EAF8E4;
- background: #C1C1C1;
- background: -webkit-gradient(linear, left top, left bottom, from(#DFDFDF), to(#C1C1C1));
- background: -moz-linear-gradient(top, #DFDFDF, #C1C1C1);
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
- -moz-box-shadow: rgba(0,0,0,1) 0 1px 0;
- box-shadow: rgba(0,0,0,1) 0 1px 0;
- text-shadow: rgba(0,0,0,.4) 0 1px 0;
- color: #333333;
- font-family: Helvetica, Arial, Sans-Serif;
- text-decoration: none;
- vertical-align: middle;
- margin: 10px;
- width: 50px;
- height: 50px;
- display: block;
-}
-
-tr.even td.forum-list-icon-default .forum-list-icon-wrapper span,
-tr.odd td.forum-list-icon-default .forum-list-icon-wrapper span,
-.forum-list-icon-legend .forum-list-icon-default {
- background: transparent url(images/forum_list_default.png) no-repeat center center;
-}
-
-tr.even td.forum-list-icon-new-posts .forum-list-icon-wrapper span,
-tr.odd td.forum-list-icon-new-posts .forum-list-icon-wrapper span,
-.forum-list-icon-legend .forum-list-icon-new-posts {
- background: transparent url(images/forum_list_new_posts.png) no-repeat center center;
-}
-
-/* TOPIC LIST ICONS *********************************************************/
-span.topic-icon {
- width: 24px;
- height: 24px;
- text-indent: -9999px;
-}
-
-.topic-icon-default {
- background: transparent url(images/topic_list_default.png) no-repeat center center;
-}
-
-.topic-icon-new {
- background: transparent url(images/topic_list_new.png) no-repeat center center;
-}
-
-.topic-icon-hot {
- background: transparent url(images/topic_list_hot.png) no-repeat center center;
-}
-
-.topic-icon-hot-new {
- background: transparent url(images/topic_list_hot_new.png) no-repeat center center;
-}
-
-.topic-icon-sticky {
- background: transparent url(images/topic_list_sticky.png) no-repeat center center;
-}
-
-.topic-icon-closed {
- background: transparent url(images/topic_list_closed.png) no-repeat center center;
-}
-
-/* TOPIC LIST ICON LEGEND ***************************************************/
-.topic-icon-default {
- background: transparent url(images/topic_list_default.png) no-repeat top left;
-}
-
-.topic-icon-new {
- background: transparent url(images/topic_list_new.png) no-repeat top left;
-}
-
-.topic-icon-hot {
- background: transparent url(images/topic_list_hot.png) no-repeat top left;
-}
-
-.topic-icon-hot-new {
- background: transparent url(images/topic_list_hot_new.png) no-repeat top left;
-}
-
-.topic-icon-sticky {
- background: transparent url(images/topic_list_sticky.png) no-repeat top left;
-}
-
-.topic-icon-closed {
- background: transparent url(images/topic_list_closed.png) no-repeat top left;
-}
-
-/* AUTHOR PANE **************************************************************/
-
-.forum-post-panel-sub .author-online {
- background: transparent url(images/ap_user_online.png) no-repeat;
- padding-left: 20px;
- height: 20px;
- width: 125px;
- display: block;
-}
-
-.forum-post-panel-sub .author-offline {
- background: transparent url(images/ap_user_offline.png) no-repeat;
- padding-left: 20px;
- height: 20px;
- width: 125px;
- display: block;
-}
-
-
-/* BUTTONIZED LINKS - GENERAL ***********************************************/
-/* Based on http://css-tricks.com/examples/ButtonMaker */
-
-a.af-button-large,
-a.af-button-large:link,
-a.af-button-large:visited,
-a.af-button-small,
-a.af-button-small:link,
-a.af-button-small:visited,
-a.author-pane-link,
-a.author-pane-link:link,
-a.author-pane-link:visited {
- color: #333333;
- text-decoration: none;
-}
-
-.af-button-large,
-.af-button-small,
-.author-pane-link {
- display: block;
- border-top: 1px solid #EAF8E4;
- background: #C1C1C1;
- background: -webkit-gradient(linear, left top, left bottom, from(#DFDFDF), to(#C1C1C1));
- background: -moz-linear-gradient(top, #DFDFDF, #C1C1C1);
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
- -moz-box-shadow: rgba(0,0,0,1) 0 1px 0;
- box-shadow: rgba(0,0,0,1) 0 1px 0;
- text-shadow: rgba(0,0,0,.4) 0 1px 0;
- color: #333333;
- font-family: Helvetica, Arial, Sans-Serif;
- text-decoration: none;
- vertical-align: middle;
-}
-
-a.af-button-large:hover,
-a.af-button-small:hover,
-a.author-pane-link:hover {
- background: #C1C1C1;
- color: #333333;
- border-top-color: #EFEFEF;
-}
-
-a.af-button-large:active,
-a.af-button-small:active,
-a.author-pane-link:active {
- background: #C1C1C1;
- color: #333333;
- border-top-color: #EFEFEF;
-}
-
-.af-button-large span {
- font-size: 14px;
- padding: 2px 2px 2px 25px; /* Last number controls width for image */
- line-height: 30px; /* Approximate height of button */
- margin: 0 7px 0 7px; /* Left and right space outside text & image */
-}
-
-.af-button-small span {
- font-size: 12px;
- padding: 2px 2px 2px 20px; /* Last number controls width for image */
- line-height: 25px; /* Approximate height of button */
- margin: 0 7px 0 7px; /* Left and right space outside text & image */
-}
-
-.author-pane-link span {
- font-size: 12px;
- padding: 0 0 0 22px; /* Last number controls width for image */
- line-height: 22px; /* Approximate height of button */
- margin: 0 7px 0 7px; /* Left and right space outside text & image */
-}
-
-/* BUTTONIZED LINKS - INDIVIDUAL BUTTONS ************************************/
-
-.forum-add-forum .af-button-large span {
- background: url(images/add_topic.png) no-repeat;
-}
-
-.forum-add-poll .af-button-large span {
- background: url(images/add_poll.png) no-repeat;
-}
-
-/*** Reply/Locked at the top and bottom of individual topics. ***/
-
-/* Reply link */
-.topic-reply-allowed .af-button-large span {
- background: url(images/topic_reply.png) no-repeat;
-}
-
-/* Locked topic (not a link so an extra span is used instead of the "a". */
-.topic-reply-locked .af-button-large span {
- background: url(images/topic_locked.png) no-repeat;
-}
-
-/* Last post */
-.last-post-link .af-button-large span {
- background: url(images/topic_last_post.png) no-repeat;
-}
-
-/* First unread */
-.topic-new-post-link .af-button-large span {
- background: url(images/topic_first_unread_post.png) no-repeat;
-}
-
-
-/*** Links on the individual posts (nodes and comments). ***/
-
-/* General */
-.forum-post-links .af-button-small span {
-}
-
-/* Reply */
-.comment_add .af-button-small span,
-.comment_reply .af-button-small span {
- background: url(images/post_reply.png) no-repeat;
-}
-
-/* Quote */
-.quote .af-button-small span {
- background: url(images/post_quote.png) no-repeat;
-}
-
-/* Edit */
-.comment_edit .af-button-small span,
-.post_edit .af-button-small span {
- background: url(images/post_edit.png) no-repeat;
-}
-
-/* Delete */
-.comment_delete .af-button-small span,
-.post_delete .af-button-small span {
- background: url(images/post_delete.png) no-repeat;
-}
-
-/* Jump to top */
-.forum-jump-links .af-button-small span {
- background: url(images/topic_top.png) no-repeat;
-}
-
-/*** AUTHOR PANE ***/
-
-.forum-post-panel-sub .author-contact .author-pane-link span {
- background: transparent url(images/ap_email.png) no-repeat;
-}
-
-.forum-post-panel-sub .author-privatemsg .author-pane-link span {
- background: transparent url(images/ap_private_message.png) no-repeat;
-}
-
-.forum-post-panel-sub .author-relationship-add-icon.author-pane-link span {
- background: transparent url(images/ap_contact_add.png) no-repeat;
-}
-
-.forum-post-panel-sub .author-relationship-remove-icon.author-pane-link {
- background: transparent url(images/ap_contact_remove.png) no-repeat;
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/advanced_forum.silver_bells.style.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/advanced_forum.silver_bells.style.css
deleted file mode 100644
index 84fcd79..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/advanced_forum.silver_bells.style.css
+++ /dev/null
@@ -1,237 +0,0 @@
-
-/*
-This file contains colors, graphics, and text effects.
-
-Colors used:
- #C1C1C1 Borders, post seperator, avatar frame, statistics subheader.
- #333333 Table header font color.
- #F5F5F5 to #DDDDDD Gradient on table headers, post info, stats header, top
- post footer, topic navigation.
- #F5F5F5 to #EFEFEF Gradient on topic list background.
- #F5F5F5 Stats section background.
- #FAFAFA Text area on posts.
-*/
-
-/*** PAGER *******************************************************************/
-
-/* This is the pager on the topics in the list */
-.topic-pager {
- font-style: italic;
-}
-
-/* Other pagers in the forum */
-.forum-pager .pager a,
-#forum-comments .pager a {
- font-weight: bold;
-}
-
-.forum-pager .pager a:link,
-.forum-pager .pager a:visited,
-#forum-comments .pager a:link,
-#forum-comments .pager a:visited {
- text-decoration: none;
- border: 1px solid #C1C1C1;
- background: #EFEFEF;
- background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#EFEFEF));
- background: -moz-linear-gradient(top, #F5F5F5, #EFEFEF);
-}
-
-.forum-pager .pager-current,
-.forum-pager .pager a:hover,
-#forum-comments .pager-current,
-#forum-comments .pager a:hover {
- background: #333333;
- color: #FFFFFF !important;
-}
-
-.forum-pager .pager a.active,
-#forum-comments .pager a.active {
- color: #333333;
-}
-
-/*** FORUM & TOPIC LISTS ******************************************************/
-
-/* Forum list and topic list tables */
-.forum-table {
- border: 1px solid #C1C1C1;
-}
-
-/* Table name and description on forum list and table header on topic list */
-.forum-table-wrap .forum-table-superheader,
-.forum-table-topics thead tr {
- border: 1px solid #C1C1C1;
- background: #DDDDDD;
- background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DDDDDD));
- background: -moz-linear-gradient(top, #F5F5F5, #DDDDDD);
- color: #333333;
-}
-
-/* Table name on forum list */
-.forum-table-superheader .forum-table-name,
-.forum-table-superheader .forum-table-name a {
- color: #333333;
- font-weight: bold;
-}
-
-/* Table header on forum list */
-.forum-table-wrap thead tr {
- background-color: #F5F5F5;
- border: 1px solid #C1C1C1;
-}
-
-/* Table header on forum list and topic list */
-.forum-table thead tr a,
-.forum-table thead tr a:visited,
-.forum-table thead tr a:link {
- color: #333333;
- font-weight: bold;
-}
-
-/* Reset to avoid bleed-thru from theme */
-.forum-table thead th {
- border-bottom: none;
-}
-
-/* Rows on both tables */
-.forum-table tr.even,
-.forum-table tr.odd {
- border-top: 1px solid #C1C1C1;
- background: #EFEFEF;
- background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DDDDDD));
- background: -moz-linear-gradient(top, #F5F5F5, #DDDDDD);
-}
-
-/* Active column on both tables - reset to prevent bleed thru from theme */
-.forum-table tr.even td.active,
-.forum-table tr.odd td.active{
- background-color: transparent;
-}
-
-/* Individual cells on both tables */
-.forum-table td {
- border: 1px solid #C1C1C1;
-}
-
-/* Placeholder when there are no topics in the list */
-.view-advanced-forum-topic-list .view-empty {
- border: 3px solid #C1C1C1;
-}
-
-/*** Sticky topics ***/
-.forum-table tr.forum-last-sticky {
- border-bottom: 10px solid #C1C1C1;
-}
-
-.forum-table .sticky-label {
- font-weight: bold;
-}
-
-/*** FORUM STATISTICS *********************************************************/
-
-#forum-statistics {
- border: 1px solid #C1C1C1;
-}
-
-#forum-statistics-header {
- border-top: 1px solid #C1C1C1;
- background: #DDDDDD;
- background: -webkit-gradient(linear, left top, left bottom, from(#EFEFEF), to(#DDDDDD));
- background: -moz-linear-gradient(top, #EFEFEF, #DDDDDD);
- color: #333333;
- font-weight: bold;
-}
-
-.forum-statistics-sub-header {
- border-top: 1px solid #C1C1C1;
- border-bottom: 1px solid #C1C1C1;
- font-weight: bold;
-}
-
-.forum-statistics-sub-body {
- background-color: #F5F5F5;
-}
-
-/*** FORUM TOPICS **********************************************************/
-
-.forum-post {
- border: 1px solid #C1C1C1;
-}
-
-/* Header at the top of each post */
-.forum-post-info {
- border-top: 1px solid #FAFAFA;
- background: #DDDDDD;
- background: -webkit-gradient(linear, left top, left bottom, from(#EFEFEF), to(#DDDDDD));
- background: -moz-linear-gradient(top, #EFEFEF, #DDDDDD);
- color: #333333;
- font-weight: bold;
- border-bottom: 1px solid #C1C1C1;
-}
-
-.forum-posted-on {
- font-weight: bold;
-}
-
-.forum-post-number a {
- color: #333333 !important;
-}
-
-/* Wrapper around author pane and content */
-.forum-post-wrapper {
- background-color: #F5F5F5;
-}
-
-/* Author information pane */
-.forum-post-panel-sub .author-pane .author-name {
- font-weight: bold;
-}
-
-.forum-post-panel-sub .author-pane .picture img {
- border: 1px solid #C1C1C1;
- background-color: #FFFFFF;
-}
-
-.forum-post-panel-sub .author-pane .author-pane-label {
- font-weight: bold;
-}
-
-/* Post text area */
-.forum-post-panel-main {
- border-left: 1px solid #C1C1C1;
- background-color: #FAFAFA;
-}
-
-.forum-post-title {
- font-weight: bold;
- border-bottom: 1px solid #C1C1C1;
-}
-
-/* Signature */
-.author-signature {
- font-size: .8em;
-}
-
-/* Post footer */
-.forum-post-footer {
- border-top: 1px solid #C1C1C1;
-}
-
-.forum-jump-links {
- border-right: 1px solid #C1C1C1;
-}
-
-/* Box under top post before first reply */
-.forum-top-post-footer {
- border: 1px solid #C1C1C1;
- background: #DDDDDD;
- background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DDDDDD));
- background: -moz-linear-gradient(top, #F5F5F5, #DDDDDD);
-}
-
-/* Topic navigation */
-.forum-topic-navigation {
- border: 1px solid #C1C1C1;
- background: #DDDDDD;
- background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DDDDDD));
- background: -moz-linear-gradient(top, #F5F5F5, #DDDDDD);
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/add_poll.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/add_poll.png
deleted file mode 100644
index d0f0bf4..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/add_poll.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/add_topic.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/add_topic.png
deleted file mode 100644
index fbb4ce0..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/add_topic.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_contact_add.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_contact_add.png
deleted file mode 100644
index 0c9ca48..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_contact_add.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_contact_remove.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_contact_remove.png
deleted file mode 100644
index 1304c03..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_contact_remove.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_email.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_email.png
deleted file mode 100644
index 6ff58cb..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_email.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_private_message.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_private_message.png
deleted file mode 100644
index 5dfcf6a..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_private_message.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_user_offline.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_user_offline.png
deleted file mode 100644
index bdb53d4..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_user_offline.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_user_online.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_user_online.png
deleted file mode 100644
index 08b9c9d..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/ap_user_online.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_default.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_default.png
deleted file mode 100644
index 3e6ea84..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_default.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_locked.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_locked.png
deleted file mode 100644
index 2d1592f..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_locked.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_new_posts.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_new_posts.png
deleted file mode 100644
index 761c6f5..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/forum_list_new_posts.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/pager_bg.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/pager_bg.png
deleted file mode 100644
index 7ca1413..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/pager_bg.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_delete.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_delete.png
deleted file mode 100644
index 3f9406e..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_delete.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_edit.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_edit.png
deleted file mode 100644
index bf35d79..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_edit.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_quote.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_quote.png
deleted file mode 100644
index a3c39f8..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_quote.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_reply.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_reply.png
deleted file mode 100644
index ba2c9a6..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/post_reply.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_first_unread_post.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_first_unread_post.png
deleted file mode 100644
index aa7cbb9..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_first_unread_post.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_last_post.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_last_post.png
deleted file mode 100644
index aa7cbb9..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_last_post.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_closed.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_closed.png
deleted file mode 100644
index 26c4c1b..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_closed.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_default.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_default.png
deleted file mode 100644
index d7cf853..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_default.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_hot.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_hot.png
deleted file mode 100644
index 6f61d0c..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_hot.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_hot_new.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_hot_new.png
deleted file mode 100644
index e31deae..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_hot_new.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_new.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_new.png
deleted file mode 100644
index e7f93ea..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_new.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_sticky.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_sticky.png
deleted file mode 100644
index 9f9f0e6..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_list_sticky.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_locked.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_locked.png
deleted file mode 100644
index 1a74108..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_locked.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_reply.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_reply.png
deleted file mode 100644
index fbb4ce0..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_reply.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_top.png b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_top.png
deleted file mode 100644
index b3d9cef..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/images/topic_top.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/silver_bells.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/silver_bells.info
deleted file mode 100644
index 6c721e7..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells/silver_bells.info
+++ /dev/null
@@ -1,12 +0,0 @@
-
-name = Silver Bells
-description = Shades of grey and white.
-version = 2.x
-base style = naked
-
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells_stacked/advanced_forum.silver_bells_stacked.style.css b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells_stacked/advanced_forum.silver_bells_stacked.style.css
deleted file mode 100644
index a9b8343..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells_stacked/advanced_forum.silver_bells_stacked.style.css
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/* Since this style inherits from Silver Bells, only a few adjustments are
- needed to account for having the Author Pane on top.
-*/
-
-/* Reset styles not needed with AP on top */
-.forum-post-info {
- margin-bottom: 0;
-}
-
-.forum-post-wrapper {
- background-color: transparent;
-}
-
-.forum-post-panel-main,
-.forum-post-links {
- background-color: transparent;
- border-left: none;
-}
-
-/* Add in our AP styling */
-.forum-post-panel-sub {
- background-color: #F5F5F5;
- border-bottom: 1px solid #C1C1C1;
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells_stacked/silver_bells_stacked.info b/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells_stacked/silver_bells_stacked.info
deleted file mode 100644
index f560e6f..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/advanced_forum/styles/silver_bells_stacked/silver_bells_stacked.info
+++ /dev/null
@@ -1,14 +0,0 @@
-
-name = Silver Bells Stacked
-description = Shades of grey and white with bells. Author Pane on top.
-version = 2.x
-base style = silver_bells
-extra style = naked_stacked
-
-
-; Information added by drupal.org packaging script on 2011-03-29
-version = "6.x-2.0-alpha4"
-core = "6.x"
-project = "advanced_forum"
-datestamp = "1301361967"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/CHANGELOG b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/CHANGELOG
deleted file mode 100644
index 99f614b..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/CHANGELOG
+++ /dev/null
@@ -1,49 +0,0 @@
-OAuth 6.x-3.0-beta4, 2011-04-06
-------------------------------
-by voxpelli: Better coding style
-#1002482 by voxpelli: Large database refactoring focused on basing relations on internal id numbers
-by voxpelli: Improved nonces, nonces can now be longer and too long nonces will throw errors
-by voxpelli: Removed consumer UI as it became complicated with new DB and there's no apparent need for it
-by voxpelli: Updated to use Autoload 6.x-2.0:s D7 backport for specifying included classes
-by voxpelli: Don't show key/secret on consumer adding
-#1017220 by voxpelli: Deactivated body_hash-checking when Inpustream isn't installed
-#1024812 by voxpelli: Fix for deleting consumer
-#857584 by voxpelli: Make SHA1 the default signature method in client
-
-OAuth 6.x-3.0-beta3, 2010-11-05
-------------------------------
-by voxpelli: Fixed user consumer listing
-by hugowetterberg: Fixed handling of empty and 'oob' callback urls.
-by SimmeLj, voxpelli: Added removal of old non-used nonces on cron
-#899506 by nicholasThompson, ezra-g: Fixed missing class in oauth_common_autoload_info()
-by voxpelli: Fixed bug assigning context to OAuthServer
-by voxpelli: Code cleanup
-by voxpelli: Made inputstream a suggestion instead of a dependency
-by voxpelli: Made ctools an optional recommendation instead of a dependency
-by voxpelli: Changed to use API-version in ctools exports
-
-OAuth 6.x-3.0-beta2, 2010-07-18
-------------------------------
-by voxpelli: Fixed non-used default access endpoint in client
-by voxpelli: Updated the OAuth library
-#749920 by twom, voxpelli: Fixed character limits for tokens, secrets and keys
-#849832 by Jose Reyero, voxpelli: Fixed use of signatureMethod() in client
-by voxpelli: Added possibility to provide default signature method
-by voxpelli: Fixed the saving of a token when a provider reuses it
-by voxpelli: Added support for authentication realms
-by voxpelli: Changed token requests to use POST method as default
-by voxpelli: Added the possibility of defining endpoints as full URL:s
-by voxpelli: Added OAuth 1.0a support in the client
-by voxpelli: Added possibility to provide a default authentication realm
-#849832 by Jose Reyero: Fixed proper visibility for DrupalOAuthClient properties/methods
-#835824 by Schnitzel, voxpelli: Changed OAuthSignatureMethod_HMAC_SHA1 to OAuthSignatureMethod_HMAC
-by voxpelli: Changed the class for the plaintext signature method in autoload
-by voxpelli: Refactored some DrupalOAuthClient functions for consistency and flexibility
-#846744 by alex_b, voxpelli: Fixed notice when deleting user
-#846734 by alex_b: Fixed undefined variable: provider_consumer
-#773264 by toemaz: Fixed absolute url as destination in _oauth_common_authorize()
-#743638 by toemaz, voxpelli: Fixed failed upgrade oauth_common_update_6100
-
-OAuth 6.x-3.0-beta1, 2010-05-20
-------------------------------
-by Hugo Wetterberg: First release under the project name "OAuth"
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/LICENSE.txt b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/LICENSE.txt
deleted file mode 100644
index 2c095c8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/LICENSE.txt
+++ /dev/null
@@ -1,274 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-
- Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
-Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
-verbatim copies of this license document, but changing it is not allowed.
-
- Preamble
-
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public License
-applies to most of the Free Software Foundation's software and to any other
-program whose authors commit to using it. (Some other Free Software
-Foundation software is covered by the GNU Library General Public License
-instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this service if
-you wish), that you receive source code or can get it if you want it, that you
-can change the software or use pieces of it in new free programs; and that
-you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have. You must make
-sure that they, too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If the
-software is modified by someone else and passed on, we want its recipients
-to know that what they have is not the original, so that any problems
-introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
- MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms
-of this General Public License. The "Program", below, refers to any such
-program or work, and a "work based on the Program" means either the
-Program or any derivative work under copyright law: that is to say, a work
-containing the Program or a portion of it, either verbatim or with
-modifications and/or translated into another language. (Hereinafter, translation
-is included without limitation in the term "modification".) Each licensee is
-addressed as "you".
-
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made
-by running the Program). Whether that is true depends on what the Program
-does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it,
-thus forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you
-also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that
-you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or in
-part contains or is derived from the Program or any part thereof, to be
-licensed as a whole at no charge to all third parties under the terms of this
-License.
-
-c) If the modified program normally reads commands interactively when run,
-you must cause it, when started running for such interactive use in the most
-ordinary way, to print or display an announcement including an appropriate
-copyright notice and a notice that there is no warranty (or else, saying that
-you provide a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this License.
-(Exception: if the Program itself is interactive but does not normally print such
-an announcement, your work based on the Program is not required to print
-an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be
-reasonably considered independent and separate works in themselves, then
-this License, and its terms, do not apply to those sections when you distribute
-them as separate works. But when you distribute the same sections as part
-of a whole which is a work based on the Program, the distribution of the
-whole must be on the terms of this License, whose permissions for other
-licensees extend to the entire whole, and thus to each and every part
-regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to
-work written entirely by you; rather, the intent is to exercise the right to
-control the distribution of derivative or collective works based on the
-Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the scope
-of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1
-and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source
-code, which must be distributed under the terms of Sections 1 and 2 above
-on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give
-any third party, for a charge no more than your cost of physically performing
-source distribution, a complete machine-readable copy of the corresponding
-source code, to be distributed under the terms of Sections 1 and 2 above on
-a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for
-noncommercial distribution and only if you received the program in object
-code or executable form with such an offer, in accord with Subsection b
-above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation and
-installation of the executable. However, as a special exception, the source
-code distributed need not include anything that is normally distributed (in
-either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the
-source code from the same place counts as distribution of the source code,
-even though third parties are not compelled to copy the source along with the
-object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy,
-modify, sublicense or distribute the Program is void, and will automatically
-terminate your rights under this License. However, parties who have received
-copies, or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the
-Program or its derivative works. These actions are prohibited by law if you
-do not accept this License. Therefore, by modifying or distributing the
-Program (or any work based on the Program), you indicate your acceptance
-of this License to do so, and all its terms and conditions for copying,
-distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these terms and
-conditions. You may not impose any further restrictions on the recipients'
-exercise of the rights granted herein. You are not responsible for enforcing
-compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License. If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices. Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose
-that choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded. In such
-case, this License incorporates the limitation as if written in the body of this
-License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will be
-similar in spirit to the present version, but may differ in detail to address new
-problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-a version number of this License which applies to it and "any later version",
-you have the option of following the terms and conditions either of that
-version or of any later version published by the Free Software Foundation. If
-the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we sometimes make
-exceptions for this. Our decision will be guided by the two goals of
-preserving the free status of all derivatives of our free software and of
-promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
-PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
-AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
-ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
-LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE
-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
-OR DATA BEING RENDERED INACCURATE OR LOSSES
-SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
-IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/README b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/README
deleted file mode 100644
index b6a3fde..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/README
+++ /dev/null
@@ -1,5 +0,0 @@
-OAuth implements the OAuth classes for use with Drupal and acts as a support module for other modules that wish to use OAuth.
-
-OAuth Client flow:
-
-The callback to be used is /oauth/authorized/% where % is the id of the consumer used by the client. We need the id of the consumer to be able to find the token correctly.
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/css/admin.css b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/css/admin.css
deleted file mode 100644
index 374342c..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/css/admin.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.oauth-common-left-panel {
- float: left;
- width: 50%;
-}
-
-.oauth-common-right-panel {
- float: right;
- width: 49.9%;
-}
-
-.oauth-common-auth-level {
- border-bottom: 1px solid #999999;
- margin-bottom: 1em;
-}
-
-.oauth-common-auth-level > div .form-item:first-child {
- margin-top: 0;
-}
-
-.oauth-common-auth-level .clear {
- clear: both;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthClient.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthClient.inc
deleted file mode 100644
index d0a7429..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthClient.inc
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-
-class DrupalOAuthClient {
- public $version = OAUTH_COMMON_VERSION_1_RFC;
-
- protected $consumer;
- protected $requestToken;
- protected $accessToken;
- protected $signatureMethod;
-
- /**
- * Creates an instance of the DrupalOAuthClient.
- *
- * @param DrupalOAuthConsumer $consumer
- * The consumer.
- * @param OAuthToken $request_token
- * Optional. A request token to use.
- * @param OAuthSignatureMethod $signature_method
- * Optional. The signature method to use.
- * @param integer $version
- * Optional. The version to use - either OAUTH_COMMON_VERSION_1_RFC or OAUTH_COMMON_VERSION_1.
- */
- public function __construct($consumer, $request_token = NULL, $signature_method = NULL, $version = NULL) {
- $this->consumer = $consumer;
- $this->requestToken = $request_token;
- $this->signatureMethod = $signature_method;
-
- if ($version) {
- $this->version = $version;
- }
-
- // Set to the default signature method if no method was specified
- if (!$this->signatureMethod) {
- if (!empty($this->consumer->configuration['signature_method'])) {
- $signature_method = substr(strtolower($this->consumer->configuration['signature_method']), 5);
- }
- else {
- $signature_method = 'SHA1';
- }
- $this->signatureMethod = self::signatureMethod($signature_method);
- }
- }
-
- /**
- * Convenience function to get signing method implementations.
- *
- * @param string $method
- * Optional. The hmac hashing algorithm to use. Defaults to 'sha512' which
- * has superseded sha1 as the recommended alternative.
- * @param bool $fallback_to_sha1
- * Optional. Whether sha1 should be used as a fallback if the selected
- * hashing algorithm is unavailable.
- * @return OAuthSignatureMethod
- * The signature method object.
- */
- public static function signatureMethod($method = 'SHA1', $fallback_to_sha1 = TRUE) {
- $sign = NULL;
-
- if (in_array(drupal_strtolower($method), hash_algos())) {
- $sign = new OAuthSignatureMethod_HMAC($method);
- }
- else if ($fallback_to_sha1) {
- $sign = new OAuthSignatureMethod_HMAC('SHA1');
- }
-
- return $sign;
- }
-
- /**
- * Gets a request token from the provider.
- *
- * @param string $endpoint
- * Optional. The endpoint path for the provider.
- * - If you provide the full URL (e.g. "http://example.com/oauth/request_token"),
- * then it will be used.
- * - If you provide only the path (e.g. "oauth/request_token"), it will
- * be converted into a full URL by prepending the provider_url.
- * - If you provide nothing it will default to '/oauth/request_token'.
- * @param array $options
- * An associative array of additional optional options, with the following keys:
- * - 'params'
- * An associative array of parameters that should be included in the
- * request.
- * - 'realm'
- * A string to be used as the http authentication realm in the request.
- * - 'get' (default FALSE)
- * Whether to use GET as the HTTP-method instead of POST.
- * - 'callback'
- * A full URL of where the user should be sent after the request token
- * has been authorized.
- * Only used by versions higher than OAUTH_COMMON_VERSION_1.
- * @return DrupalOAuthToken
- * The returned request token.
- */
- public function getRequestToken($endpoint = NULL, $options = array()) {
- if ($this->requestToken) {
- return clone $this->requestToken;
- }
-
- $options += array(
- 'params' => array(),
- 'realm' => NULL,
- 'get' => FALSE,
- 'callback' => NULL,
- );
-
- if (empty($endpoint)) {
- if (!empty($this->consumer->configuration['request_endpoint'])) {
- $endpoint = $this->consumer->configuration['request_endpoint'];
- }
- else {
- $endpoint = '/oauth/request_token';
- }
- }
- if ($this->version > OAUTH_COMMON_VERSION_1) {
- $options['params']['oauth_callback'] = $options['callback'] ? $options['callback'] : 'oob';
- }
-
- $response = $this->get($endpoint, array(
- 'params' => $options['params'],
- 'realm' => $options['realm'],
- 'get' => $options['get'],
- ));
-
- $params = array();
- parse_str($response, $params);
-
- if (empty($params['oauth_token']) || empty($params['oauth_token_secret'])) {
- throw new Exception('No valid request token was returned');
- }
-
- if ($this->version > OAUTH_COMMON_VERSION_1 && empty($params['oauth_callback_confirmed'])) {
- $this->version = OAUTH_1;
- }
-
- $this->requestToken = new DrupalOAuthToken($params['oauth_token'], $params['oauth_token_secret'], $this->consumer, array(
- 'type' => OAUTH_COMMON_TOKEN_TYPE_REQUEST,
- 'version' => $this->version,
- ));
-
- return clone $this->requestToken;
- }
-
- /**
- * Constructs the url that the user should be sent to to authorize the
- * request token.
- *
- * @param string $endpoint
- * Optional. The endpoint path for the provider.
- * - If you provide the full URL (e.g. "http://example.com/oauth/authorize"),
- * then it will be used.
- * - If you provide only the path (e.g. "oauth/authorize"), it will
- * be converted into a full URL by prepending the provider_url.
- * - If you provide nothing it will default to '/oauth/authorize'.
- * @param array $options
- * An associative array of additional optional options, with the following keys:
- * - 'params'
- * An associative array of parameters that should be included in the
- * request.
- * - 'callback'
- * A full URL of where the user should be sent after the request token
- * has been authorized.
- * Only used by version OAUTH_COMMON_VERSION_1.
- * @return string
- * The url.
- */
- public function getAuthorizationUrl($endpoint = NULL, $options = array()) {
- $options += array(
- 'params' => array(),
- 'callback' => NULL,
- );
-
- if (empty($endpoint)) {
- if (!empty($this->consumer->configuration['authorization_endpoint'])) {
- $endpoint = $this->consumer->configuration['authorization_endpoint'];
- }
- else {
- $endpoint = '/oauth/authorize';
- }
- }
- if ($this->version == OAUTH_COMMON_VERSION_1 && $options['callback']) {
- $options['params']['oauth_callback'] = $options['callback'];
- }
- $options['params']['oauth_token'] = $this->requestToken->key;
-
- $endpoint = $this->getAbsolutePath($endpoint);
- $append_query = strpos($endpoint, '?') === FALSE ? '?' : '&';
- return $endpoint . $append_query . http_build_query($options['params'], NULL, '&');
- }
-
- /**
- * Fetches the access token using the request token.
- *
- * @param string $endpoint
- * Optional. The endpoint path for the provider.
- * - If you provide the full URL (e.g. "http://example.com/oauth/access_token"),
- * then it will be used.
- * - If you provide only the path (e.g. "oauth/access_token"), it will
- * be converted into a full URL by prepending the provider_url.
- * - If you provide nothing it will default to '/oauth/access_token'.
- * @param array $options
- * An associative array of additional optional options, with the following keys:
- * - 'params'
- * An associative array of parameters that should be included in the
- * request.
- * - 'realm'
- * A string to be used as the http authentication realm in the request.
- * - 'get' (default FALSE)
- * Whether to use GET as the HTTP-method instead of POST.
- * - 'verifier'
- * A string containing a verifier for he user from the provider.
- * Only used by versions higher than OAUTH_COMMON_VERSION_1.
- * @return DrupalOAuthToken
- * The access token.
- */
- public function getAccessToken($endpoint = NULL, $options = array()) {
- if ($this->accessToken) {
- return clone $this->accessToken;
- }
-
- $options += array(
- 'params' => array(),
- 'realm' => NULL,
- 'get' => FALSE,
- 'verifier' => NULL,
- );
-
- if (empty($endpoint)) {
- if (!empty($this->consumer->configuration['access_endpoint'])) {
- $endpoint = $this->consumer->configuration['access_endpoint'];
- }
- else {
- $endpoint = '/oauth/access_token';
- }
- }
- if ($this->version > OAUTH_COMMON_VERSION_1 && $options['verifier'] !== NULL) {
- $options['params']['oauth_verifier'] = $options['verifier'];
- }
-
- $response = $this->get($endpoint, array(
- 'token' => TRUE,
- 'params' => $options['params'],
- 'realm' => $options['realm'],
- 'get' => $options['get'],
- ));
-
- $params = array();
- parse_str($response, $params);
-
- if (empty($params['oauth_token']) || empty($params['oauth_token_secret'])) {
- throw new Exception('No valid access token was returned');
- }
-
- // Check if we've has recieved this token previously and if so use the old one
- //TODO: Is this safe!? What if eg. multiple users are getting the same access token from the provider?
- $this->accessToken = DrupalOAuthToken::loadByKey($params['oauth_token'], $this->consumer);
- //TODO: Can a secret change even though the token doesn't? If so it needs to be changed.
- if (!$this->accessToken) {
- $this->accessToken = new DrupalOAuthToken($params['oauth_token'], $params['oauth_token_secret'], $this->consumer, array(
- 'type' => OAUTH_COMMON_TOKEN_TYPE_ACCESS,
- ));
- }
-
- return clone $this->accessToken;
- }
-
- /**
- * Make an OAuth request.
- *
- * @param string $path
- * The path being requested.
- * - If you provide the full URL (e.g. "http://example.com/oauth/request_token"),
- * then it will be used.
- * - If you provide only the path (e.g. "oauth/request_token"), it will
- * be converted into a full URL by prepending the provider_url.
- * @param array $options
- * An associative array of additional options, with the following keys:
- * - 'token' (default FALSE)
- * Whether a token should be used or not.
- * - 'params'
- * An associative array of parameters that should be included in the
- * request.
- * - 'realm'
- * A string to be used as the http authentication realm in the request.
- * - 'get' (default FALSE)
- * Whether to use GET as the HTTP-method instead of POST.
- * @return string
- * a string containing the response body.
- */
- protected function get($path, $options = array()) {
- $options += array(
- 'token' => FALSE,
- 'params' => array(),
- 'realm' => NULL,
- 'get' => FALSE,
- );
-
- if (empty($options['realm']) && !empty($this->consumer->configuration['authentication_realm'])) {
- $options['realm'] = $this->consumer->configuration['authentication_realm'];
- }
-
- $token = $options['token'] ? $this->requestToken : NULL;
- $path = $this->getAbsolutePath($path);
-
- $req = OAuthRequest::from_consumer_and_token($this->consumer, $token,
- $options['get'] ? 'GET' : 'POST', $path, $options['params']);
- $req->sign_request($this->signatureMethod, $this->consumer, $token);
-
- $url = $req->get_normalized_http_url();
- $params = array();
- foreach ($req->get_parameters() as $param_key => $param_value) {
- if (substr($param_key, 0, 5) != 'oauth') {
- $params[$param_key] = $param_value;
- }
- }
- if (!empty($params)) {
- $url .= '?' . http_build_query($params);
- }
-
- $headers = array(
- 'Accept: application/x-www-form-urlencoded',
- $req->to_header($options['realm']),
- );
-
- $ch = curl_init();
- curl_setopt($ch, CURLOPT_URL, $url);
- if (!$options['get']) {
- curl_setopt($ch, CURLOPT_POST, 1);
- curl_setopt($ch, CURLOPT_POSTFIELDS, '');
- }
- $oauth_version = _oauth_common_version();
- curl_setopt($ch, CURLOPT_USERAGENT, 'Drupal/' . VERSION . ' OAuth/' . $oauth_version);
- curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
- curl_setopt($ch, CURLOPT_HEADER, 1);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
- $response = curl_exec($ch);
- $error = curl_error($ch);
- curl_close($ch);
-
- if ($error) {
- throw new Exception($error);
- }
-
- $result = $this->interpretResponse($response);
- if ($result->responseCode != 200) {
- throw new Exception('Failed to fetch data from url "' . $path . '" (HTTP response code ' . $result->responseCode . ' ' . $result->responseMessage . '): ' . $result->body, $result->responseCode);
- }
-
- return $result->body;
- }
-
- /**
- * Makes sure a path is an absolute path
- *
- * Prepends provider url if the path isn't absolute.
- *
- * @param string $path
- * The path to make absolute.
- * @return string
- * The absolute path.
- */
- protected function getAbsolutePath($path) {
- $protocols = array(
- 'http',
- 'https'
- );
- $protocol = strpos($path, '://');
- $protocol = $protocol ? substr($path, 0, $protocol) : '';
- if (!in_array($protocol, $protocols)) {
- $path = $this->consumer->configuration['provider_url'] . $path;
- }
- return $path;
- }
-
- protected function interpretResponse($res) {
- list($headers, $body) = preg_split('/\r\n\r\n/', $res, 2);
-
- $obj = (object) array(
- 'headers' => $headers,
- 'body' => $body,
- );
-
- $matches = array();
- if (preg_match('/HTTP\/1.\d (\d{3}) (.*)/', $headers, $matches)) {
- $obj->responseCode = trim($matches[1]);
- $obj->responseMessage = trim($matches[2]);
-
- // Handle HTTP/1.1 100 Continue
- if ($obj->responseCode == 100) {
- return $this->interpretResponse($body);
- }
- }
-
- return $obj;
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthConsumer.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthConsumer.inc
deleted file mode 100644
index 7a92a65..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthConsumer.inc
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-class DrupalOAuthConsumer extends OAuthConsumer {
- public $csid = 0;
-
- public $uid = 0;
- public $name = '';
- public $context = '';
- public $created = 0;
- public $changed = 0;
- public $callback_url = 'oob';
- public $configuration = array();
-
- public $provider_consumer = FALSE;
- public $in_database = FALSE;
-
- function __construct($key, $secret, $params = array()) {
- // Backwards compatibility with 6.x-3.0-beta3
- if (is_string($params)) {
- $callback_url = $params;
- if (func_num_args() > 4) {
- $params = func_get_arg(4);
- }
- else {
- $params = array();
- }
- $params['callback_url'] = $callback_url;
- }
-
- foreach ($params as $param_key => $value) {
- if (isset($this->$param_key)) {
- $this->$param_key = $value;
- }
- }
-
- if (!empty($this->created)) {
- $this->provider_consumer = TRUE;
- }
-
- parent::__construct($key, $secret, $this->callback_url);
- }
-
- /**
- * Writes the consumer to the database
- *
- * @return void
- */
- public function write() {
- $update = !empty($this->csid);
- $primary = $update ? array('csid') : array();
-
- if ($this->provider_consumer) {
- $this->changed = time();
-
- $values = array(
- 'consumer_key' => $this->key,
- 'created' => $this->created,
- 'changed' => $this->changed,
- 'uid' => $this->uid,
- 'name' => $this->name,
- 'context' => $this->context,
- 'callback_url' => $this->callback_url,
- );
-
- if ($update) {
- $values['csid'] = $this->csid;
- }
- else {
- $this->created = time();
- $values['created'] = $this->created;
- }
-
- $ready = drupal_write_record('oauth_common_provider_consumer', $values, $primary);
-
- if (!$ready) {
- throw new OAuthException("Couldn't save consumer");
- }
- }
-
- $values = array(
- 'key_hash' => sha1($this->key),
- 'consumer_key' => $this->key,
- 'secret' => $this->secret,
- 'configuration' => serialize(empty($this->configuration) ? array() : $this->configuration),
- );
-
- if ($update) {
- $values['csid'] = $this->csid;
- }
-
- drupal_write_record('oauth_common_consumer', $values, $primary);
-
- $this->csid = $values['csid'];
- $this->in_database = TRUE;
-
- if (!$update) {
- $values = array(
- 'csid' => $this->csid,
- 'consumer_key' => $this->key,
- );
- drupal_write_record('oauth_common_provider_consumer', $values, array('consumer_key'));
- }
- }
-
- /**
- * Deletes the consumer from the database
- *
- * @return void
- */
- public function delete() {
- self::deleteConsumer($this->csid);
- }
-
- /**
- * Deletes the consumer with the id from the database.
- *
- * @param string $csid
- * The consumer id.
- * @return void
- */
- public static function deleteConsumer($csid) {
- //TODO: Add compatibility layer?
- db_query("DELETE c, pc, t, pt FROM {oauth_common_consumer} c
- LEFT JOIN {oauth_common_provider_consumer} pc ON pc.csid = c.csid
- LEFT JOIN {oauth_common_token} t ON t.csid = c.csid
- LEFT JOIN {oauth_common_provider_token} pt ON pt.tid = t.tid
- WHERE c.csid = %d", array(
- ':csid' => $csid,
- ));
- }
-
- /**
- * Deprecated - Gets the consumer with the specified key
- *
- * @param string $key
- * The key of the consumer to get
- * @param bool $provider_consumer
- * Optional. Whether the consumer we're about to load is a provider or
- * consumer consumer. Defaults to TRUE.
- * @return DrupalOAuthConsumer
- * The loaded consumer object or FALSE if load failed
- */
- public static function load($key, $provider_consumer = TRUE) {
- return DrupalOAuthConsumer::loadProviderByKey($key, $provider_consumer);
- }
-
- /**
- * Gets a provider consumer with the specified id
- *
- * @param int $id
- * The id of the consumer to get
- * @param boolean $load_provider_data
- * Whether to load provider related data or not
- * @return DrupalOAuthConsumer
- * The loaded consumer object or FALSE if load failed
- */
- public static function loadById($csid, $load_provider_data = TRUE) {
- $fields = 'c.csid, c.consumer_key, c.secret, c.configuration';
- $join = '';
-
- if ($load_provider_data) {
- $fields .= ', pc.created, pc.changed, pc.uid, pc.name, pc.context, pc.callback_url';
- $join = 'LEFT JOIN {oauth_common_provider_consumer} pc ON pc.csid = c.csid';
- }
-
- return self::fromResult(db_query("SELECT " . $fields . " FROM {oauth_common_consumer} c " . $join . " WHERE c.csid = %d", array(
- ':csid' => $csid,
- )));
- }
-
- /**
- * Gets a provider consumer with the specified key
- *
- * @param string $key
- * The key of the consumer to get
- * @param boolean $provider
- * Used internally for backwards compatibility with ::load()
- * @return DrupalOAuthConsumer
- * The loaded consumer object or FALSE if load failed
- */
- public static function loadProviderByKey($key, $provider = TRUE) {
- // Only INNER supported - LEFT is only for backwards compatability with deprecated DrupalOAuthConsumer::load() from 6.x-3.0-beta3
- $join = $provider ? 'INNER' : 'LEFT';
- // For backwards compatibility with deprecated DrupalOAuthConsumer::load() from 6.x-3.0-beta3
- $where = $provider ? '' : ' AND pc.csid IS NULL';
- // For backwards compatibility with deprecated DrupalOAuthConsumer::load() from 6.x-3.0-beta3
- $fields = $provider ? 'pc.*, c.secret, c.configuration' : 'c.csid, c.consumer_key, c.secret, c.configuration, pc.created, pc.changed, pc.uid, pc.name, pc.context, pc.callback_url';
-
- $query = "SELECT " . $fields . " FROM {oauth_common_consumer} c " . $join . " JOIN {oauth_common_provider_consumer} pc ON pc.csid = c.csid WHERE c.key_hash = '%s'" . $where;
- return self::fromResult(db_query($query, array(
- ':key_hash' => sha1($key),
- )));
- }
-
- /**
- * Constructs a consumer from a db-result resource
- *
- * @param resource $res
- * A database result resource
- * @return DrupalOAuthConsumer
- * The constructed consumer object or NULL if no rows could be read or construction failed
- */
- public static function fromResult($res) {
- //TODO: Ensure this works with old inputs?
- if ($data = db_fetch_array($res)) {
- if (!empty($data['configuration'])) {
- $data['configuration'] = unserialize($data['configuration']);
- }
- $data['in_database'] = TRUE;
- return new DrupalOAuthConsumer($data['consumer_key'], $data['secret'], $data);
- }
- return NULL;
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthDataStore.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthDataStore.inc
deleted file mode 100644
index 31d3ee1..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthDataStore.inc
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * Database abstraction class
- */
-class DrupalOAuthDataStore extends OAuthDataStore {
- private $context;
-
- public function __construct($context) {
- $this->context = $context;
- }
-
- /**
- * Check if consumer exists from a given consumer key.
- *
- * @param string $consumer_key
- * The consumer key.
- * @param bool $provider_consumer
- * Whether the consumer should be a provider consumer
- * @return OAuthConsumer
- * The consumer
- * @throws OAuthException
- * An exception is thrown when the consumer cannot be found
- */
- public function lookup_consumer($consumer_key, $provider_consumer = TRUE) {
- $consumer = DrupalOAuthConsumer::loadProviderByKey($consumer_key);
- if (!$consumer) {
- throw new OAuthException('Consumer not found');
- }
- return $consumer;
- }
-
- /**
- * Check if the token exists.
- *
- * @param OAuthConsumer $consumer
- * The consumer.
- * @param string $token_type
- * The type of the token: 'request' or 'access'.
- * @param string $token
- * The token key.
- * @return DrupalOauthToken
- * The matching token
- * @throws OAuthException
- * An exception is thrown when the token cannot be found or doesn't match
- */
- public function lookup_token($consumer, $token_type, $token) {
- $type = ($token_type == 'request' ? OAUTH_COMMON_TOKEN_TYPE_REQUEST : OAUTH_COMMON_TOKEN_TYPE_ACCESS);
- $token = DrupalOAuthToken::loadByKey($token, $consumer, $type);
- if (!$token) {
- throw new OAuthException('Token not found');
- }
- return $token;
- }
-
- /**
- * Check if the nonce value exists. If not, generate one.
- *
- * @param OAuthConsumer $consumer
- * The service consumer information with both key
- * and secret values.
- * @param OAuthToken $token
- * The current token.
- * @param string $nonce
- * A new nonce value, in case a one doesn't current exit.
- * @param int $timestamp
- * The current time.
- * @return string
- * The existing nonce value or NULL in
- * case it doesn't exist.
- */
- public function lookup_nonce($consumer, $token, $nonce, $timestamp) {
- if (strlen($nonce) > 255) {
- throw new OAuthException('Nonces may not be longer than 255 characters');
- }
-
- $stored_nonce = db_result(db_query(
- "SELECT nonce FROM {oauth_common_nonce}
- WHERE nonce = '%s' AND timestamp <= %d and token_key = '%s'", array(
- ':nonce' => $nonce,
- ':timestamp' => $timestamp,
- ':token_key' => $token ? $token->key : '',
- )));
-
- if (!$stored_nonce) {
- $values = array(
- 'nonce' => $nonce,
- 'timestamp' => $timestamp,
- 'token_key' => $token ? $token->key : '',
- );
- drupal_write_record('oauth_common_nonce', $values);
- return NULL;
- }
-
- return $stored_nonce;
- }
-
- /**
- * Generate a new request token.
- *
- * @param OAuthConsumer $consumer
- * The consumer to generate a token for.
- * @return DrupalOAuthToken
- * The request token
- */
- function new_request_token($consumer, $callback = NULL) {
- $token = new DrupalOAuthToken(user_password(32), user_password(32), $consumer, array(
- 'type' => OAUTH_COMMON_TOKEN_TYPE_REQUEST,
- 'uid' => 0,
- 'expires' => time() + variable_get('oauth_common_request_token_lifetime', 7200),
- ));
- $token->write();
- return $token;
- }
-
- /**
- * Generate a new access token and delete the old request token.
- *
- * @param DrupalOAuthToken $token_old
- * The old request token.
- * @param OAuthConsumer $consumer
- * The service consumer information.
- */
- function new_access_token($token_old, $consumer, $verifier = NULL) {
- module_load_include('inc', 'oauth_common');
-
- if ($token_old && $token_old->authorized) {
- $token_new = new DrupalOAuthToken(user_password(32), user_password(32), $consumer, array(
- 'type' => OAUTH_COMMON_TOKEN_TYPE_ACCESS,
- 'uid' => $token_old->uid,
- 'services' => isset($token_old->services) ? $token_old->services : NULL,
- 'authorized' => 1,
- ));
- $token_old->delete();
- $token_new->write();
- return $token_new;
- }
-
- throw new OAuthException('Invalid request token');
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthRequest.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthRequest.inc
deleted file mode 100644
index dce9158..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthRequest.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-class DrupalOAuthRequest extends OAuthRequest {
- /**
- * Creates a OAuthRequest object from the current request
- *
- * @param string $http_method
- * @param string $http_url
- * @param array $parameters
- * @return OAuthRequest
- * A OAuthRequest generated from the request
- */
- public static function from_request($http_method = NULL, $http_url = NULL, $parameters = NULL) {
- // Preparations that has to be made if we're going to detect parameters
- if ($parameters == NULL) {
- $qs = $_SERVER['QUERY_STRING'];
- $q = $_GET['q'];
-
- // Unset $_GET['q'] if it was created by a redirect
- if (isset($_SERVER['REDIRECT_URL'])) {
- $q = FALSE;
- }
- // Check that the q parameter hasn't been created or altered by drupal
- elseif (isset($_GET['q'])) {
- $get = array();
- parse_str($_SERVER['QUERY_STRING'], $get);
- // The q parameter was in the original request, make sure it hasn't been altered
- if (isset($get['q'])) {
- $q = $get['q'];
- }
- // The q parameter was set by drupal, unset it
- else {
- $q = FALSE;
- }
- }
-
- $parsed = array();
- parse_str($_SERVER['QUERY_STRING'], $parsed);
- if ($q === FALSE) {
- unset($parsed['q']);
- }
- else {
- $parsed['q'] = $q;
- }
- $_SERVER['QUERY_STRING'] = http_build_query($parsed, '', '&');
- }
- $req = parent::from_request($http_method, $http_url, $parameters);
-
- // Restore $_SERVER['QUERY_STRING'] if it was touched
- if (isset($qs)) {
- $_SERVER['QUERY_STRING'] = $qs;
- }
-
- return $req;
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthServer.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthServer.inc
deleted file mode 100644
index 90d24df..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthServer.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-class DrupalOAuthServer extends OAuthServer {
- public function __construct($context) {
- parent::__construct(new DrupalOAuthDataStore($context));
-
- if (isset($this->context->authorization_options['signature_methods'])) {
- $sig_methods = $this->context->authorization_options['signature_methods'];
- }
- else {
- $sig_methods = array('HMAC-SHA1', 'HMAC-SHA256', 'HMAC-SHA384', 'HMAC-SHA512');
- }
-
- foreach ($sig_methods as $signature_method) {
- if ($signature_method == 'PLAINTEXT') {
- $this->add_signature_method(new OAuthSignatureMethod_PLAINTEXT());
- }
- else {
- // Check if the system supports the hashing algorithm
- $algo = explode('-', $signature_method, 2);
- if ($algo[0] == 'HMAC' && in_array(strtolower($algo[1]), hash_algos())) {
- $this->add_signature_method(new OAuthSignatureMethod_HMAC($algo[1]));
- }
- }
- }
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthToken.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthToken.inc
deleted file mode 100644
index cc03805..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/DrupalOAuthToken.inc
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-class DrupalOAuthToken extends OAuthToken {
- public $tid = 0;
- public $expires = 0;
- public $type = OAUTH_COMMON_TOKEN_TYPE_REQUEST;
- public $uid = 0;
-
- public $created = 0;
- public $changed = 0;
- public $services = array();
- public $authorized = 0;
-
- public $in_database = FALSE;
-
- public function __construct($key, $secret, $consumer, $params = array()) {
- foreach ($params as $param_key => $value) {
- if (isset($this->$param_key)) {
- $this->$param_key = $value;
- }
- }
-
- // Backwards compatibility with 6.x-3.0-beta3
- if (empty($consumer) || is_array($consumer)) {
- if (is_array($consumer)) {
- $params = $consumer;
- }
- if (!empty($params['csid'])) {
- $consumer = DrupalOAuthConsumer::loadById($params['csid'], isset($params['services']));
- }
- }
-
- if (!is_object($consumer)) {
- throw new OAuthException("Needs an associated consumer");
- }
- else {
- $this->consumer = $consumer;
- }
-
- parent::__construct($key, $secret);
- }
-
- /**
- * Writes the token to the database
- *
- * @return void
- */
- public function write() {
- $update = !empty($this->tid);
-
- $primary = $update ? array('tid') : array();
-
- if ($this->consumer->provider_consumer) {
- $this->changed = time();
-
- $values = array(
- 'token_key' => $this->key,
- 'changed' => $this->changed,
- 'services' => json_encode($this->services),
- 'authorized' => $this->authorized,
- );
-
- if ($update) {
- $values['tid'] = $this->tid;
- }
- else {
- $this->created = time();
- $values['created'] = $this->created;
- }
-
- $ready = drupal_write_record('oauth_common_provider_token', $values, $primary);
-
- if (!$ready) {
- throw new OAuthException("Couldn't save token");
- }
- }
-
- $values = array(
- 'csid' => $this->consumer->csid,
- 'key_hash' => sha1($this->key),
- 'token_key' => $this->key,
- 'secret' => $this->secret,
- 'expires' => $this->expires,
- 'type' => $this->type,
- 'uid' => $this->uid,
- );
-
- if ($update) {
- $values['tid'] = $this->tid;
- }
-
- drupal_write_record('oauth_common_token', $values, $primary);
-
- $this->tid = $values['tid'];
- $this->in_database = TRUE;
-
- if (!$update) {
- $values = array(
- 'tid' => $this->tid,
- 'token_key' => $this->key,
- );
- drupal_write_record('oauth_common_provider_token', $values, array('token_key'));
- }
- }
-
- /**
- * Deletes the token from the database
- *
- * @return void
- */
- public function delete() {
- self::deleteToken($this->key, $this->consumer);
- }
-
- /**
- * Deletes the token with the key from the database
- *
- * @param string $key
- * The key of the token to delete.
- * @param object $consumer
- * The consumer for which to fetch a token
- * @return void
- */
- public static function deleteToken($key, $consumer) {
- //TODO: Ensure backwards compatibility
- db_query("DELETE t, pt FROM {oauth_common_token} t LEFT JOIN {oauth_common_provider_token} pt ON t.tid = pt.tid
- WHERE t.key_hash = '%s' AND t.csid = %d", array(
- ':key_hash' => sha1($key),
- ':consumer' => $consumer->csid,
- ));
- }
-
- /**
- * Deprecated - Gets the token with the specified key
- *
- * @param string $key
- * The key of the token to get
- * @param bool $provider_token
- * Whether the token to load is a provider token.
- * @return DrupalOAuthToken
- * The loaded token object or FALSE if load failed
- */
- public static function load($key, $provider_token = TRUE) {
- return DrupalOAuthToken::loadByKey($key, !$provider_token, FALSE);
- }
-
- /**
- * Gets the token with the specified key
- *
- * @param string $key
- * The key of the token to get
- * @param boolean|object $consumer
- * The consumer for which to fetch a token or FALSE to fetch a provider token
- * @param int $type
- * Used internally for backwards compatibility with ::load()
- * @return DrupalOAuthToken
- * The loaded token object or FALSE if load failed
- */
- public static function loadByKey($key, $consumer = FALSE, $type = OAUTH_COMMON_TOKEN_TYPE_ACCESS) {
- $fields = 't.*';
- $join = '';
- $where = "t.key_hash = '%s'";
- $values = array(
- ':key_hash' => sha1($key),
- );
-
- // Only add if defined - needed for backwards compatibility with deprecated DrupalOAuthToken::load() from 6.x-3.0-beta3
- if ($type !== FALSE) {
- $where .= ' AND t.type = %d';
- $values[':type'] = $type;
- }
-
- if (!$consumer || is_object($consumer) && $consumer->provider_consumer) {
- $fields .= ', pt.created, pt.changed, pt.services, pt.authorized';
- $join = 'INNER JOIN {oauth_common_provider_token} pt ON pt.tid = t.tid';
- }
-
- // Only fetch non-provider tokens - needed for backwards compatibility with deprecated DrupalOAuthToken::load() from 6.x-3.0-beta3
- if ($consumer === TRUE) {
- $join = 'LEFT JOIN {oauth_common_provider_token} pt ON pt.tid = t.tid';
- $where .= ' AND pt.tid IS NULL';
- }
- else if ($consumer) {
- $where .= ' AND t.csid = %d';
- $values[':consumer'] = $consumer->csid;
- }
-
- return self::fromResult(db_query("SELECT " . $fields . " FROM {oauth_common_token} t " . $join . " WHERE " . $where, $values), $consumer);
- }
-
- /**
- * Gets the token with the specified id
- *
- * @param int $id
- * The id of the token to get
- * @param boolean $load_provider_data
- * Whether to load provider related data or not
- * @return DrupalOAuthToken
- * The loaded token object or FALSE if load failed
- */
- public static function loadById($tid, $load_provider_data = TRUE) {
- $fields = 't.*';
- $join = '';
-
- if ($load_provider_data) {
- $fields .= ', pt.created, pt.changed, pt.services, pt.authorized';
- $join = 'INNER JOIN {oauth_common_provider_token} pt ON pt.tid = t.tid';
- }
-
- return self::fromResult(db_query("SELECT " . $fields . " FROM {oauth_common_token} t " . $join . " WHERE t.tid = %d", array(
- ':tid' => $tid,
- )));
- }
-
- /**
- * Constructs a token from a db-result resource
- *
- * @param resource $res
- * A database result resource
- * @return DrupalOAuthToken
- * The constructed token object or NULL if no rows could be read or construction failed
- */
- public static function fromResult($res, $consumer = FALSE) {
- //TODO: Ensure this works with old inputs?
- if ($data = db_fetch_array($res)) {
- if (isset($data['services'])) {
- $data['services'] = json_decode($data['services']);
- }
- $data['in_database'] = TRUE;
-
- if ($consumer && $consumer->csid == $data['csid']) {
- $token_consumer = $consumer;
- }
- else {
- $token_consumer = DrupalOAuthConsumer::loadById($data['csid'], isset($data['services']));
- }
-
- return new DrupalOAuthToken($data['token_key'], $data['secret'], $token_consumer, $data);
- }
- return NULL;
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/OAuthSignatureMethod_HMAC.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/OAuthSignatureMethod_HMAC.inc
deleted file mode 100644
index fd38748..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/includes/OAuthSignatureMethod_HMAC.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * A generic signature method implementation that leverages hash_hmac() for
- * increased flexibility.
- */
-class OAuthSignatureMethod_HMAC extends OAuthSignatureMethod {
- private $algo = NULL;
-
- /**
- * Create a HMAC oauth signature method object using the (or one of the)
- * specified algorithm implementations.
- *
- * @param mixed $algo
- * Pass the name of a algorithm supported by hash_hmac() or an array of
- * names when you have several candidate algorithms that may be used. The
- * first algorithm int the array that is supported on the system will be used.
- * @throws Exception
- * A exception is thrown when none of the provided algorithms are supported
- * by the system.
- */
- public function __construct($algo) {
- $algos = hash_algos();
- // Create a single-element array from strings to simplify the logic of
- // support checking and failure handling.
- if (is_string($algo)) {
- $algo = array($algo);
- }
-
- // Find a supported algorithm among the candidates
- foreach ($algo as $a) {
- if (in_array(strtolower($a), $algos)) {
- $this->algo = strtolower($a);
- continue;
- }
- }
- // Throw a exception if no matching algorithm can be found
- if (empty($this->algo)) {
- throw new Exception(t('None of the suggested hash algorithms (@cand) were '
- . 'supported by the server. Try one of the following: !algos.', array(
- '@cand' => join($algo, ', '),
- '!algos' => join($algos, ', '),
- )));
- }
- }
-
- public function get_name() {
- return "HMAC-" . strtoupper($this->algo);
- }
-
- public function build_signature($request, $consumer, $token) {
- $base_string = $request->get_signature_base_string();
- $request->base_string = $base_string;
-
- $key_parts = array(
- $consumer->secret,
- ($token) ? $token->secret : ""
- );
-
- $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
- $key = implode('&', $key_parts);
-
- return base64_encode(hash_hmac($this->algo, $base_string, $key, TRUE));
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/lib/LICENCE.txt b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/lib/LICENCE.txt
deleted file mode 100644
index 4c18538..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/lib/LICENCE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The OAuth php library is originally licensed under the MIT license. And is to be found at google code: http://code.google.com/p/oauth/
-
-I, the maintainer of this module, will NOT accept any patches to this library, that haven't been submitted to the original project first. This is to avoid any license hijacking, and to further the development of a common OAuth library for PHP.
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/lib/OAuth.php b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/lib/OAuth.php
deleted file mode 100644
index 4a56f0a..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/lib/OAuth.php
+++ /dev/null
@@ -1,882 +0,0 @@
-<?php
-// vim: foldmethod=marker
-
-/* Generic exception class
- */
-class OAuthException extends Exception {
- // pass
-}
-
-class OAuthConsumer {
- public $key;
- public $secret;
-
- function __construct($key, $secret, $callback_url=NULL) {
- $this->key = $key;
- $this->secret = $secret;
- $this->callback_url = $callback_url;
- }
-
- function __toString() {
- return "OAuthConsumer[key=$this->key,secret=$this->secret]";
- }
-}
-
-class OAuthToken {
- // access tokens and request tokens
- public $key;
- public $secret;
-
- /**
- * key = the token
- * secret = the token secret
- */
- function __construct($key, $secret) {
- $this->key = $key;
- $this->secret = $secret;
- }
-
- /**
- * generates the basic string serialization of a token that a server
- * would respond to request_token and access_token calls with
- */
- function to_string() {
- return "oauth_token=" .
- OAuthUtil::urlencode_rfc3986($this->key) .
- "&oauth_token_secret=" .
- OAuthUtil::urlencode_rfc3986($this->secret);
- }
-
- function __toString() {
- return $this->to_string();
- }
-}
-
-/**
- * A class for implementing a Signature Method
- * See section 9 ("Signing Requests") in the spec
- */
-abstract class OAuthSignatureMethod {
- /**
- * Needs to return the name of the Signature Method (ie HMAC-SHA1)
- * @return string
- */
- abstract public function get_name();
-
- /**
- * Build up the signature
- * NOTE: The output of this function MUST NOT be urlencoded.
- * the encoding is handled in OAuthRequest when the final
- * request is serialized
- * @param OAuthRequest $request
- * @param OAuthConsumer $consumer
- * @param OAuthToken $token
- * @return string
- */
- abstract public function build_signature($request, $consumer, $token);
-
- /**
- * Verifies that a given signature is correct
- * @param OAuthRequest $request
- * @param OAuthConsumer $consumer
- * @param OAuthToken $token
- * @param string $signature
- * @return bool
- */
- public function check_signature($request, $consumer, $token, $signature) {
- $built = $this->build_signature($request, $consumer, $token);
- return $built == $signature;
- }
-}
-
-/**
- * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]
- * where the Signature Base String is the text and the key is the concatenated values (each first
- * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&'
- * character (ASCII code 38) even if empty.
- * - Chapter 9.2 ("HMAC-SHA1")
- */
-class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
- function get_name() {
- return "HMAC-SHA1";
- }
-
- public function build_signature($request, $consumer, $token) {
- $base_string = $request->get_signature_base_string();
- $request->base_string = $base_string;
-
- $key_parts = array(
- $consumer->secret,
- ($token) ? $token->secret : ""
- );
-
- $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
- $key = implode('&', $key_parts);
-
- return base64_encode(hash_hmac('sha1', $base_string, $key, true));
- }
-}
-
-/**
- * The PLAINTEXT method does not provide any security protection and SHOULD only be used
- * over a secure channel such as HTTPS. It does not use the Signature Base String.
- * - Chapter 9.4 ("PLAINTEXT")
- */
-class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
- public function get_name() {
- return "PLAINTEXT";
- }
-
- /**
- * oauth_signature is set to the concatenated encoded values of the Consumer Secret and
- * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is
- * empty. The result MUST be encoded again.
- * - Chapter 9.4.1 ("Generating Signatures")
- *
- * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
- * OAuthRequest handles this!
- */
- public function build_signature($request, $consumer, $token) {
- $key_parts = array(
- $consumer->secret,
- ($token) ? $token->secret : ""
- );
-
- $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
- $key = implode('&', $key_parts);
- $request->base_string = $key;
-
- return $key;
- }
-}
-
-/**
- * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in
- * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for
- * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a
- * verified way to the Service Provider, in a manner which is beyond the scope of this
- * specification.
- * - Chapter 9.3 ("RSA-SHA1")
- */
-abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
- public function get_name() {
- return "RSA-SHA1";
- }
-
- // Up to the SP to implement this lookup of keys. Possible ideas are:
- // (1) do a lookup in a table of trusted certs keyed off of consumer
- // (2) fetch via http using a url provided by the requester
- // (3) some sort of specific discovery code based on request
- //
- // Either way should return a string representation of the certificate
- protected abstract function fetch_public_cert(&$request);
-
- // Up to the SP to implement this lookup of keys. Possible ideas are:
- // (1) do a lookup in a table of trusted certs keyed off of consumer
- //
- // Either way should return a string representation of the certificate
- protected abstract function fetch_private_cert(&$request);
-
- public function build_signature($request, $consumer, $token) {
- $base_string = $request->get_signature_base_string();
- $request->base_string = $base_string;
-
- // Fetch the private key cert based on the request
- $cert = $this->fetch_private_cert($request);
-
- // Pull the private key ID from the certificate
- $privatekeyid = openssl_get_privatekey($cert);
-
- // Sign using the key
- $ok = openssl_sign($base_string, $signature, $privatekeyid);
-
- // Release the key resource
- openssl_free_key($privatekeyid);
-
- return base64_encode($signature);
- }
-
- public function check_signature($request, $consumer, $token, $signature) {
- $decoded_sig = base64_decode($signature);
-
- $base_string = $request->get_signature_base_string();
-
- // Fetch the public key cert based on the request
- $cert = $this->fetch_public_cert($request);
-
- // Pull the public key ID from the certificate
- $publickeyid = openssl_get_publickey($cert);
-
- // Check the computed signature against the one passed in the query
- $ok = openssl_verify($base_string, $decoded_sig, $publickeyid);
-
- // Release the key resource
- openssl_free_key($publickeyid);
-
- return $ok == 1;
- }
-}
-
-class OAuthRequest {
- protected $parameters;
- protected $http_method;
- protected $http_url;
- // for debug purposes
- public $base_string;
- public static $version = '1.0';
- public static $POST_INPUT = 'php://input';
-
- function __construct($http_method, $http_url, $parameters=NULL) {
- $parameters = ($parameters) ? $parameters : array();
- $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
- $this->parameters = $parameters;
- $this->http_method = $http_method;
- $this->http_url = $http_url;
- }
-
-
- /**
- * attempt to build up a request from what was passed to the server
- */
- public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
- $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
- ? 'http'
- : 'https';
- $http_url = ($http_url) ? $http_url : $scheme .
- '://' . $_SERVER['HTTP_HOST'] .
- ':' .
- $_SERVER['SERVER_PORT'] .
- $_SERVER['REQUEST_URI'];
- $http_method = ($http_method) ? $http_method : $_SERVER['REQUEST_METHOD'];
-
- // We weren't handed any parameters, so let's find the ones relevant to
- // this request.
- // If you run XML-RPC or similar you should use this to provide your own
- // parsed parameter-list
- if (!$parameters) {
- // Find request headers
- $request_headers = OAuthUtil::get_headers();
-
- // Parse the query-string to find GET parameters
- $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
-
- // It's a POST request of the proper content-type, so parse POST
- // parameters and add those overriding any duplicates from GET
- if ($http_method == "POST"
- && isset($request_headers['Content-Type'])
- && strstr($request_headers['Content-Type'],
- 'application/x-www-form-urlencoded')
- ) {
- $post_data = OAuthUtil::parse_parameters(
- file_get_contents(self::$POST_INPUT)
- );
- $parameters = array_merge($parameters, $post_data);
- }
-
- // We have a Authorization-header with OAuth data. Parse the header
- // and add those overriding any duplicates from GET or POST
- if (isset($request_headers['Authorization']) && substr($request_headers['Authorization'], 0, 6) == 'OAuth ') {
- $header_parameters = OAuthUtil::split_header(
- $request_headers['Authorization']
- );
- $parameters = array_merge($parameters, $header_parameters);
- }
-
- }
-
- return new OAuthRequest($http_method, $http_url, $parameters);
- }
-
- /**
- * pretty much a helper function to set up the request
- */
- public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
- $parameters = ($parameters) ? $parameters : array();
- $defaults = array("oauth_version" => OAuthRequest::$version,
- "oauth_nonce" => OAuthRequest::generate_nonce(),
- "oauth_timestamp" => OAuthRequest::generate_timestamp(),
- "oauth_consumer_key" => $consumer->key);
- if ($token)
- $defaults['oauth_token'] = $token->key;
-
- $parameters = array_merge($defaults, $parameters);
-
- return new OAuthRequest($http_method, $http_url, $parameters);
- }
-
- public function set_parameter($name, $value, $allow_duplicates = true) {
- if ($allow_duplicates && isset($this->parameters[$name])) {
- // We have already added parameter(s) with this name, so add to the list
- if (is_scalar($this->parameters[$name])) {
- // This is the first duplicate, so transform scalar (string)
- // into an array so we can add the duplicates
- $this->parameters[$name] = array($this->parameters[$name]);
- }
-
- $this->parameters[$name][] = $value;
- } else {
- $this->parameters[$name] = $value;
- }
- }
-
- public function get_parameter($name) {
- return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
- }
-
- public function get_parameters() {
- return $this->parameters;
- }
-
- public function unset_parameter($name) {
- unset($this->parameters[$name]);
- }
-
- /**
- * The request parameters, sorted and concatenated into a normalized string.
- * @return string
- */
- public function get_signable_parameters() {
- // Grab all parameters
- $params = $this->parameters;
-
- // Remove oauth_signature if present
- // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
- if (isset($params['oauth_signature'])) {
- unset($params['oauth_signature']);
- }
-
- return OAuthUtil::build_http_query($params);
- }
-
- /**
- * Returns the base string of this request
- *
- * The base string defined as the method, the url
- * and the parameters (normalized), each urlencoded
- * and the concated with &.
- */
- public function get_signature_base_string() {
- $parts = array(
- $this->get_normalized_http_method(),
- $this->get_normalized_http_url(),
- $this->get_signable_parameters()
- );
-
- $parts = OAuthUtil::urlencode_rfc3986($parts);
-
- return implode('&', $parts);
- }
-
- /**
- * just uppercases the http method
- */
- public function get_normalized_http_method() {
- return strtoupper($this->http_method);
- }
-
- /**
- * parses the url and rebuilds it to be
- * scheme://host/path
- */
- public function get_normalized_http_url() {
- $parts = parse_url($this->http_url);
-
- $scheme = (isset($parts['scheme'])) ? $parts['scheme'] : 'http';
- $port = (isset($parts['port'])) ? $parts['port'] : (($scheme == 'https') ? '443' : '80');
- $host = (isset($parts['host'])) ? $parts['host'] : '';
- $path = (isset($parts['path'])) ? $parts['path'] : '';
-
- if (($scheme == 'https' && $port != '443')
- || ($scheme == 'http' && $port != '80')) {
- $host = "$host:$port";
- }
- return "$scheme://$host$path";
- }
-
- /**
- * builds a url usable for a GET request
- */
- public function to_url() {
- $post_data = $this->to_postdata();
- $out = $this->get_normalized_http_url();
- if ($post_data) {
- $out .= '?'.$post_data;
- }
- return $out;
- }
-
- /**
- * builds the data one would send in a POST request
- */
- public function to_postdata() {
- return OAuthUtil::build_http_query($this->parameters);
- }
-
- /**
- * builds the Authorization: header
- */
- public function to_header($realm=null) {
- $first = true;
- if($realm) {
- $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
- $first = false;
- } else
- $out = 'Authorization: OAuth';
-
- $total = array();
- foreach ($this->parameters as $k => $v) {
- if (substr($k, 0, 5) != "oauth") continue;
- if (is_array($v)) {
- throw new OAuthException('Arrays not supported in headers');
- }
- $out .= ($first) ? ' ' : ',';
- $out .= OAuthUtil::urlencode_rfc3986($k) .
- '="' .
- OAuthUtil::urlencode_rfc3986($v) .
- '"';
- $first = false;
- }
- return $out;
- }
-
- public function __toString() {
- return $this->to_url();
- }
-
-
- public function sign_request($signature_method, $consumer, $token) {
- $this->set_parameter(
- "oauth_signature_method",
- $signature_method->get_name(),
- false
- );
- $signature = $this->build_signature($signature_method, $consumer, $token);
- $this->set_parameter("oauth_signature", $signature, false);
- }
-
- public function build_signature($signature_method, $consumer, $token) {
- $signature = $signature_method->build_signature($this, $consumer, $token);
- return $signature;
- }
-
- /**
- * util function: current timestamp
- */
- private static function generate_timestamp() {
- return time();
- }
-
- /**
- * util function: current nonce
- */
- private static function generate_nonce() {
- $mt = microtime();
- $rand = mt_rand();
-
- return md5($mt . $rand); // md5s look nicer than numbers
- }
-}
-
-class OAuthServer {
- protected $timestamp_threshold = 300; // in seconds, five minutes
- protected $version = '1.0'; // hi blaine
- protected $signature_methods = array();
-
- protected $data_store;
-
- function __construct($data_store) {
- $this->data_store = $data_store;
- }
-
- public function add_signature_method($signature_method) {
- $this->signature_methods[$signature_method->get_name()] =
- $signature_method;
- }
-
- // high level functions
-
- /**
- * process a request_token request
- * returns the request token on success
- */
- public function fetch_request_token(&$request) {
- $this->get_version($request);
-
- $consumer = $this->get_consumer($request);
-
- // no token required for the initial token request
- $token = NULL;
-
- $this->check_signature($request, $consumer, $token);
-
- // Rev A change
- $callback = $request->get_parameter('oauth_callback');
- $new_token = $this->data_store->new_request_token($consumer, $callback);
-
- return $new_token;
- }
-
- /**
- * process an access_token request
- * returns the access token on success
- */
- public function fetch_access_token(&$request) {
- $this->get_version($request);
-
- $consumer = $this->get_consumer($request);
-
- // requires authorized request token
- $token = $this->get_token($request, $consumer, "request");
-
- $this->check_signature($request, $consumer, $token);
-
- // Rev A change
- $verifier = $request->get_parameter('oauth_verifier');
- $new_token = $this->data_store->new_access_token($token, $consumer, $verifier);
-
- return $new_token;
- }
-
- /**
- * verify an api call, checks all the parameters
- */
- public function verify_request(&$request) {
- $this->get_version($request);
- $consumer = $this->get_consumer($request);
- $token = $this->get_token($request, $consumer, "access");
- $this->check_signature($request, $consumer, $token);
- return array($consumer, $token);
- }
-
- // Internals from here
- /**
- * version 1
- */
- private function get_version(&$request) {
- $version = $request->get_parameter("oauth_version");
- if (!$version) {
- // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present.
- // Chapter 7.0 ("Accessing Protected Ressources")
- $version = '1.0';
- }
- if ($version !== $this->version) {
- throw new OAuthException("OAuth version '$version' not supported");
- }
- return $version;
- }
-
- /**
- * figure out the signature with some defaults
- */
- private function get_signature_method($request) {
- $signature_method = $request instanceof OAuthRequest
- ? $request->get_parameter("oauth_signature_method")
- : NULL;
-
- if (!$signature_method) {
- // According to chapter 7 ("Accessing Protected Ressources") the signature-method
- // parameter is required, and we can't just fallback to PLAINTEXT
- throw new OAuthException('No signature method parameter. This parameter is required');
- }
-
- if (!in_array($signature_method,
- array_keys($this->signature_methods))) {
- throw new OAuthException(
- "Signature method '$signature_method' not supported " .
- "try one of the following: " .
- implode(", ", array_keys($this->signature_methods))
- );
- }
- return $this->signature_methods[$signature_method];
- }
-
- /**
- * try to find the consumer for the provided request's consumer key
- */
- private function get_consumer($request) {
- $consumer_key = $request instanceof OAuthRequest
- ? $request->get_parameter("oauth_consumer_key")
- : NULL;
-
- if (!$consumer_key) {
- throw new OAuthException("Invalid consumer key");
- }
-
- $consumer = $this->data_store->lookup_consumer($consumer_key);
- if (!$consumer) {
- throw new OAuthException("Invalid consumer");
- }
-
- return $consumer;
- }
-
- /**
- * try to find the token for the provided request's token key
- */
- private function get_token($request, $consumer, $token_type="access") {
- $token_field = $request instanceof OAuthRequest
- ? $request->get_parameter('oauth_token')
- : NULL;
-
- if (!empty($token_field)) {
- $token = $this->data_store->lookup_token(
- $consumer, $token_type, $token_field
- );
- if (!$token) {
- throw new OAuthException("Invalid $token_type token: $token_field");
- }
- }
- else {
- $token = new OAuthToken('', '');
- }
- return $token;
- }
-
- /**
- * all-in-one function to check the signature on a request
- * should guess the signature method appropriately
- */
- private function check_signature($request, $consumer, $token) {
- // this should probably be in a different method
- $timestamp = $request instanceof OAuthRequest
- ? $request->get_parameter('oauth_timestamp')
- : NULL;
- $nonce = $request instanceof OAuthRequest
- ? $request->get_parameter('oauth_nonce')
- : NULL;
-
- $this->check_timestamp($timestamp);
- $this->check_nonce($consumer, $token, $nonce, $timestamp);
-
- $signature_method = $this->get_signature_method($request);
-
- $signature = $request->get_parameter('oauth_signature');
- $valid_sig = $signature_method->check_signature(
- $request,
- $consumer,
- $token,
- $signature
- );
-
- if (!$valid_sig) {
- throw new OAuthException("Invalid signature");
- }
- }
-
- /**
- * check that the timestamp is new enough
- */
- private function check_timestamp($timestamp) {
- if( ! $timestamp )
- throw new OAuthException(
- 'Missing timestamp parameter. The parameter is required'
- );
-
- // verify that timestamp is recentish
- $now = time();
- if (abs($now - $timestamp) > $this->timestamp_threshold) {
- throw new OAuthException(
- "Expired timestamp, yours $timestamp, ours $now"
- );
- }
- }
-
- /**
- * check that the nonce is not repeated
- */
- private function check_nonce($consumer, $token, $nonce, $timestamp) {
- if( ! $nonce )
- throw new OAuthException(
- 'Missing nonce parameter. The parameter is required'
- );
-
- // verify that the nonce is uniqueish
- $found = $this->data_store->lookup_nonce(
- $consumer,
- $token,
- $nonce,
- $timestamp
- );
- if ($found) {
- throw new OAuthException("Nonce already used: $nonce");
- }
- }
-
-}
-
-class OAuthDataStore {
- function lookup_consumer($consumer_key) {
- // implement me
- }
-
- function lookup_token($consumer, $token_type, $token) {
- // implement me
- }
-
- function lookup_nonce($consumer, $token, $nonce, $timestamp) {
- // implement me
- }
-
- function new_request_token($consumer, $callback = null) {
- // return a new token attached to this consumer
- }
-
- function new_access_token($token, $consumer, $verifier = null) {
- // return a new access token attached to this consumer
- // for the user associated with this token if the request token
- // is authorized
- // should also invalidate the request token
- }
-
-}
-
-class OAuthUtil {
- public static function urlencode_rfc3986($input) {
- if (is_array($input)) {
- return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input);
- } else if (is_scalar($input)) {
- return str_replace(
- '+',
- ' ',
- str_replace('%7E', '~', rawurlencode($input))
- );
- } else {
- return '';
- }
-}
-
-
- // This decode function isn't taking into consideration the above
- // modifications to the encoding process. However, this method doesn't
- // seem to be used anywhere so leaving it as is.
- public static function urldecode_rfc3986($string) {
- return urldecode($string);
- }
-
- // Utility function for turning the Authorization: header into
- // parameters, has to do some unescaping
- // Can filter out any non-oauth parameters if needed (default behaviour)
- // May 28th, 2010 - method updated to tjerk.meesters for a speed improvement.
- // see http://code.google.com/p/oauth/issues/detail?id=163
- public static function split_header($header, $only_allow_oauth_parameters = true) {
- $params = array();
- if (preg_match_all('/('.($only_allow_oauth_parameters ? 'oauth_' : '').'[a-z_-]*)=(:?"([^"]*)"|([^,]*))/', $header, $matches)) {
- foreach ($matches[1] as $i => $h) {
- $params[$h] = OAuthUtil::urldecode_rfc3986(empty($matches[3][$i]) ? $matches[4][$i] : $matches[3][$i]);
- }
- if (isset($params['realm'])) {
- unset($params['realm']);
- }
- }
- return $params;
- }
-
- // helper to try to sort out headers for people who aren't running apache
- public static function get_headers() {
- if (function_exists('apache_request_headers')) {
- // we need this to get the actual Authorization: header
- // because apache tends to tell us it doesn't exist
- $headers = apache_request_headers();
-
- // sanitize the output of apache_request_headers because
- // we always want the keys to be Cased-Like-This and arh()
- // returns the headers in the same case as they are in the
- // request
- $out = array();
- foreach ($headers AS $key => $value) {
- $key = str_replace(
- " ",
- "-",
- ucwords(strtolower(str_replace("-", " ", $key)))
- );
- $out[$key] = $value;
- }
- } else {
- // otherwise we don't have apache and are just going to have to hope
- // that $_SERVER actually contains what we need
- $out = array();
- if( isset($_SERVER['CONTENT_TYPE']) )
- $out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
- if( isset($_ENV['CONTENT_TYPE']) )
- $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
-
- foreach ($_SERVER as $key => $value) {
- if (substr($key, 0, 5) == "HTTP_") {
- // this is chaos, basically it is just there to capitalize the first
- // letter of every word that is not an initial HTTP and strip HTTP
- // code from przemek
- $key = str_replace(
- " ",
- "-",
- ucwords(strtolower(str_replace("_", " ", substr($key, 5))))
- );
- $out[$key] = $value;
- }
- }
- }
- return $out;
- }
-
- // This function takes a input like a=b&a=c&d=e and returns the parsed
- // parameters like this
- // array('a' => array('b','c'), 'd' => 'e')
- public static function parse_parameters( $input ) {
- if (!isset($input) || !$input) return array();
-
- $pairs = explode('&', $input);
-
- $parsed_parameters = array();
- foreach ($pairs as $pair) {
- $split = explode('=', $pair, 2);
- $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
- $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
-
- if (isset($parsed_parameters[$parameter])) {
- // We have already recieved parameter(s) with this name, so add to the list
- // of parameters with this name
-
- if (is_scalar($parsed_parameters[$parameter])) {
- // This is the first duplicate, so transform scalar (string) into an array
- // so we can add the duplicates
- $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]);
- }
-
- $parsed_parameters[$parameter][] = $value;
- } else {
- $parsed_parameters[$parameter] = $value;
- }
- }
- return $parsed_parameters;
- }
-
- public static function build_http_query($params) {
- if (!$params) return '';
-
- // Urlencode both keys and values
- $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));
- $values = OAuthUtil::urlencode_rfc3986(array_values($params));
- $params = array_combine($keys, $values);
-
- // Parameters are sorted by name, using lexicographical byte value ordering.
- // Ref: Spec: 9.1.1 (1)
- uksort($params, 'strcmp');
-
- $pairs = array();
- foreach ($params as $parameter => $value) {
- if (is_array($value)) {
- // If two or more parameters share the same name, they are sorted by their value
- // Ref: Spec: 9.1.1 (1)
- // June 12th, 2010 - changed to sort because of issue 164 by hidetaka
- sort($value, SORT_STRING);
- foreach ($value as $duplicate_value) {
- $pairs[] = $parameter . '=' . $duplicate_value;
- }
- } else {
- $pairs[] = $parameter . '=' . $value;
- }
- }
- // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
- // Each name-value pair is separated by an '&' character (ASCII code 38)
- return implode('&', $pairs);
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.admin.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.admin.inc
deleted file mode 100644
index 9e723e3..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.admin.inc
+++ /dev/null
@@ -1,611 +0,0 @@
-<?php
-
-function _oauth_common_admin() {
- $form = array();
-
- $form['oauth_common_enable_provider'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable the oauth provider'),
- '#default_value' => variable_get('oauth_common_enable_provider', TRUE),
- '#description' => t('This option controls whether this site should act as a OAuth provider or not'),
- );
-
- $form['oauth_common_request_token_lifetime'] = array(
- '#type' => 'textfield',
- '#title' => t('Request token lifetime (in seconds)'),
- '#default_value' => variable_get('oauth_common_request_token_lifetime', 7200),
- );
-
- $form['#validate'][] = '_oauth_common_admin_settings_validate';
-
- return system_settings_form($form);
-}
-
-function _oauth_common_admin_settings_validate($form, $form_state) {
- $values = $form_state['values'];
-
- $lifetime = intval($values['oauth_common_request_token_lifetime'], 10);
- if (!$lifetime) {
- form_set_error('oauth_common_request_token_lifetime', t('The request token lifetime must be a non-zero integer value.'));
- }
-}
-
-/**
- * Output a list of contexts.
- */
-function oauth_common_list_context($js = NULL) {
- $header = array(
- array('data' => t('Title'), 'class' => 'oauth-common-contexts-title'),
- array('data' => t('Storage'), 'class' => 'oauth-common-contexts-storage'),
- array('data' => t('Operations'), 'class' => 'oauth-common-contexts-operations'),
- );
-
- $contexts = oauth_common_context_load_all();
- $rows = array();
-
- if (!$contexts) {
- $contexts = array();
- }
-
- foreach ($contexts as $context) {
- $operations = array();
-
- if (empty($context->disabled)) {
- $operations[] = array(
- 'title' => t('Edit'),
- 'href' => 'admin/settings/oauth/' . $context->name . '/edit',
- );
- $operations[] = array(
- 'title' => t('Export'),
- 'href' => 'admin/settings/oauth/' . $context->name . '/export',
- );
- }
-
- if ($context->export_type == (EXPORT_IN_CODE | EXPORT_IN_DATABASE)) {
- $operations[] = array(
- 'title' => t('Revert'),
- 'href' => 'admin/settings/oauth/' . $context->name . '/delete',
- );
- }
- elseif ($context->export_type != EXPORT_IN_CODE) {
- $operations[] = array(
- 'title' => t('Delete'),
- 'href' => 'admin/settings/oauth/' . $context->name . '/delete',
- );
- }
- elseif (empty($context->disabled)) {
- $operations[] = array(
- 'title' => t('Disable'),
- 'href' => 'admin/settings/oauth/' . $context->name . '/disable',
- 'query' => drupal_get_destination(),
- );
- }
- else {
- $operations[] = array(
- 'title' => t('Enable'),
- 'href' => 'admin/settings/oauth/' . $context->name . '/enable',
- 'query' => drupal_get_destination(),
- );
- }
-
- $rows[$context->name] = array(
- 'data' => array(
- 'title' => array(
- 'data' => check_plain($context->title),
- 'class' => 'oauth-common-contexts-title',
- ),
- 'storage' => array(
- 'data' => ($context->export_type == EXPORT_IN_CODE) ? t('In code') : t('In database'),
- 'class' => 'oauth-common-contexts-storage',
- ),
- 'operations' => array(
- 'data' => theme('links', $operations),
- 'class' => 'oauth-common-contexts-operations',
- ),
- ),
- 'class' => 'oauth-common-contexts-' . $context->name . (!empty($context->disabled) ? ' oauth-common-contexts-disabled' : ''),
- );
- }
-
- $table = theme('table', $header, $rows, array('id' => 'oauth-common-list-contexts'));
-
- return $table;
-}
-
-/**
- * Handle the add context page.
- */
-function oauth_common_add_context() {
- $context = oauth_common_context_new();
- drupal_set_title(t('Add context'));
- if (!$context) {
- drupal_set_message(t("Can't create contexts, check that you've installed !ctools.", array(
- '!ctools' => l('Chaos tool suite', 'http://drupal.org/project/ctools'),
- )), 'error');
- $result = '';
- }
- else {
- $result = oauth_common_edit_context($context);
- }
- return $result;
-}
-
-/**
- * Edit an context.
- *
- * Called from both the add and edit points to provide for common flow.
- */
-function oauth_common_edit_context($context) {
- if (!is_object($context)) {
- $context = oauth_common_context_load($context);
- }
- if ($context && !empty($context->title)) {
- drupal_set_title(check_plain($context->title));
- }
- return drupal_get_form('oauth_common_edit_form_context', $context);
-}
-
-/**
- * Form to edit the settings of an context.
- */
-function oauth_common_edit_form_context(&$form_state, $context) {
- $form = array(
- '#pre_render' => array('_oauth_common_add_admin_css'),
- );
-
- $form['cid'] = array(
- '#type' => 'value',
- '#value' => isset($context->cid) ? $context->cid : '',
- );
-
- $form['context_object'] = array(
- '#type' => 'value',
- '#value' => $context,
- );
-
- $form['name'] = array(
- '#type' => 'textfield',
- '#size' => 24,
- '#maxlength' => 32,
- '#default_value' => $context->name,
- '#title' => t('Context name'),
- '#description' => t('A unique name used to identify this preset internally. It must be only be alpha characters and underscores. No spaces, numbers or uppercase characters.'),
- '#required' => TRUE,
- );
-
- $form['title'] = array(
- '#type' => 'textfield',
- '#size' => 24,
- '#maxlength' => 100,
- '#default_value' => $context->title,
- '#title' => t('Context title'),
- '#required' => TRUE,
- );
-
- $sign_methods = array(
- 'PLAINTEXT' => t('Plaintext'),
- );
- foreach (hash_algos() as $algo) {
- $sign_methods['HMAC-' . strtoupper($algo)] = 'HMAC-' . strtoupper($algo);
- }
-
- $form['signature_methods'] = array(
- '#type' => 'fieldset',
- '#title' => t('Signature methods'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#tree' => TRUE,
- 'selected' => array(
- '#type' => 'checkboxes',
- '#title' => t('Supported signature methods'),
- '#options' => $sign_methods,
- '#default_value' => !empty($context->authorization_options['signature_methods']) ?
- $context->authorization_options['signature_methods'] :
- array('HMAC-SHA1', 'HMAC-SHA256', 'HMAC-SHA384', 'HMAC-SHA512'),
- )
- );
-
- $form['authorization_options'] = array(
- '#type' => 'fieldset',
- '#title' => t('Authorization options'),
- '#tree' => TRUE,
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
-
- $form['authorization_options']['page_title'] = array(
- '#type' => 'textfield',
- '#title' => t('Page title'),
- '#description' => t('The title of the authorization page.'),
- '#size' => 40,
- '#maxlength' => 255,
- '#default_value' => $context->authorization_options['page_title'],
- );
-
- $form['authorization_options']['message'] = array(
- '#type' => 'textarea',
- '#title' => t('Message'),
- '#description' => t('The message shown to the user when authorizing.'),
- '#default_value' => $context->authorization_options['message'],
- );
-
- $form['authorization_options']['warning'] = array(
- '#type' => 'textarea',
- '#title' => t('Warning'),
- '#description' => t('The warning shown to the user when authorizing.'),
- '#default_value' => $context->authorization_options['warning'],
- );
-
- $form['authorization_options']['deny_access_title'] = array(
- '#type' => 'textfield',
- '#title' => t('Deny access title'),
- '#description' => t('The title of deny access link.'),
- '#size' => 40,
- '#maxlength' => 255,
- '#default_value' => $context->authorization_options['deny_access_title'],
- );
-
- $form['authorization_options']['grant_access_title'] = array(
- '#type' => 'textfield',
- '#title' => t('Grant access title'),
- '#description' => t('The title of grant access button.'),
- '#size' => 40,
- '#maxlength' => 255,
- '#default_value' => $context->authorization_options['grant_access_title'],
- );
-
- $form['authorization_options']['access_token_lifetime'] = array(
- '#type' => 'textfield',
- '#title' => t('Access token lifetime'),
- '#description' => t('The time, in seconds, for which an access token should be valid, use 0 to never expire access tokens.'),
- '#size' => 10,
- '#maxlength' => 255,
- '#default_value' => empty($context->authorization_options['access_token_lifetime']) ? 0 : $context->authorization_options['access_token_lifetime'],
- );
-
- $form['authorization_options']['disable_auth_level_selection'] = array(
- '#type' => 'checkbox',
- '#title' => t('Disable authorization level selection'),
- '#description' => t('If this is checked the user won\'t be able to choose the authorization level, and the default authorization level(s) will be used.'),
- '#default_value' => !empty($context->authorization_options['disable_auth_level_selection']),
- );
-
- $form['authorization_levels'] = array(
- '#type' => 'fieldset',
- '#title' => t('Authorization levels'),
- '#tree' => FALSE,
- 'ahah_wrapper' => array(
- '#type' => 'markup',
- '#value' => '<div id="auth-level-wrapper"></div>',
- '#weight' => 9,
- ),
- 'add_authorization_level' => array(
- '#type' => 'button',
- '#value' => t('Add authorization level'),
- '#weight' => 10,
- '#ahah' => array(
- 'path' => 'admin/settings/oauth/ahah/add-auth-level',
- 'wrapper' => 'auth-level-wrapper',
- 'method' => 'append',
- )
- ),
- );
-
- $i = 0;
- foreach ($context->authorization_levels as $name => $level) {
- $title = !empty($name) ? check_plain($name) : t('New level');
- if ($title == '*') {
- $title = t('Full access');
- }
- $l = oauth_common_edit_form_auth_level($context, $i, $title, $name, $level);
- $form['authorization_levels'][] = $l;
- $i++;
- }
-
- $form['authorization_level_count'] = array(
- '#type' => 'value',
- '#value' => $i,
- );
-
- $form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Save'),
- );
-
- return $form;
-}
-
-function _oauth_common_add_admin_css($element) {
- drupal_add_css(drupal_get_path('module', 'oauth_common') . '/css/admin.css');
- return $element;
-}
-
-/**
- * Helper function for constructing a auth level fieldset.
- *
- * @param object $context
- * @param int $idx
- * @param string $title
- * @param string $name
- * @param array $level
- * @return array.
- */
-function oauth_common_edit_form_auth_level($context, $idx, $title, $name = '', $level = array()) {
- $level = $level + array(
- 'title' => '',
- 'description' => '',
- );
-
- $element = array(
- '#theme' => 'oauth_common_auth_level',
- "l_{$idx}_name" => array(
- '#type' => 'textfield',
- '#title' => t('Name'),
- '#description' => t('The name of the authorization level.'),
- '#size' => 40,
- '#maxlength' => 32,
- '#default_value' => $name,
- '#oauth_common_panel' => 'left',
- ),
- "l_{$idx}_title" => array(
- '#type' => 'textfield',
- '#title' => t('Title'),
- '#description' => t('The title of the authorization level.'),
- '#size' => 40,
- '#maxlength' => 100,
- '#default_value' => $level['title'],
- '#oauth_common_panel' => 'left',
- ),
- "l_{$idx}_default" => array(
- '#type' => 'checkbox',
- '#title' => t('Selected by default'),
- '#description' => t('Whether the authentication level should be checked by default.'),
- '#default_value' => is_array($context->authorization_options['default_authorization_levels']) && in_array($name, $context->authorization_options['default_authorization_levels']),
- '#oauth_common_panel' => 'left',
- ),
- "l_{$idx}_delete" => array(
- '#type' => 'checkbox',
- '#title' => t('Delete'),
- '#description' => t('Check this to delete the authorization level.'),
- '#default_value' => FALSE,
- '#oauth_common_panel' => 'left',
- ),
- "l_{$idx}_description" => array(
- '#type' => 'textarea',
- '#title' => t('Description'),
- '#description' => t('The description of the authorization level.'),
- '#default_value' => $level['description'],
- '#oauth_common_panel' => 'right',
- ),
- );
- return $element;
-}
-
-/**
- * Menu system callback for adding auth levels
- *
- * @return void
- */
-function oauth_common_ahah_add_auth_level() {
- $cached_form_state = array();
- $form = form_get_cache($_POST['form_build_id'], $cached_form_state);
- $context = $form['context_object']['#value'];
- $idx = $form['authorization_level_count']['#value'];
- $form['authorization_level_count']['#value'] = $idx + 1;
- $level = oauth_common_edit_form_auth_level($context, $idx, t('Authorization level'));
- $form['authorization_levels'][] = $level;
-
- form_set_cache($_POST['form_build_id'], $form, $cached_form_state);
-
- $form_state = array(
- 'submitted' => FALSE,
- );
- $level = form_builder('oauth_common_ahah_add_auth_level', $level, $form_state);
- $output = drupal_render($level);
-
- print drupal_to_js(array(
- 'status' => TRUE,
- 'data' => $output,
- ));
- exit;
-}
-
-/**
- * Validate submission of the preset edit form.
- */
-function oauth_common_edit_form_context_validate(&$form, &$form_state) {
- $values = $form_state['values'];
-
- // Test uniqueness of name:
- if (preg_match("/[^A-Za-z0-9_]/", $values['name'])) {
- form_error($form['name'], t('Context name must be alphanumeric or underscores only.'));
- }
- else if (!empty($values['name'])) {
- $query = "SELECT cid FROM {oauth_common_context} WHERE name = '%s'";
- $args = array(
- ':name' => $values['name'],
- );
- if (!empty($values['cid']) && is_numeric($values['cid'])) {
- $query .= ' AND cid != %d';
- $args[':cid'] = $values['cid'];
- }
- if (db_result(db_query($query, $args))) {
- form_error($form['name'], t('Context name must be unique.'));
- }
- }
-
- // Check that the authorization level names are unique within the context
- $levels = array();
- $auth_count = $values['authorization_level_count'];
- $default_exists = FALSE;
- $level_count = $values['authorization_level_count'];
- for ($idx = 0; $idx < $level_count; $idx++) {
- $level = _oauth_common_auth_level_from_values($idx, $values);
-
- if (!empty($level['name']) && !$level['delete']) {
- if (!empty($levels[$level['name']])) {
- form_error($form["l_{$idx}_name"], t('Authorization level name must be unique.'));
- }
- else if (preg_match("/[^A-Za-z0-9_\*]/", $level['name'])) {
- form_error($form["l_{$idx}_name"], t('Authorization level name must be alphanumeric or underscores only.'));
- }
- if (empty($level['title'])) {
- form_error($form["l_{$idx}_title"], t('Authorization levels must have a title.'));
- }
- $default_exists = $default_exists || $level['default'];
- $levels[$level['name']] = TRUE;
- }
- }
-
- // Check that we actually got a number as access token lifetime
- if (!is_numeric($values['authorization_options']['access_token_lifetime'])) {
- form_error($form['authorization_options']['access_token_lifetime'], t('The access token lifetime must be numeric.'));
- }
-
- // Check that at least one default authorization level is checked when
- // authorization level selection is disabled.
- if (!$default_exists && $values['authorization_options']['disable_auth_level_selection']) {
- form_error($form['authorization_options']['disable_auth_level_selection'], t('You must select at least one default authorirization level if level selection is disabled.'));
- }
-}
-
-/**
- * Helper function to create a authorization level array from form values.
- *
- * @param string $idx
- * @param string $values
- * @return array
- */
-function _oauth_common_auth_level_from_values($idx, $values) {
- $level = array(
- 'name' => NULL,
- 'title' => NULL,
- 'description' => NULL,
- 'default' => FALSE,
- 'delete' => FALSE,
- );
- foreach (array_keys($level) as $key) {
- $level[$key] = $values["l_{$idx}_{$key}"];
- }
- return $level;
-}
-
-/**
- * Process submission of the mini panel edit form.
- */
-function oauth_common_edit_form_context_submit($form, &$form_state) {
- $context = $form_state['values']['context_object'];
- $values = $form_state['values'];
-
- $context->name = $values['name'];
- $context->title = $values['title'];
-
- $auth_options = array(
- 'access_token_lifetime' => 0,
- );
- foreach ($values['authorization_options'] as $key => $value) {
- if (!empty($value)) {
- $auth_options[$key] = $value;
- }
- }
- $context->authorization_options = $auth_options;
-
- // Collect the names of the selected signature methods.
- $sig_options = array();
- foreach ($values['signature_methods']['selected'] as $name => $selected) {
- if ($selected) {
- $sig_options[] = $name;
- }
- }
- $context->authorization_options['signature_methods'] = $sig_options;
-
- // Set the auth levels and default levels for the context
- $levels = array();
- $default_levels = array();
- $level_count = $values['authorization_level_count'];
- for ($idx = 0; $idx < $level_count; $idx++) {
- $level = _oauth_common_auth_level_from_values($idx, $values);
- if (!empty($level['name']) && !$level['delete']) {
- $name = $level['name'];
- if ($level['default']) {
- $default_levels[] = $name;
- }
- $levels[$name] = $level;
- }
- }
- $context->authorization_levels = $levels;
- $context->authorization_options['default_authorization_levels'] = $default_levels;
-
- oauth_common_context_save($context);
-
- if (empty($context->cid)) {
- drupal_set_message(t('Your new context %title has been saved.', array('%title' => $context->title)));
- $form_state['values']['cid'] = $context->cid;
- }
- else {
- drupal_set_message(t('Your changes have been saved.'));
- }
-
- $form_state['redirect'] = 'admin/settings/oauth';
-}
-
-/**
- * Provide a form to confirm deletion of a context.
- */
-function oauth_common_delete_confirm_context(&$form_state, $context) {
- if (!is_object($context)) {
- $context = oauth_common_context_load($context);
- }
- if ($context->export_type == (EXPORT_IN_CODE | EXPORT_IN_DATABASE)) {
- $title = t('Are you sure you want to revert the context "@title"?', array('@title' => $context->title));
- $submit = t('Revert');
- }
- elseif ($context->export_type != EXPORT_IN_CODE) {
- $title = t('Are you sure you want to delete the context "@title"?', array('@title' => $context->title));
- $submit = t('Delete');
- }
- else {
- drupal_not_found();
- die;
- }
- $form['context'] = array('#type' => 'value', '#value' => $context->name);
- $form['cid'] = array('#type' => 'value', '#value' => $context->cid);
- return confirm_form($form,
- $title,
- !empty($_GET['destination']) ? $_GET['destination'] : 'admin/settings/oauth',
- t('This action cannot be undone.'),
- $submit, t('Cancel')
- );
-}
-
-/**
- * Handle the submit button to delete a context.
- */
-function oauth_common_delete_confirm_context_submit($form, &$form_state) {
- $context = oauth_common_context_load($form_state['values']['context']);
- if ($context->cid == $form_state['values']['cid']) {
- oauth_common_context_delete($context);
- $form_state['redirect'] = 'admin/settings/oauth';
- }
-}
-
-/**
- * Page callback to export a context to PHP code.
- */
-function oauth_common_export_context(&$form_state, $context) {
- if (!is_object($context)) {
- $context = oauth_common_context_load($context);
- }
- drupal_set_title(check_plain($context->title));
- $code = oauth_common_context_export($context);
-
- $lines = substr_count($code, "\n") + 4;
- $form['code'] = array(
- '#type' => 'textarea',
- '#title' => $context->title,
- '#default_value' => $code,
- '#rows' => $lines,
- );
-
- return $form;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.authorizations.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.authorizations.inc
deleted file mode 100644
index 4431798..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.authorizations.inc
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-/**
- * @file
- * Functions related to a user's authorization section
- */
-
-function oauth_common_page_user_authorizations($account) {
- $header = array(
- array('data' => t('Application'), 'class' => "oauth-common-authorization-application"),
- array('data' => t('Key'), 'class' => "oauth-common-authorization-key"),
- array('data' => t('Created'), 'class' => "oauth-common-authorization-created"),
- array('data' => t('Expires'), 'class' => "oauth-common-authorization-expires"),
- array('data' => t('Operations'), 'class' => "oauth-common-authorization-operations"),
- );
-
- $access_tokens = oauth_common_get_user_provider_tokens($account->uid);
- $rows = array();
-
- foreach ($access_tokens as $token) {
- $consumer = $token->consumer;
-
- $data = array(
- 'application' => array(
- 'data' => check_plain($consumer->name),
- 'class' => "oauth-common-authorization-application",
- ),
- 'key' => array(
- 'data' => substr($token->key, 0, 6) . '...',
- 'class' => "oauth-common-authorization-key",
- ),
- 'created' => array(
- 'data' => format_date($token->created),
- 'class' => "oauth-common-authorization-created",
- ),
- );
- $operations = array();
-
- $operations[] = array(
- 'title' => t('Edit'),
- 'href' => sprintf('user/%d/oauth/authorizations/%s', $account->uid, $token->key),
- 'query' => array('destination' => $_GET['q']),
- );
-
- $operations[] = array(
- 'title' => t('Delete'),
- 'href' => sprintf('user/%d/oauth/authorizations/%s', $account->uid, $token->key) . '/delete',
- 'query' => array('destination' => $_GET['q']),
- );
-
- $data['expires'] = array(
- 'data' => $token->expires ? format_date($token->expires) : t('Never'),
- 'class' => "oauth-common-authorization-expires",
- );
-
- $rows[] = array(
- 'data' => $data + array(
- 'operations' => array(
- 'data' => theme('links', $operations),
- 'class' => "oauth-common-authorization-operations",
- ),
- ),
- );
- }
-
- $table = theme('table', $header, $rows, array('id' => "oauth-common-list-authorization"));
-
- return $table;
-}
-
-function oauth_common_authorization_add($consumer) {
- $token = new DrupalOAuthToken(user_password(32), user_password(32), $consumer, array(
- 'uid' => $account->uid,
- ));
- return drupal_get_form('oauth_common_form_authorization', $token);
-}
-
-function oauth_common_form_authorization($form_state, $token) {
- $form = array();
-
- $consumer = $token->consumer;
- $context = oauth_common_context_load($consumer->context);
-
- drupal_set_title(t('Authorization for @app', array('@app' => $consumer->name)));
-
- $form['token_object'] = array(
- '#type' => 'value',
- '#value' => $token,
- );
-
- $form['authorized'] = array(
- '#type' => 'checkbox',
- '#title' => t('Authorized'),
- '#default_value' => $token->authorized,
- );
-
- $form['created'] = array(
- '#type' => 'item',
- '#title' => t('Created'),
- '#value' => format_date($token->created),
- );
-
- $form['changed'] = array(
- '#type' => 'item',
- '#title' => t('Changed'),
- '#value' => format_date($token->changed),
- );
-
- $form['key'] = array(
- '#type' => 'item',
- '#title' => t('Key'),
- '#value' => $token->key,
- );
-
- if ($token->in_database) {
- $form['secret'] = array(
- '#type' => 'item',
- '#prefix' => '<div id="token-secret-wrapper">',
- '#title' => t('Secret'),
- '#value' => substr($token->secret, 0, 6) . '...',
- );
-
- $ahah_path = "user/{$token->uid}/oauth/authorizations/{$token->key}/ahah/secret";
- $form['show_secret'] = array(
- '#type' => 'button',
- '#value' => t('Show secret'),
- '#ahah' => array(
- 'path' => $ahah_path,
- 'wrapper' => 'token-secret-wrapper',
- 'method' => 'replace',
- ),
- '#suffix' => '</div>',
- );
- }
- else {
- $form['secret'] = array(
- '#type' => 'item',
- '#title' => t('Secret'),
- '#value' => $token->secret
- );
- }
-
- $form['allowed'] = array(
- '#type' => 'fieldset',
- '#title' => t('Permissions'),
- );
- oauth_common_permissions_form($user, $form['allowed'], $consumer, $context, $token->services);
-
- $form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Save'),
- );
-
- return $form;
-}
-
-function oauth_common_permissions_form($account, &$form, $consumer, $context, $default_services = array('*')) {
- $tvars = array(
- '@appname' => $consumer->name,
- '@user' => $account->name,
- '@sitename' => variable_get('site_name', ''),
- );
-
- if ($context) {
- foreach ($context->authorization_levels as $name => $level) {
- $auth_opt = array(
- '#type' => 'checkbox',
- '#title' => t($level['title'], $tvars),
- '#description' => t($level['description'], $tvars),
- '#default_value' => in_array($name, $default_services),
- );
- $form['authorization']['levels'][$name] = $auth_opt;
- }
- }
-}
-
-function oauth_common_form_authorization_submit($form, $form_state) {
- $values = $form_state['values'];
- $token = $values['token_object'];
- $consumer = $token->consumer;
-
- // Collect the authorization levels
- if (isset($values['levels'])) {
- $token->services = array_keys(array_filter($values['levels']));
- }
-
- $token->authorized = $values['authorized'];
- $token->write(TRUE);
-
- drupal_set_message(t('The @consumer token @token was updated.', array(
- '@consumer' => $consumer->name,
- '@token' => $token->key)));
- drupal_goto(sprintf('user/%d/applications', $form_state['values']['user']));
-}
-
-function oauth_common_form_authorization_delete($form_state, $user, $token) {
- $consumer = $token->consumer;
-
- $cancel_url = 'user/%d/oauth/authorizations';
-
- if (!empty($_GET['destination'])) {
- $cancel_url = $_GET['destination'];
- }
-
- drupal_set_title(t('Deleting authorization for "@consumer"', array(
- '@consumer' => $consumer->name,
- )));
-
- $form = array(
- 'token_object' => array(
- '#type' => 'value',
- '#value' => $token,
- ),
- );
-
- $form['user'] = array(
- '#type' => 'value',
- '#value' => $user->uid,
- );
-
- $form['key'] = array(
- '#type' => 'value',
- '#value' => $token->key,
- );
-
- $form['description'] = array(
- '#type' => 'item',
- '#value' => t('Are you sure that you want to delete the authorization for "@consumer"?', array(
- '@consumer' => $consumer->name,
- )),
- );
-
- $form['cancel'] = array(
- '#type' => 'item',
- '#value' => l(t('Cancel'), sprintf($cancel_url, $user->uid, $token->key)),
- );
-
- $form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Delete'),
- );
-
- return $form;
-}
-
-function oauth_common_form_authorization_delete_submit($form, $form_state) {
- $values = $form_state['values'];
- $token = $values['token_object'];
- $consumer = $token->consumer;
- $token->delete();
- drupal_set_message(t('The @consumer token @token was deleted.', array(
- '@consumer' => $consumer->name,
- '@token' => $token->key)));
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.consumers.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.consumers.inc
deleted file mode 100644
index e7b9bb6..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.consumers.inc
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-
-/**
- * Menu system callback for listing a users consumers.
- *
- * @param object $account
- */
-function oauth_common_page_user_consumers($account) {
- module_load_include('inc', 'oauth_common');
-
- $ci = oauth_common_user_consumers($account->uid);
- $header = array(
- array('data' => t('Name'), 'class' => 'oauth-common-consumer-name'),
- array('data' => t('Key'), 'class' => 'oauth-common-consumer-key'),
- array('data' => t('Created'), 'class' => 'oauth-common-consumer-created'),
- array('data' => t('Operations'), 'class' => 'oauth-common-consumer-operations'),
- );
- $rows = array();
-
- foreach ($ci as $consumer) {
- $data = array(
- 'name' => array(
- 'data' => $consumer->name,
- 'class' => 'oauth-common-consumer-name',
- ),
- 'key' => array(
- 'data' => substr($consumer->key, 0, 6) . '...',
- 'class' => 'oauth-common-consumer-key',
- ),
- 'created' => array(
- 'data' => format_date($consumer->created),
- 'class' => 'oauth-common-consumer-created',
- ),
- );
- $operations = array();
-
- if (oauth_common_can_edit_consumer($consumer)) {
- $operations[] = array(
- 'title' => t('Edit'),
- 'href' => sprintf('user/%d/oauth/consumer/%s', $account->uid, $consumer->csid),
- );
- $operations[] = array(
- 'title' => t('Delete'),
- 'href' => sprintf('user/%d/oauth/consumer/%s', $account->uid, $consumer->csid) . '/delete',
- );
- }
-
- $rows[] = array(
- 'data' => $data + array(
- 'operations' => array(
- 'data' => theme('links', $operations),
- 'class' => 'oauth-common-consumer-operations',
- ),
- ),
- 'class' => 'oauth-common-consumer',
- );
- }
-
- $table = theme('table', $header, $rows, array('id' => 'oauth-common-list-consumers'));
-
- return $table;
-}
-
-/**
- * Menu system callback for the add consumer page.
- */
-function oauth_common_add_consumer($account) {
- $consumer = new DrupalOAuthConsumer(user_password(32), user_password(32), array(
- 'callback_url' => '',
- 'uid' => $account->uid,
- 'provider_consumer' => TRUE,
- ));
- return drupal_get_form('oauth_common_form_consumer', $consumer);
-}
-
-/**
- * Menu system callback for the edit consumer page.
- */
-function oauth_common_edit_consumer($consumer) {
- return drupal_get_form('oauth_common_form_consumer', $consumer);
-}
-
-/**
- * The consumer form that is shared by the add and edit page.
- */
-function oauth_common_form_consumer(&$form_state, $consumer) {
- $form = array();
-
- $form['consumer_object'] = array(
- '#type' => 'value',
- '#value' => $consumer,
- );
-
- $form['name'] = array(
- '#type' => 'textfield',
- '#title' => t('Consumer name'),
- '#required' => TRUE,
- '#default_value' => $consumer->name,
- );
-
- $form['callback_url'] = array(
- '#type' => 'textfield',
- '#title' => t('Callback url'),
- '#required' => FALSE,
- '#default_value' => $consumer->callback_url,
- );
-
- if ($consumer->in_database) {
- $contexts = oauth_common_context_list();
- $form['context'] = array(
- '#type' => 'item',
- '#title' => t('Application context'),
- '#value' => isset($contexts[$consumer->context]) ? $contexts[$consumer->context] : $consumer->context,
- );
- }
- else {
- $allowed_contexts = array();
- foreach (oauth_common_context_list() as $context => $title) {
- if (user_access(sprintf('oauth register consumers in %s', $context))) {
- $allowed_contexts[$context] = $title;
- }
- }
-
- $form['context'] = array(
- '#type' => 'select',
- '#title' => t('Application context'),
- '#options' => $allowed_contexts,
- '#default_value' => $consumer->context,
- );
- }
-
- if ($consumer->in_database) {
- $form['key'] = array(
- '#type' => 'item',
- '#title' => t('Key'),
- '#value' => $consumer->key,
- );
-
- $form['secret'] = array(
- '#type' => 'item',
- '#prefix' => '<div id="consumer-secret-wrapper">',
- '#title' => t('Secret'),
- '#value' => substr($consumer->secret, 0, 6) . '...',
- );
-
- $form['show_secret'] = array(
- '#type' => 'button',
- '#value' => t('Show secret'),
- '#ahah' => array(
- 'path' => "user/{$consumer->uid}/oauth/consumer/{$consumer->csid}/ahah/secret",
- 'wrapper' => 'consumer-secret-wrapper',
- 'method' => 'replace',
- ),
- '#suffix' => '</div>',
- );
- }
-
- $form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Save'),
- );
-
- return $form;
-}
-
-/**
- * Submit handler for oauth_common_form_consumer.
- */
-function oauth_common_form_consumer_submit($form, &$form_state) {
- $values = $form_state['values'];
- $consumer = $values['consumer_object'];
-
- // Translate empty callback url to oob (out of band).
- if (empty($values['callback_url'])) {
- $values['callback_url'] = 'oob';
- }
- // Add scheme if missing, and if the callback_url isn't out of band.
- else if ($values['callback_url'] != 'oob' && preg_match('/^http:\/\/|https:\/\//', $values['callback_url']) === 0) {
- //TODO: What about custom callback url:s used by eg iphone-apps? We should allow them - right?
- $values['callback_url'] = 'http://' . $values['callback_url'];
- }
-
- // Remove trailing slash
- $values['callback_url'] = rtrim($values['callback_url'], '/');
-
- // Transfer editable attributes to the consumer.
- $names = array('name', 'callback_url', 'context');
- foreach ($names as $name) {
- if (isset($values[$name])) {
- $consumer->$name = $values[$name];
- }
- }
-
- // Update or create the consumer.
- $update = $consumer->in_database;
- $consumer->write();
-
- if ($update) {
- drupal_set_message(t('Updated the consumer @name', array('@name' => $v['name'])));
- }
- else {
- drupal_set_message(t('Added the consumer @name', array('@name' => $v['name'])));
- }
-
- drupal_goto(sprintf('user/%d/oauth/consumers', $consumer->uid));
-}
-
-/**
- * Consumer deletion form.
- */
-function oauth_common_form_consumer_delete($form_state, $consumer) {
- $form = array(
- 'consumer_object' => array(
- '#type' => 'value',
- '#value' => $consumer,
- ),
- 'confirm' => array(
- '#type' => 'item',
- '#value' => t('Are you sure you want to delete application <strong>@a</strong>?', array('@a' => $consumer->name)),
- ),
- 'delete' => array(
- '#type' => 'submit',
- '#title' => t('Delete'),
- '#default_value' => t('Delete'),
- ),
- );
-
- return $form;
-}
-
-/**
- * Submit handler for oauth_common_form_consumer_delete.
- */
-function oauth_common_form_consumer_delete_submit($form, &$form_state) {
- $consumer = $form_state['values']['consumer_object'];
-
- $consumer->delete();
- drupal_set_message(t('Deleted the consumer @name', array('@name' => $consumer->name)));
-
- drupal_goto(sprintf('user/%d/oauth/consumers', $consumer->uid));
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.inc
deleted file mode 100644
index 0f6de26..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.inc
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Return information about consumers related to a user.
- *
- * @param int $uid
- * User ID to retrieve consumer info for.
- * @return array
- * An array of consumer info
- */
-function oauth_common_user_consumers($uid) {
- $result = db_query($query = 'SELECT c.secret, c.configuration, pc.*
- FROM {oauth_common_consumer} c
- INNER JOIN {oauth_common_provider_consumer} pc ON pc.csid = c.csid
- WHERE pc.uid = %d' . $where, array(':uid' => $uid));
-
- $consumers = array();
- while ($consumer = DrupalOAuthConsumer::fromResult($result)) {
- $consumers[] = $consumer;
- }
-
- return $consumers;
-}
-
-/**
- * Return information about access tokens related to a user.
- *
- * @param int $uid
- * User ID to retrieve consumer info for.
- * @return array
- * An array of consumer info
- */
-function oauth_common_user_access_tokens($uid) {
- $result = db_query("SELECT * FROM {oauth_common_token} WHERE uid = %d AND type = '%d'", array(
- ':uid' => $uid,
- ':type' => OAUTH_COMMON_TOKEN_TYPE_ACCESS,
- ));
- $tokens = array();
- while ($token = DrupalOAuthToken::fromResult($result)) {
- $tokens[] = $token;
- }
- return $tokens;
-}
-
-/**
- * Verifies the request
- *
- * @return array
- * An array containing three elements. The first is TRUE if the request was
- * signed, otherwise FALSE. Then comes the validated consumer and token objects.
- */
-function oauth_common_verify_request() {
- $req = DrupalOAuthRequest::from_request();
- // Verify
- $consumer_key = $req->get_parameter('oauth_consumer_key');
- if (!empty($consumer_key)) {
- $consumer = DrupalOAuthConsumer::loadProviderByKey($consumer_key);
- if ($consumer) {
- $context = oauth_common_context_load($consumer->context);
-
- if (!$context) {
- throw new Exception('No OAuth context found');
- }
-
- _oauth_common_verify_body_hash($req);
-
- // Only verify request if we got a signature
- $signature = $req->get_parameter('oauth_signature');
- if (!empty($signature)) {
- $server = new DrupalOAuthServer($context);
- return array_merge(array(TRUE), $server->verify_request($req));
- }
- else {
- $token_key = $req->get_parameter('oauth_token');
- if (empty($token_key) || !($token = DrupalOAuthToken::loadbyKey($token_key, $consumer))) {
- $token = NULL;
- }
- return array(FALSE, $consumer, $token);
- }
- }
- }
- return array(FALSE, NULL, NULL);
-}
-
-/**
- * AHAH callback to retrieve the secret of OAuth objects.
- *
- * @param object $object
- * @return void
- */
-function oauth_common_ahah_secret($object) {
- $cached_form_state = array();
- $form = form_get_cache($_POST['form_build_id'], $cached_form_state);
- form_set_cache($_POST['form_build_id'], $form, $cached_form_state);
-
- $form_state = array('submitted' => FALSE);
- $secret = array(
- '#prefix' => '',
- '#value' => $object->secret,
- ) + $form['secret'];
- $secret = form_builder('oauth_common_ahah_secret', $secret, $form_state);
- $output = drupal_render($secret);
-
- print drupal_to_js(array(
- 'status' => TRUE,
- 'data' => $output,
- ));
- exit;
-}
-
-function _oauth_common_verify_body_hash($req) {
- $body_hash = $req->get_parameter('oauth_body_hash');
- if ($body_hash && module_exists('inputstream')) {
- $hres = hash_init('sha1');
- $stream = fopen('drupal://input', 'r');
- hash_update_stream($hres, $stream);
- fclose($stream);
- $sha1 = hash_final($hres, TRUE);
- if ($sha1 !== base64_decode($body_hash)) {
- throw new OAuthException("Invalid body hash");
- }
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.info b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.info
deleted file mode 100644
index 4f83971..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.info
+++ /dev/null
@@ -1,26 +0,0 @@
-name = OAuth
-description = Provides OAuth functionality
-package = "OAuth"
-
-dependencies[] = autoload
-recommends[] = ctools
-suggests[] = inputstream
-
-core = 6.x
-php = 5.2
-
-files[] = lib/OAuth.php
-files[] = includes/DrupalOAuthServer.inc
-files[] = includes/DrupalOAuthDataStore.inc
-files[] = includes/DrupalOAuthRequest.inc
-files[] = includes/DrupalOAuthToken.inc
-files[] = includes/DrupalOAuthConsumer.inc
-files[] = includes/DrupalOAuthClient.inc
-files[] = includes/OAuthSignatureMethod_HMAC.inc
-
-; Information added by drupal.org packaging script on 2011-04-06
-version = "6.x-3.0-beta4"
-core = "6.x"
-project = "oauth"
-datestamp = "1302103016"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.install b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.install
deleted file mode 100644
index 5d0bd3e..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.install
+++ /dev/null
@@ -1,438 +0,0 @@
-<?php
-
-/**
- * @file
- * Installation and schema related functions for the OAuth module
- */
-
-/**
- * Implementation of hook_install().
- */
-function oauth_common_install() {
- drupal_install_schema('oauth_common');
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function oauth_common_uninstall() {
- drupal_uninstall_schema('oauth_common');
-}
-
-/**
- * Implementation of hook_schema().
- */
-function oauth_common_schema() {
- $schema = array();
-
- //TODO: Schemas shouldn't be translated
-
- $schema['oauth_common_context'] = array(
- 'description' => 'Stores contexts for OAuth common',
- 'export' => array(
- 'identifier' => 'context',
- 'export callback' => 'oauth_common_context_export',
- 'list callback' => 'oauth_common_context_list',
- 'key' => 'name',
- 'api' => array(
- 'owner' => 'oauth_common',
- 'api' => 'oauth',
- 'minimum_version' => 1,
- 'current_version' => 1,
- ),
- ),
- 'fields' => array(
- 'cid' => array(
- 'type' => 'serial',
- 'description' => 'Primary ID field for the table. Not used for anything except internal lookups.',
- 'not null' => TRUE,
- 'no export' => TRUE,
- ),
- 'name' => array(
- 'description' => 'The computer-readable name of the context.',
- 'type' => 'varchar',
- 'length' => 32,
- 'not null' => TRUE,
- ),
- 'title' => array(
- 'description' => 'The localizable title of the authorization context.',
- 'type' => 'varchar',
- 'length' => 100,
- 'not null' => TRUE,
- ),
- 'authorization_options' => array(
- 'description' => 'Authorization options.',
- 'type' => 'text',
- 'size' => 'big',
- 'not null' => TRUE,
- 'serialize' => TRUE,
- 'object default' => array(),
- ),
- 'authorization_levels' => array(
- 'description' => 'Authorization levels for the context.',
- 'type' => 'text',
- 'size' => 'big',
- 'not null' => TRUE,
- 'serialize' => TRUE,
- 'object default' => array(),
- ),
- ),
- 'primary key' => array('cid'),
- 'unique keys' => array(
- 'context' => array('name'),
- ),
- );
-
- $schema['oauth_common_consumer'] = _oauth_common_consumer_schema();
- $schema['oauth_common_provider_consumer'] = _oauth_common_provider_consumer_schema();
- $schema['oauth_common_token'] = _oauth_common_token_schema();
- $schema['oauth_common_provider_token'] = _oauth_common_provider_token_schema();
-
- $schema['oauth_common_nonce'] = array(
- 'description' => 'Stores timestamp against nonce for repeat attacks.',
- 'fields' => array(
- 'nonce' => array(
- 'description' => 'The random string used on each request.',
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE
- ),
- 'timestamp' => array(
- 'description' => 'The timestamp of the request.',
- 'type' => 'int',
- 'not null' => TRUE
- ),
- 'token_key' => array(
- 'description' => 'Token key.',
- // This is our own internal key - it's 0 or 32 characters long
- 'type' => 'varchar',
- 'length' => 32,
- 'not null' => TRUE,
- ),
- ),
- 'primary key' => array('nonce'),
- 'indexes' => array(
- 'timekey' => array('timestamp', 'token_key'),
- ),
- );
-
- return $schema;
-}
-
-/**
- * Contains the consumer schema - used by oauth_common_schema() as well as latest related update function
- */
-function _oauth_common_consumer_schema() {
- return array(
- 'description' => 'Keys and secrets for OAuth consumers, both those provided by this site and other sites.',
- 'fields' => array(
- 'csid' => array(
- 'type' => 'serial',
- 'description' => 'Primary ID field for the table. Not used for anything except internal lookups.',
- 'not null' => TRUE,
- ),
- 'key_hash' => array(
- 'description' => 'SHA1-hash of consumer_key.',
- 'type' => 'char',
- 'length' => 40,
- 'not null' => TRUE,
- ),
- // Key is a reserved word in MySQL so lets avoid that
- 'consumer_key' => array(
- 'description' => 'Consumer key.',
- 'type' => 'text',
- 'not null' => TRUE,
- ),
- 'secret' => array(
- 'description' => 'Consumer secret.',
- 'type' => 'text',
- 'not null' => TRUE,
- ),
- 'configuration' => array(
- 'description' => 'Consumer configuration',
- 'type' => 'text',
- 'serialized' => TRUE,
- 'size' => 'big',
- 'not null' => TRUE,
- 'object default' => array(),
- ),
- ),
- 'primary key' => array('csid'),
- 'indexes' => array(
- 'key_hash' => array('key_hash'),
- ),
- );
-}
-
-/**
- * Contains the provider consumer schema - used by oauth_common_schema() as well as latest related update function
- */
-function _oauth_common_provider_consumer_schema() {
- return array(
- 'description' => 'Additional data for OAuth consumers provided by this site.',
- 'fields' => array(
- 'csid' => array(
- 'description' => 'The {oauth_common_consumer}.csid this data is related to.',
- 'type' => 'int',
- 'unsigned' => TRUE,
- 'default' => 0
- ),
- 'consumer_key' => array(
- 'description' => 'Consumer key.',
- // This is our own internal key - it's always 32 characters long
- 'type' => 'char',
- 'length' => 32,
- 'not null' => TRUE,
- ),
- 'created' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The time that the consumer was created, as a Unix timestamp.',
- ),
- 'changed' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The last time the consumer was edited, as a Unix timestamp.',
- ),
- 'uid' => array(
- 'description' => 'The application owner.',
- 'type' => 'int',
- 'unsigned' => TRUE,
- 'not null' => TRUE,
- ),
- 'name' => array(
- 'description' => 'The application name.',
- 'type' => 'varchar',
- 'length' => 128,
- 'not null' => TRUE,
- ),
- 'context' => array(
- 'description' => 'The application context.',
- 'type' => 'varchar',
- 'length' => 32,
- 'not null' => TRUE,
- 'default' => '',
- ),
- 'callback_url' => array(
- 'description' => 'Callback url.',
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- ),
- ),
- 'primary key' => array('consumer_key'),
- 'unique keys' => array(
- 'csid' => array('csid'),
- ),
- 'indexes' => array(
- 'uid' => array('uid'),
- ),
- );
-}
-
-/**
- * Contains the token schema - used by oauth_common_schema() as well as latest related update function
- */
-function _oauth_common_token_schema() {
- return array(
- 'description' => 'Tokens stored on behalf of providers or consumers for request and services accesses.',
- 'fields' => array(
- 'tid' => array(
- 'type' => 'serial',
- 'description' => 'Primary ID field for the table. Not used for anything except internal lookups.',
- 'not null' => TRUE,
- ),
- 'csid' => array(
- 'description' => 'The {oauth_common_consumer}.csid this token is related to.',
- 'type' => 'int',
- 'unsigned' => TRUE,
- 'not null' => TRUE,
- 'default' => 0
- ),
- 'key_hash' => array(
- 'description' => 'SHA1-hash of token_key.',
- 'type' => 'char',
- 'length' => 40,
- 'not null' => TRUE,
- ),
- // Key is a reserved word in MySQL so lets avoid that
- 'token_key' => array(
- 'description' => 'Token key.',
- 'type' => 'text',
- 'not null' => TRUE,
- ),
- 'secret' => array(
- 'description' => 'Token secret.',
- 'type' => 'text',
- 'not null' => TRUE,
- ),
- 'expires' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The expiry time for the token, as a Unix timestamp.',
- ),
- 'type' => array(
- 'description' => 'Token type: request or access.',
- 'type' => 'int',
- 'size' => 'tiny',
- 'not null' => TRUE,
- 'default' => 1, //OAUTH_COMMON_TOKEN_TYPE_ACCESS
- ),
- 'uid' => array(
- 'description' => 'User ID from {user}.uid.',
- 'type' => 'int',
- 'unsigned' => TRUE,
- 'not null' => TRUE,
- 'default' => 0,
- ),
- ),
- 'primary key' => array('tid'),
- 'indexes' => array(
- 'key_hash' => array('key_hash'),
- ),
- );
-}
-
-/**
- * Contains the provider token schema - used by oauth_common_schema() as well as latest related update function
- */
-function _oauth_common_provider_token_schema() {
- return array(
- 'description' => 'Additional data for OAuth tokens provided by this site.',
- 'fields' => array(
- 'tid' => array(
- 'description' => 'The {oauth_common_token}.tid this data is related to.',
- 'type' => 'int',
- 'unsigned' => TRUE,
- 'default' => 0
- ),
- 'token_key' => array(
- 'description' => 'Token key.',
- // This is our own internal key - it's always 32 characters long
- 'type' => 'char',
- 'length' => 32,
- 'not null' => TRUE,
- ),
- 'created' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The time that the token was created, as a Unix timestamp.',
- ),
- 'changed' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The last time the token was edited, as a Unix timestamp.',
- ),
- 'services' => array(
- 'description' => 'An array of services that the user allowed the consumer to access.',
- 'type' => 'text',
- ),
- 'authorized' => array(
- 'description' => 'In case its a request token, it checks if the user already authorized the consumer to get an access token.',
- 'type' => 'int',
- 'size' => 'tiny',
- 'not null' => TRUE,
- 'default' => 0,
- ),
- ),
- 'primary key' => array('token_key'),
- 'unique keys' => array(
- 'tid' => array('tid'),
- ),
- );
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * This update either creates a authorization levels table, or transfers the
- * authorization levels table from the services_oauth module.
- */
-function oauth_common_update_6001() {
- module_load_include('6001.inc', 'oauth_common', 'updates/update');
- return _oauth_common_update_6001();
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * This update adds a expiry time column to the tokens table.
- */
-function oauth_common_update_6002() {
- module_load_include('6002.inc', 'oauth_common', 'updates/update');
- return _oauth_common_update_6002();
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * This update makes it possible for consumers to store tokens in the common
- * token table. It also adds the possibility to add consumer-consumers to the
- * common consumer table.
- *
- * NB: There is a weakness in the current implementation that prevents a site
- * from acting as a consumer of itself. That would result in hitting a
- * unique constraint in the db as the token key is the primary key. /Hugo
- */
-function oauth_common_update_6003() {
- module_load_include('6003.inc', 'oauth_common', 'updates/update');
- return _oauth_common_update_6003();
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * This update adds the concept of contexts for consumers and authorization levels.
- * Also adding a couple of indexes that make sense when oauth_common is
- * acting as a consumer of other services.
- */
-function oauth_common_update_6100() {
- module_load_include('6100.inc', 'oauth_common', 'updates/update');
- return _oauth_common_update_6100();
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * This update turns the contexts into ctools-manageable entities and migrates
- * the authorization levels into the new contexts table.
- */
-function oauth_common_update_6200() {
- module_load_include('6200.inc', 'oauth_common', 'updates/update');
- return _oauth_common_update_6200();
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * This update unifies the handling of provider and consumer consumer entries.
- */
-function oauth_common_update_6201() {
- module_load_include('6201.inc', 'oauth_common', 'updates/update');
- return _oauth_common_update_6201();
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * This update allows for longer consumer secrets.
- */
-function oauth_common_update_6202() {
- module_load_include('6202.inc', 'oauth_common', 'updates/update');
- return _oauth_common_update_6202();
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * This update massively refactors the database.
- */
-function oauth_common_update_6300() {
- module_load_include('6300.inc', 'oauth_common', 'updates/update');
- return _oauth_common_update_6300();
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.module b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.module
deleted file mode 100644
index 9ae6b6f..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.module
+++ /dev/null
@@ -1,565 +0,0 @@
-<?php
-
-define('OAUTH_COMMON_CODE_BRANCH', '6.x-3.x');
-
-define('OAUTH_COMMON_TOKEN_TYPE_REQUEST', 0);
-define('OAUTH_COMMON_TOKEN_TYPE_ACCESS', 1);
-
-define('OAUTH_COMMON_VERSION_1', 1); // The original 1.0 spec
-define('OAUTH_COMMON_VERSION_1_RFC', 2); // The RFC 5849 1.0 spec
-
-//TODO: Don't act as a provider by default.
-//TODO: Check for other functions with breaking changes
-//TODO: Move admin pages to more regular places
-//TODO: Add watchdog messages about deprecated methods?
-//TODO: Move provider ui related pages to provider ui
-
-/**
- * Implementation of hook_theme().
- */
-function oauth_common_theme() {
- return array(
- 'oauth_common_auth_level' => array(
- 'template' => 'oauth_common_auth_level',
- 'arguments' => array(
- 'element' => array(),
- 'value' => NULL,
- ),
- ),
- );
-}
-
-/**
- * Implementation of hook_perm().
- */
-function oauth_common_perm() {
- $permissions = array(
- 'oauth authorize any consumers',
- 'oauth register any consumers',
- 'administer oauth',
- 'administer consumers',
- );
-
- // Add seperate permissions for creating and
- // authorizing consumers in each context.
- foreach (oauth_common_context_list() as $name => $title) {
- $permissions[] = sprintf('oauth register consumers in %s', $name);
- $permissions[] = sprintf('oauth authorize consumers in %s', $name);
- }
-
- return $permissions;
-}
-
-/**
- * Implementation of hook_menu().
- */
-function oauth_common_menu() {
- $menu = array();
-
- $admin_base = array(
- 'access arguments' => array('administer oauth'),
- 'file' => 'oauth_common.admin.inc',
- );
-
- $menu['admin/settings/oauth'] = array(
- 'title' => 'OAuth',
- 'description' => 'Settings for OAuth',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('_oauth_common_admin'),
- 'type' => MENU_NORMAL_ITEM,
- ) + $admin_base;
-
- $menu['admin/settings/oauth/settings'] = array(
- 'title' => 'Settings',
- 'description' => 'Settings for OAuth',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('_oauth_common_admin'),
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- 'weight' => 0,
- ) + $admin_base;
-
- // OAuth doesn't need different endpoints for the different context as all
- // actions are done with a specific consumer, which in itself is associated
- // with a context.
-
- $provider_base = array(
- 'access callback' => 'oauth_commmon_is_provider',
- 'file' => 'oauth_common.pages.inc',
- 'type' => MENU_CALLBACK,
- );
-
- // The endpoint that consumers use to get a request token.
- $menu['oauth/request_token'] = array(
- 'page callback' => 'oauth_common_callback_request_token',
- ) + $provider_base;
-
- // The page a user gets sent to to authorize a request token.
- $menu['oauth/authorize'] = array(
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('oauth_common_form_authorize'),
- ) + $provider_base;
-
- // The endpoint that consumers use to get a access token.
- $menu['oauth/access_token'] = array(
- 'page callback' => 'oauth_common_callback_access_token',
- ) + $provider_base;
-
- // This page is used both in consumer and provider mode. For consumers it is
- // the callback url and triggers hook_oauth_common_authorized(). For
- // providers it is the page where users end up if no callback url exists.
- $menu['oauth/authorized'] = array(
- 'title' => 'Authorization finished',
- 'page callback' => 'oauth_common_page_authorized',
- 'access arguments' => array('access content'),
- 'file' => 'oauth_common.pages.inc',
- 'type' => MENU_CALLBACK,
- );
-
- // TODO: Different structures makes sense depending on whether oauth_common is
- // acting as a provider or as a consumer.
-
- $menu['oauth/test/valid-consumer'] = array(
- 'file' => 'oauth_common.pages.inc',
- 'page callback' => '_oauth_common_validate_request_callback',
- 'page arguments' => array('consumer'),
- 'access callback' => 'oauth_commmon_is_provider',
- 'type' => MENU_CALLBACK,
- );
-
- $menu['oauth/test/valid-access-token'] = array(
- 'file' => 'oauth_common.pages.inc',
- 'page callback' => '_oauth_common_validate_request_callback',
- 'page arguments' => array('access token'),
- 'access callback' => 'oauth_commmon_is_provider',
- 'type' => MENU_CALLBACK,
- );
-
- return $menu;
-}
-
-/**
- * Menu system wildcard loader for provider consumers.
- *
- * @param string $key
- */
-function oauth_common_consumer_load($csid) {
- $consumer = DrupalOAuthConsumer::loadById($csid, TRUE);
- if (!$consumer) {
- $consumer = FALSE;
- }
- return $consumer;
-}
-
-/**
- * Menu system wildcard loader for provider tokens.
- *
- * @param string $key
- */
-function oauth_common_provider_token_load($tid) {
- $token = DrupalOAuthToken::loadByID($tid);
- if (!$token) {
- $token = FALSE;
- }
- return $token;
-}
-
-/**
- * Implementation of hook_cron().
- */
-function oauth_common_cron() {
- db_query("DELETE t, pt FROM {oauth_common_token} t LEFT JOIN {oauth_common_provider_token} pt ON pt.tid = t.tid
- WHERE t.expires != 0 AND t.expires <= %d", array(
- ':now' => time(),
- ));
-
- // Should 300 be overriden in DrupalOAuthServer and made configurable?
- db_query("DELETE FROM {oauth_common_nonce}
- WHERE `timestamp` < %d", array(
- ':now' => time() - 300,
- ));
-}
-
-/**
- * Implementation of hook_oauth_default_contexts().
- */
-function oauth_common_default_oauth_common_context() {
- $contexts = array();
-
- $context = new stdClass;
- $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
- $context->name = 'default';
- $context->title = 'Default context';
- $context->authorization_options = array();
- $context->authorization_levels = array(
- '*' => array(
- 'title' => 'Full access',
- 'description' => 'This will give @appname the same permissions that you normally have and will allow it to access the full range of services that @sitename provides.',
- ),
- 'read' => array(
- 'title' => 'Read access',
- 'description' => 'This will allow @appname to fetch content that you have access to on @sitename.',
- ),
- 'update' => array(
- 'title' => 'Update access',
- 'description' => 'This will allow @appname to update content that you have permissions to edit.',
- ),
- 'create' => array(
- 'title' => 'Create access',
- 'description' => 'This will allow @appname to create new content on @sitename.',
- ),
- 'delete' => array(
- 'title' => 'Delete access',
- 'description' => 'This will allow @appname to delete content from @sitename.',
- ),
- );
- $contexts[$context->name] = $context;
-
- return $contexts;
-}
-
-/**
- * Implementation of hook_user().
- */
-function oauth_common_user($op, &$edit, &$account, $category = NULL) {
- if ($op == 'delete') {
- // Delete all tokens and consumers related to a user
- module_load_include('inc', 'oauth_common');
- db_query("DELETE c, pc, t, pt FROM {oauth_common_consumer} c
- INNER JOIN {oauth_common_provider_consumer} pc ON pc.csid = c.csid
- LEFT JOIN {oauth_common_token} t ON t.csid = c.csid
- LEFT JOIN {oauth_common_provider_token} pt ON pt.tid = t.tid
- WHERE pc.uid = %d", array(
- ':uid' => $account->uid,
- ));
- db_query("DELETE t, pt FROM {oauth_common_token} t
- LEFT JOIN {oauth_common_provider_token} pt ON pt.tid = t.tid
- WHERE uid = %d", array(
- ':uid' => $account->uid,
- ));
- }
-}
-
-/**
- * Implementation of hook_xrds().
- */
-function services_oauth_xrds() {
- $xrds = array();
- $xrds['oauth'] = array(
- 'services' => array(
- array(
- 'data' => array(
- 'Type' => array('http://oauth.net/discovery/1.0'),
- 'URI' => array('#main'),
- ),
- ),
- array(
- 'data' => array(
- 'Type' => array(
- 'http://oauth.net/core/1.0/endpoint/request',
- 'http://oauth.net/core/1.0/parameters/auth-header',
- 'http://oauth.net/core/1.0/parameters/uri-query',
- 'http://oauth.net/core/1.0/signature/HMAC-SHA1',
- ),
- 'URI' => array(url('oauth/request_token', array('absolute' => TRUE))),
- ),
- ),
- array(
- 'data' => array(
- 'Type' => array(
- 'http://oauth.net/core/1.0/endpoint/authorize',
- 'http://oauth.net/core/1.0/parameters/uri-query',
- ),
- 'URI' => array(url('oauth/authorize', array('absolute' => TRUE))),
- ),
- ),
- array(
- 'data' => array(
- 'Type' => array(
- 'http://oauth.net/core/1.0/endpoint/access',
- 'http://oauth.net/core/1.0/parameters/auth-header',
- 'http://oauth.net/core/1.0/parameters/uri-query',
- 'http://oauth.net/core/1.0/signature/HMAC-SHA1',
- ),
- 'URI' => array(url('oauth/access_token', array('absolute' => TRUE))),
- ),
- ),
- ),
- );
- return $xrds;
-}
-
-/**
- * Access callback function used by several menu items.
- *
- * @param stdClass $user
- * A user object.
- * @param string $permission
- * The permission that is needed in addition to edit access on the $user.
- */
-function _oauth_common_user_access($user, $permission = NULL) {
- return user_edit_access($user) && (empty($permission) || user_access($permission));
-}
-
-/**
- * Checks if the user has permission to edit the consumer. Edit access is
- * granted if the user has the 'administer consumers' permission or may
- * edit the account connected to the consumer.
- *
- * @param DrupalOAuthConsumer $consumer
- * @return bool
- */
-function oauth_common_can_edit_consumer($consumer) {
- $may_edit = user_access('administer consumers');
-
- // If the user doesn't have consumer admin privileges, check for account
- // edit access.
- if (!$may_edit && $consumer->uid) {
- $user = user_load($consumer->uid);
- $may_edit = user_edit_access($user);
- }
-
- return $may_edit;
-}
-
-/**
- * Deterines if a user has the necessary permissions to create consumers.
- *
- * @param object $account
- * The user account to check permissions for. Defaults to the currently
- * logged in user.
- * @return bool
- */
-function oauth_common_can_create_consumers($account = NULL) {
- global $user;
- if (!$account) {
- $account = $user;
- }
-
- $can_register_consumers = user_access('oauth register any consumers', $account);
- if (!$can_register_consumers) {
- foreach (oauth_common_context_list() as $context => $title) {
- $can_register_consumers = $can_register_consumers || user_access(sprintf('oauth register consumers in %s', $context), $account);
- }
- }
- return $can_register_consumers;
-}
-
-/**
- * This function is used as a access callback
- * when the authentication of the request shouldn't be
- * done by the menu system.
- *
- * @return bool
- * Always returns TRUE
- */
-function _oauth_common_always_true() {
- return TRUE;
-}
-
-/**
- * Access callback that checks if a user may create authorizations in the
- * consumers context.
- *
- * @param DrupalOAuthConsumer $consumer
- * @return bool
- */
-function oauth_common_can_authorize_consumer($consumer) {
- return user_access(sprintf('oauth authorize consumers in %s', $consumer->context));
-}
-
-/**
- * Check if oauth_common is acting as a provider.
- */
-function oauth_commmon_is_provider() {
- return variable_get('oauth_common_enable_provider', TRUE);
-}
-
-/**
- * Gets a request token from a oauth provider and returns the authorization
- * url. The request token is saved in the database.
- *
- * @param OAuthToken $consumer_token
- * The consumer token to use
- * @param string $request_endpoint
- * Optional. Pass a custom endpoint if needed. Defaults to '/oauth/request_token'.
- * @param string $authorize_endpoint
- * Optional. Pass a custom endpoint if needed. Defaults to '/oauth/authorize'.
- * @return string
- * The url that the client should be redirected to to authorize
- * the request token.
- */
-function oauth_common_get_request_token($consumer_token, $request_endpoint = '/oauth/request_token', $authorize_endpoint = '/oauth/authorize') {
- $client = new DrupalOAuthClient($consumer_token);
- $request_token = $client->getRequestToken($request_endpoint);
- $request_token->write();
- return $client->getAuthorizationUrl($authorize_endpoint);
-}
-
-/**
- * Gets the tokens for a user.
- *
- * @param string $uid
- * @param string $type
- * @return array
- */
-function oauth_common_get_user_provider_tokens($uid) {
- $res = db_query("SELECT t.*, pt.created, pt.changed, pt.services, pt.authorized FROM {oauth_common_token} t
- INNER JOIN {oauth_common_provider_token} pt WHERE t.uid = %d AND t.type = %d", array(
- ':uid' => $uid,
- ':type' => OAUTH_COMMON_TOKEN_TYPE_ACCESS,
- ));
- $tokens = array();
- while ($token = DrupalOAuthToken::fromResult($res)) {
- $tokens[] = $token;
- }
- return $tokens;
-}
-
-/**
- * Create a new context with defaults appropriately set from schema.
- *
- * @return stdClass
- * An context initialized with the default values.
- */
-function oauth_common_context_new() {
- if (!module_exists('ctools')) {
- return FALSE;
- }
- ctools_include('export');
- return ctools_export_new_object('oauth_common_context');
-}
-
-/**
- * Load a single context.
- *
- * @param string $name
- * The name of the context.
- * @return stdClass
- * The context configuration.
- */
-function oauth_common_context_load($name) {
- if (!module_exists('ctools')) {
- return FALSE;
- }
- ctools_include('export');
- $result = ctools_export_load_object('oauth_common_context', 'names', array($name));
- if (isset($result[$name])) {
- return $result[$name];
- }
- else {
- return FALSE;
- }
-}
-
-/**
- * Loads the context for a request.
- *
- * @param OAuthRequest $request
- * @return object
- * The context configuration.
- */
-function oauth_common_context_from_request($request) {
- $context = NULL;
- $consumer_key = $request->get_parameter('oauth_consumer_key');
- $token_key = $request->get_parameter('oauth_token');
-
- if (empty($consumer_key) && !empty($token_key)) {
- $token = DrupalOAuthToken::loadByKey($token_key, FALSE, OAUTH_COMMON_TOKEN_TYPE_REQUEST);
- if ($token) {
- $consumer = $token->consumer;
- }
- }
-
- if (!empty($consumer_key)) {
- $consumer = DrupalOAuthConsumer::loadProviderByKey($consumer_key);
- }
-
- if ($consumer) {
- $context = oauth_common_context_load($consumer->context);
- }
-
- return $context;
-}
-
-/**
- * Load all contexts.
- *
- * @return array
- * Array of context objects keyed by context names.
- */
-function oauth_common_context_load_all() {
- if (!module_exists('ctools')) {
- return FALSE;
- }
- ctools_include('export');
- return ctools_export_load_object('oauth_common_context');
-}
-
-/**
- * Saves an context in the database.
- *
- * @return void
- */
-function oauth_common_context_save($context) {
- $update = (isset($context->cid)) ? array('cid') : array();
- drupal_write_record('oauth_common_context', $context, $update);
-}
-
-/**
- * Remove an context.
- *
- * @return void
- */
-function oauth_common_context_delete($context) {
- db_query("DELETE FROM {oauth_common_context} WHERE name = '%s' AND cid = %d", $context->name, $context->cid);
-}
-
-/**
- * Export an context.
- *
- * @return string
- */
-function oauth_common_context_export($context, $indent = '') {
- if (!module_exists('ctools')) {
- return FALSE;
- }
- ctools_include('export');
- $output = ctools_export_object('oauth_common_context', $context, $indent);
- return $output;
-}
-
-/**
- * Lists all available contexts.
- *
- * @return array
- */
-function oauth_common_context_list() {
- $return = array();
- $contexts = oauth_common_context_load_all();
- if ($contexts) {
- foreach ($contexts as $context) {
- $return[$context->name] = $context->title;
- }
- }
- return $return;
-}
-
-/**
- * Finds the current version of the OAuth module, used in eg. user agents
- *
- * @return string
- */
-function _oauth_common_version() {
- static $version;
- if (!isset($version)) {
- $info = db_result(db_query("SELECT info FROM {system} WHERE name = 'oauth_common'"));
- $info = $info ? unserialize($info) : FALSE;
- if (!$info || empty($info['version'])) {
- $version = OAUTH_COMMON_CODE_BRANCH;
- }
- else {
- $version = $info['version'];
- }
- }
- return $version;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.pages.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.pages.inc
deleted file mode 100644
index 854aeb0..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common.pages.inc
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-
-/**
- * Combined menu callback for tests of consumers and access tokens
- */
-function _oauth_common_validate_request_callback($type, $unsigned = NULL) {
- try {
- module_load_include('inc', 'oauth_common');
-
- list($signed, $consumer, $token) = oauth_common_verify_request();
-
- if ($consumer == NULL) {
- throw new OAuthException('Missing consumer token');
- }
-
- if (!$signed && $unsigned != 'unsigned') {
- throw new OAuthException("The request wasn't signed");
- }
-
- if ($token == NULL && $type == 'access token') {
- throw new OAuthException('Missing access token');
- }
- }
- catch (OAuthException $e) {
- drupal_set_header('HTTP/1.0 401 Unauthorized: ' . $e->getMessage());
- drupal_set_header(sprintf('WWW-Authenticate: OAuth realm="%s"', url('', array('absolute' => TRUE))));
- }
- exit;
-}
-
-/**
- * Menu callback for when something has been authorized - used in both client and provider flow
- *
- * @param $csid Should contain the id of the consumer when used in the client flow
- */
-function oauth_common_page_authorized($csid = NULL) {
- // If we have an oauth_token we're acting as a consumer and just got authorized
- if (!empty($_GET['oauth_token'])) {
- //TODO: Add documentation on how to use the callback url with
- $consumer = $csid ? DrupalOAuthConsumer::loadById($csid, FALSE) : FALSE;
- if ($consumer) {
- $request_token = DrupalOAuthToken::loadByKey($_GET['oauth_token'], $consumer, OAUTH_COMMON_TOKEN_TYPE_REQUEST);
- }
- else {
- // Backwards compatibility with 6.x-3.0-beta3
- $request_token = DrupalOAuthToken::load($_GET['oauth_token'], FALSE);
- $consumer = $request_token ? $request_token->consumer : FALSE;
- }
- if (!empty($request_token)) {
- $client = new DrupalOAuthClient($consumer, $request_token);
-
- $verifier = isset($_GET['oauth_verifier']) ? $_GET['oauth_verifier'] : NULL;
-
- $access_token = $client->getAccessToken(NULL, array('verifier' => $verifier));
- if ($access_token) {
- // We recieved a new token - save it
- if (!$access_token->in_database) {
- $access_token->write();
- }
- $request_token->delete();
- module_invoke_all('oauth_common_authorized', $consumer, $access_token, $request_token);
- }
- }
- }
- return t('The application has been authorized');
-}
-
-/**
- * Form for granting access to the consumer
- */
-function oauth_common_form_authorize() {
- module_load_include('inc', 'oauth_common');
- $req = DrupalOAuthRequest::from_request();
- $context = oauth_common_context_from_request($req);
-
- if (!$context) {
- drupal_set_message(t("Can't find OAuth context, check the site's settings."), 'error');
- return;
- }
-
- $token = $req->get_parameter('oauth_token');
- $callback = $req->get_parameter('oauth_callback');
- $token = DrupalOAuthToken::loadByKey($token, FALSE, OAUTH_COMMON_TOKEN_TYPE_REQUEST);
-
- // Check that we have a valid token
- if (!$token) {
- drupal_set_message(t('Please include a valid OAuth token in your request.'), 'error');
- return;
- }
-
- $consumer = $token->consumer;
-
- // Redirect to the right form, or present an error.
- global $user;
- if ($user->uid) {
- // There's some strange bug in the ?destination=... handling
- // This is not exactly beautiful, but it gets the work done
- // TODO: Find out why!
- if (drupal_substr($_SERVER['REQUEST_URI'], 0, 2) == '//') {
- header('Location: ' . drupal_substr($_SERVER['REQUEST_URI'], 1), TRUE, 302);
- }
-
- if (!(user_access('oauth authorize any consumers') || user_access('oauth authorize consumers in ' . $consumer->context))) {
- drupal_set_message(t('You are not authorized to allow external services access to this system.'), 'error');
- return drupal_access_denied();
- }
-
- if (!empty($context->authorization_options['automatic_authorization']) && $context->authorization_options['automatic_authorization'] && !empty($consumer->callback_url)) {
- // Authorize the request token
- $token->uid = $user->uid;
- $token->authorized = 1;
- $token->services = $context->authorization_options['default_authorization_levels'];
- $token->write(TRUE);
-
- // Pick the callback url apart and add the token parameter
- $callback = parse_url($consumer->callback_url);
- $query = array();
- parse_str($callback['query'], $query);
- $query['oauth_token'] = $token->key;
- $callback['query'] = http_build_query($query, 'idx_', '&');
-
- // Return to the consumer site
- header('Location: ' . _oauth_common_glue_url($callback), TRUE, 302);
- exit;
- }
-
- $tvars = array(
- '@user' => $user->name,
- '@appname' => $consumer->name,
- '@sitename' => variable_get('site_name', ''),
- );
-
- $title = !empty($context->title) ? $context->title : 'Authorize @appname';
- drupal_set_title(t($title, $tvars));
-
- $form = array();
-
- $form['token'] = array(
- '#type' => 'value',
- '#value' => $token,
- );
-
- $message = !empty($context->authorization_options['message']) ? $context->authorization_options['message'] :
- 'The application @appname wants to access @sitename on your behalf, check the permissions that you would like the application to have.';
- $form['message'] = array(
- '#type' => 'item',
- '#value' => t($message, $tvars),
- );
-
- $message = !empty($context->authorization_options['warning']) ? $context->authorization_options['warning'] :
- 'If you don\'t know what @appname is, or don\'t want to give it access to your content, just click here and we\'ll take you away from this page without granting @appname any access to @sitename.';
- $form['warning'] = array(
- '#type' => 'item',
- '#value' => l(t($message, $tvars), 'oauth/authorization/deny/' . $token->key),
- '#attributes' => array(
- 'class' => 'abort-authorization',
- ),
- );
-
- $disable_selection = !empty($context->authorization_options['disable_auth_level_selection']) && !empty($context->authorization_options['default_authorization_levels']) && $context->authorization_options['disable_auth_level_selection'];
- if (!$disable_selection) {
- $authorization_title = !empty($context->authorization_options['authorization_title']) ? $context->authorization_options['authorization_title'] :
- 'Permissions';
- $form['authorization'] = array(
- '#type' => 'fieldset',
- '#title' => t($authorization_title, $tvars),
- );
-
- $form['authorization']['levels'] = array(
- '#tree' => TRUE,
- );
- foreach ($context->authorization_levels as $name => $level) {
- $auth_opt = array(
- '#type' => 'checkbox',
- '#title' => t($level['title'], $tvars),
- '#description' => t($level['description'], $tvars),
- );
- $form['authorization']['levels'][$name] = $auth_opt;
- }
- }
- else {
- $form['authorization']['levels'] = array(
- '#tree' => TRUE,
- );
- foreach ($context->authorization_options['default_authorization_levels'] as $level) {
- $form['authorization']['levels'][$level] = array(
- '#type' => 'value',
- '#value' => $level,
- );
- }
- }
-
- $deny_title = !empty($context->authorization_options['deny_access_title']) ? $context->authorization_options['deny_access_title'] :
- 'Deny access';
- $form['deny'] = array(
- '#type' => 'item',
- '#value' => l(t($deny_title), 'oauth/authorization/deny/' . $token->key),
- '#attributes' => array(
- 'class' => 'deny-access',
- ),
- );
-
- $grant_title = !empty($context->authorization_options['grant_access_title']) ? $context->authorization_options['grant_access_title'] :
- 'Grant access';
- $form['confirm'] = array(
- '#type' => 'submit',
- '#value' => t($grant_title),
- );
-
- return $form;
- }
- else {
- $query = $_GET;
- unset($query['q']); // why are there so few q's?
- drupal_goto('user/login', array(
- 'destination' => url('oauth/authorize', array(
- 'query' => $query,
- )),
- ));
- }
-}
-
-/**
- * Validation of the form for granting access to the consumer
- */
-function oauth_common_form_authorize_validate($form, &$form_state) {
- $values = $form_state['values'];
- $got_permission = FALSE;
-
- $consumer = $values['token']->consumer;
- $context = oauth_common_context_load($consumer->context);
-
- if (!$context) {
- form_set_error('confirm', t("Can't find OAuth context."));
- return;
- }
-
- if (!$context->authorization_options['disable_auth_level_selection']) {
- foreach ($context->authorization_levels as $name => $level) {
- if ($values['levels'][$name]) {
- $got_permission = TRUE;
- break;
- }
- }
-
- if (!$got_permission) {
- form_set_error('confirm', t("You haven't given the application access to anything. Click on 'Deny access' or just close this window if you don't want to authorize it."));
- }
- }
-}
-
-/**
- * Form submit handler that grants access to the consumer
- */
-function oauth_common_form_authorize_submit(&$form, &$form_state) {
- global $user;
- $values = $form_state['values'];
-
- // Save the list of all services that the user allowed the
- // consumer to do
- $token = $values['token'];
- $token->uid = $user->uid;
- $token->authorized = 1;
- $consumer = $token->consumer;
- $context = oauth_common_context_load($consumer->context);
-
- if (!$context) {
- drupal_set_message(t("Can't find OAuth context, check the site's settings."), 'error');
- return;
- }
-
- // Add services
- if ($values['full_access']) { // TODO: Full access should be a configurable auth level
- $token->services = array('*');
- }
- elseif (!empty($values['levels'])) {
- $token->services = array_keys(array_filter($values['levels']));
- }
- else {
- $token->services = array();
- }
-
- $token->write(TRUE);
-
- if (!empty($consumer->callback_url) && $consumer->callback_url !== 'oob') {
- // Pick the callback url apart and add the token parameter
- $callback = parse_url($consumer->callback_url);
- $query = array();
- parse_str($callback['query'], $query);
- $query['oauth_token'] = $token->key;
- $callback['query'] = http_build_query($query, 'idx_', '&');
-
- // Return to the consumer site
- header('Location: ' . _oauth_common_glue_url($callback), TRUE, 302);
- exit;
- }
- else {
- drupal_goto('oauth/authorized');
- }
-}
-
-/**
- * Constructs the url to which to return someone who has asked for access to a consumer
- */
-function _oauth_common_glue_url($parsed) {
- $uri = isset($parsed['scheme']) ? $parsed['scheme'] . '://' : '';
- $uri .= isset($parsed['user']) ? $parsed['user'] . (isset($parsed['pass']) ? ':' . $parsed['pass'] : '') . '@' : '';
- $uri .= isset($parsed['host']) ? $parsed['host'] : '';
- $uri .= isset($parsed['port']) ? ':' . $parsed['port'] : '';
-
- if (isset($parsed['path'])) {
- $uri .= (substr($parsed['path'], 0, 1) == '/') ?
- $parsed['path'] :
- ((!empty($uri) ? '/' : '' ) . $parsed['path']);
- }
-
- $uri .= isset($parsed['query']) ? '?' . $parsed['query'] : '';
-
- return $uri;
-}
-
-/**
- * Generate a request token from the request.
- */
-function oauth_common_callback_request_token() {
- try {
- $req = DrupalOAuthRequest::from_request();
- $context = oauth_common_context_from_request($req);
- if (!$context) {
- throw new Exception('No OAuth context found');
- }
- $server = new DrupalOAuthServer($context);
- print $server->fetch_request_token($req);
- }
- catch (OAuthException $e) {
- drupal_set_header('HTTP/1.0 401 Unauthorized: ' . $e->getMessage());
- drupal_set_header(sprintf('WWW-Authenticate: OAuth realm="%s"', url('', array('absolute' => TRUE))));
- }
-}
-
-/**
- * Get a access token for the request
- */
-function oauth_common_callback_access_token() {
- try {
- $req = DrupalOAuthRequest::from_request();
- $context = oauth_common_context_from_request($req);
- if (!$context) {
- throw new Exception('No OAuth context found');
- }
- $server = new DrupalOAuthServer($context);
- $access_token = $server->fetch_access_token($req);
-
- // Set the expiry time based on context settings or get parameter
- $expires = !empty($context->authorization_options['access_token_lifetime']) ? time() + $context->authorization_options['access_token_lifetime'] : 0;
- if ($_GET['expires'] && intval($_GET['expires'])) {
- $hint = intval($_GET['expires']);
- // Only accept more restrictive expiry times
- if ($expires == 0 || $hint < $expires) {
- $expires = $hint;
- }
- }
-
- // Store the expiry time if the access token should expire
- if ($expires) {
- $access_token->expires = $expires;
- $access_token->write(TRUE);
- }
-
- print $access_token;
- }
- catch (OAuthException $e) {
- drupal_set_header('HTTP/1.0 401 Unauthorized: ' . $e->getMessage());
- drupal_set_header(sprintf('WWW-Authenticate: OAuth realm="%s"', url('', array('absolute' => TRUE))));
- }
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_auth_level.tpl.php b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_auth_level.tpl.php
deleted file mode 100644
index a27a579..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_auth_level.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-$element['left'] = array(
- '#prefix' => '<div class="oauth-common-left-panel">',
- '#suffix' => '</div>',
-);
-$element['right'] = array(
- '#prefix' => '<div class="oauth-common-right-panel">',
- '#suffix' => '</div>',
-);
-
-$children = element_children($element);
-foreach ($children as $key) {
- if (isset($element[$key]['#oauth_common_panel'])) {
- switch ($element[$key]['#oauth_common_panel']) {
- case 'left':
- $element['left'][$key] = $element[$key];
- unset($element[$key]);
- break;
- case 'right':
- $element['right'][$key] = $element[$key];
- unset($element[$key]);
- break;
- }
- }
-}
-?>
-
-<div class="oauth-common-auth-level">
- <?php print drupal_render($element); ?>
- <div class="clear"></div>
-</div>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_providerui.info b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_providerui.info
deleted file mode 100644
index ee5e2fa..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_providerui.info
+++ /dev/null
@@ -1,15 +0,0 @@
-name = OAuth Provider UI
-description = Provides a UI for when OAuth is acting as a provider.
-package = "OAuth"
-
-dependencies[] = oauth_common
-
-core = 6.x
-php = 5.2
-
-; Information added by drupal.org packaging script on 2011-04-06
-version = "6.x-3.0-beta4"
-core = "6.x"
-project = "oauth"
-datestamp = "1302103016"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_providerui.module b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_providerui.module
deleted file mode 100644
index 499101d..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/oauth_common_providerui.module
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-/**
- * Implementation of hook_menu().
- */
-function oauth_common_providerui_menu() {
- $menu = array();
- $admin_base = array(
- 'access arguments' => array('administer oauth'),
- 'file' => 'oauth_common.admin.inc',
- );
-
- $menu['admin/settings/oauth/contexts'] = array(
- 'title' => 'Contexts',
- 'description' => 'The different context for authorization',
- 'page callback' => 'oauth_common_list_context',
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 1,
- ) + $admin_base;
-
- ////////////
- // Context administration
- ////////////
-
- $menu['admin/settings/oauth/add'] = array(
- 'title' => 'Add context',
- 'page callback' => 'oauth_common_add_context',
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 10,
- ) + $admin_base;
-
- $menu['admin/settings/oauth/%oauth_common_context/edit'] = array(
- 'title' => 'Edit context',
- 'page callback' => 'oauth_common_edit_context',
- 'page arguments' => array(3),
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 10,
- ) + $admin_base;
-
- $menu['admin/settings/oauth/ahah/add-auth-level'] = array(
- 'page callback' => 'oauth_common_ahah_add_auth_level',
- 'type' => MENU_CALLBACK,
- ) + $admin_base;
-
- $menu['admin/settings/oauth/%oauth_common_context/export'] = array(
- 'title' => 'Export context',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('oauth_common_export_context', 3),
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 20,
- ) + $admin_base;
-
- $menu['admin/settings/oauth/%oauth_common_context/delete'] = array(
- 'title' => 'Delete context',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('oauth_common_delete_confirm_context', 3),
- 'type' => MENU_CALLBACK,
- ) + $admin_base;
-
- $menu['admin/settings/oauth/%oauth_common_context/disable'] = array(
- 'page callback' => 'oauth_common_context',
- 'page arguments' => array(3),
- 'type' => MENU_CALLBACK,
- ) + $admin_base;
-
- $menu['admin/settings/oauth/%oauth_common_context/enable'] = array(
- 'page callback' => 'oauth_common_enable_context',
- 'page arguments' => array(3),
- 'type' => MENU_CALLBACK,
- ) + $admin_base;
-
- ////////////
- // Authorization administration
- ////////////
-
- $menu['user/%user/oauth'] = array(
- 'title' => 'Authorization',
- 'page callback' => 'oauth_common_page_user_authorizations',
- 'page arguments' => array(1, TRUE),
- 'access callback' => '_oauth_common_user_access',
- 'access arguments' => array(1),
- 'file' => 'oauth_common.authorizations.inc',
- 'type' => MENU_LOCAL_TASK,
- );
-
- $menu['user/%user/oauth/authorizations'] = array(
- 'title' => 'Authorizations',
- 'page callback' => 'oauth_common_page_user_authorizations',
- 'page arguments' => array(1, TRUE),
- 'access callback' => '_oauth_common_user_access',
- 'access arguments' => array(1),
- 'file' => 'oauth_common.authorizations.inc',
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- );
-
- $menu['user/%user/oauth/authorizations/%oauth_common_provider_token'] = array(
- 'title' => 'Edit authorization',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('oauth_common_form_authorization', 4),
- 'access callback' => '_oauth_common_user_access',
- 'access arguments' => array(1, 'oauth authorize consumers'),
- 'file' => 'oauth_common.authorizations.inc',
- 'type' => MENU_LOCAL_TASK,
- );
-
- $menu['user/%user/oauth/authorizations/%oauth_common_provider_token/ahah/secret'] = array(
- 'page callback' => 'oauth_common_ahah_secret',
- 'page arguments' => array(4),
- 'access callback' => '_oauth_common_user_access',
- 'access arguments' => array(1, 'oauth authorize consumers'),
- 'file' => 'oauth_common.inc',
- 'type' => MENU_CALLBACK,
- );
-
- $menu['user/%user/oauth/authorizations/%oauth_common_provider_token/delete'] = array(
- 'title' => 'Delete authorization',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('oauth_common_form_authorization_delete', 1, 4),
- // We always want to allow the user to delete a authorization, that
- // shouldn't be a permission that can be rescinded.
- 'access callback' => 'user_edit_access',
- 'access arguments' => array(1),
- 'file' => 'oauth_common.authorizations.inc',
- 'type' => MENU_LOCAL_TASK,
- );
-
- ////////////
- // Consumer administration
- ////////////
-
- $menu['user/%user/oauth/consumers'] = array(
- 'title' => 'Consumers',
- 'page callback' => 'oauth_common_page_user_consumers',
- 'page arguments' => array(1),
- 'access callback' => '_oauth_common_user_access',
- 'access arguments' => array(1),
- 'file' => 'oauth_common.consumers.inc',
- 'type' => MENU_LOCAL_TASK,
- );
-
- $menu['user/%user/oauth/consumer/add'] = array(
- 'title' => 'Add consumer',
- 'page callback' => 'oauth_common_add_consumer',
- 'page arguments' => array(1),
- 'access callback' => 'oauth_common_can_create_consumers',
- 'file' => 'oauth_common.consumers.inc',
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 10,
- );
-
- $menu['user/%user/oauth/consumer/%oauth_common_consumer'] = array(
- 'title' => 'Edit consumer',
- 'page callback' => 'oauth_common_edit_consumer',
- 'page arguments' => array(4),
- 'access callback' => 'oauth_common_can_edit_consumer',
- 'access arguments' => array(4),
- 'file' => 'oauth_common.consumers.inc',
- 'type' => MENU_LOCAL_TASK,
- );
-
- $menu['user/%user/oauth/consumer/%oauth_common_consumer/ahah/secret'] = array(
- 'page callback' => 'oauth_common_ahah_secret',
- 'page arguments' => array(4),
- 'access callback' => 'oauth_common_can_edit_consumer',
- 'access arguments' => array(4),
- 'file' => 'oauth_common.inc',
- 'type' => MENU_CALLBACK,
- );
-
- $menu['user/%user/oauth/consumer/%oauth_common_consumer/delete'] = array(
- 'title' => 'Delete consumer',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('oauth_common_form_consumer_delete', 4),
- 'access callback' => 'oauth_common_can_edit_consumer',
- 'access arguments' => array(4),
- 'file' => 'oauth_common.consumers.inc',
- 'type' => MENU_LOCAL_TASK,
- );
-
- $menu['user/%user/oauth/consumer/%oauth_common_consumer/add-authorization'] = array(
- 'title' => 'Add authorization',
- 'page callback' => 'oauth_common_authorization_add',
- 'page arguments' => array(4),
- 'access callback' => 'oauth_common_can_authorize_consumer',
- 'access arguments' => array(4),
- 'file' => 'oauth_common.authorizations.inc',
- 'type' => MENU_LOCAL_TASK,
- );
-
- return $menu;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6001.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6001.inc
deleted file mode 100644
index a4bc1df..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6001.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * This update either creates a authorization levels table, or transfers the
- * authorization levels table from the services_oauth module.
- */
-function _oauth_common_update_6001() {
- $ret = array();
- if (db_table_exists('services_oauth_authorization_levels')) {
- $ret[] = update_sql("ALTER TABLE {services_oauth_authorization_levels} RENAME TO {oauth_authorization_levels}");
- }
- else {
- db_create_table($ret, 'oauth_authorization_levels', _oauth_common_oauth_authorization_levels_6001());
- }
- return $ret;
-}
-
-function _oauth_common_oauth_authorization_levels_6001() {
- return array(
- 'description' => t('Stores the different authorization levels that are available for access tokens.'),
- 'fields' => array(
- 'name' => array(
- 'description' => t('The computer-readable name of the authorization level.'),
- 'type' => 'varchar',
- 'length' => 32,
- 'not null' => TRUE,
- ),
- 'title' => array(
- 'description' => t('The localizable title of the authorization level.'),
- 'type' => 'varchar',
- 'length' => 100,
- 'not null' => TRUE,
- ),
- 'description' => array(
- 'description' => t('The localizable description of the authorization level.'),
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- ),
- ),
- 'primary key' => array('name'),
- );
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6002.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6002.inc
deleted file mode 100644
index fbe431a..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6002.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * This update adds a expiry time column to the tokens table.
- */
-function _oauth_common_update_6002() {
- $ret = array();
-
- db_add_field($ret, 'oauth_common_token', 'expires', array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The expiry time for the token, as a Unix timestamp.',
- ));
- db_add_index($ret, 'oauth_common_token', 'expires', array('expires'));
- $ret[] = update_sql("UPDATE {oauth_common_token} SET expires=created+7200 WHERE type='request'");
-
- return $ret;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6003.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6003.inc
deleted file mode 100644
index 5d94bcf..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6003.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * This update makes it possible for consumers to store tokens in the common
- * token table. It also adds the possibility to add consumer-consumers to the
- * common consumer table.
- *
- * NB: There is a weakness in the current implementation that prevents a site
- * from acting as a consumer of itself. That would result in hitting a
- * unique constraint in the db as the token key is the primary key. /Hugo
- */
-function _oauth_common_update_6003() {
- $ret = array();
-
- db_add_field($ret, 'oauth_common_token', 'provider_token', array(
- 'description' => t('Whether this is a consumer or a provider token'),
- 'type' => 'int',
- 'size' => 'tiny',
- 'unsigned' => TRUE,
- 'not null' => TRUE,
- 'default' => 1,
- ));
-
- db_add_field($ret, 'oauth_common_consumer', 'provider_consumer', array(
- 'description' => t('Whether this is a provider consumer or a consumer consumer'),
- 'type' => 'int',
- 'size' => 'tiny',
- 'unsigned' => TRUE,
- 'not null' => TRUE,
- 'default' => 1,
- ));
-
- return $ret;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6100.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6100.inc
deleted file mode 100644
index 4b41b2c..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6100.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * This update adds the concept of contexts for consumers and authorization levels.
- * Also adding a couple of indexes that make sense when oauth_common is
- * acting as a consumer of other services.
- */
-function _oauth_common_update_6100() {
- $ret = array();
-
- db_add_index($ret, 'oauth_common_token', 'consumer', array('consumer_key', 'type', 'provider_token'));
-
- db_drop_index($ret, 'oauth_common_consumer_token', 'token_key_type');
- db_drop_field($ret, 'oauth_common_consumer_token', 'type');
- db_add_field($ret, 'oauth_common_consumer_token', 'provider_url', array(
- 'description' => t('The url to the provider.'),
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- ));
- db_add_field($ret, 'oauth_common_consumer_token', 'access_endpoint', array(
- 'description' => t('The endpoint to fetch the access token.'),
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- 'default' => '',
- ));
-
- db_add_field($ret, 'oauth_authorization_levels', 'context', array(
- 'description' => t('The context for the authorization level.'),
- 'type' => 'varchar',
- 'length' => 32,
- 'not null' => TRUE,
- 'default' => 'default',
- ));
-
- db_add_field($ret, 'oauth_authorization_levels', 'weight', array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'Determines the order that the authorization levels will be displayed in.',
- ));
-
- db_add_field($ret, 'oauth_authorization_levels', 'enabled', array(
- 'type' => 'int',
- 'size' => 'tiny',
- 'unsigned' => TRUE,
- 'not null' => TRUE,
- 'default' => 1,
- 'description' => 'Whether the authorization level is enabled or disabled.',
- ));
-
- db_drop_primary_key($ret, 'oauth_authorization_levels');
- db_add_primary_key($ret, 'oauth_authorization_levels', array('name', 'context'));
-
- db_add_field($ret, 'oauth_common_consumer', 'context', array(
- 'description' => t('The application context.'),
- 'type' => 'varchar',
- 'length' => 32,
- 'not null' => TRUE,
- 'default' => 'default',
- ));
-
- return $ret;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6200.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6200.inc
deleted file mode 100644
index acedb06..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6200.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * This update turns the contexts into ctools-manageable entities and migrates
- * the authorization levels into the new contexts table.
- */
-function _oauth_common_update_6200() {
- $ret = array();
-
- $contexts = array();
-
- db_create_table($ret, 'oauth_common_context', _oauth_common_oauth_common_context_6200());
-
- // Fetch the authorization levels and create contexts from them
- $res = db_query("SELECT * FROM {oauth_authorization_levels}");
- while ($l = db_fetch_array($res)) {
- $name = $l['name'];
- $context = $l['context'];
- unset($l['name'], $l['context']);
- if (!isset($contexts[$name])) {
- $contexts[$name] = oauth_common_context_new();
- $contexts[$name]->name = $name;
- $contexts[$name]->title = $name;
- }
- $contexts[$context]['authorization_levels'][$name] = $l;
- }
- foreach ($contexts as $context) {
- oauth_common_context_save($context);
- }
-
- // Change all the oauth_common_token indexes and keys to take provider_token
- // into account.
- db_drop_primary_key(&$ret, 'oauth_common_token');
- db_drop_index(&$ret, 'oauth_common_token', 'token_key_type');
- db_drop_index(&$ret, 'oauth_common_token', 'consumer_key');
-
- db_add_primary_key(&$ret, 'oauth_common_token', array('token_key', 'provider_token'));
- db_add_index(&$ret, 'oauth_common_token', 'token_key_type', array('token_key', 'provider_token', 'type'));
- db_add_index(&$ret, 'oauth_common_token', 'consumer_key', array('consumer_key', 'provider_token'));
-
- db_drop_table($ret, 'oauth_authorization_levels');
-
- return $ret;
-}
-
-function _oauth_common_oauth_common_context_6200() {
- return array(
- 'description' => 'Stores contexts for OAuth common',
- 'export' => array(
- 'identifier' => 'context',
- 'export callback' => 'oauth_common_context_export',
- 'list callback' => 'oauth_common_context_list',
- 'key' => 'name',
- ),
- 'fields' => array(
- 'cid' => array(
- 'type' => 'serial',
- 'description' => 'Primary ID field for the table. Not used for anything except internal lookups.',
- 'not null' => TRUE,
- 'no export' => TRUE,
- ),
- 'name' => array(
- 'description' => 'The computer-readable name of the context.',
- 'type' => 'varchar',
- 'length' => 32,
- 'not null' => TRUE,
- ),
- 'title' => array(
- 'description' => 'The localizable title of the authorization context.',
- 'type' => 'varchar',
- 'length' => 100,
- 'not null' => TRUE,
- ),
- 'authorization_options' => array(
- 'description' => 'Authorization options.',
- 'type' => 'text',
- 'size' => 'big',
- 'not null' => TRUE,
- 'serialize' => TRUE,
- 'object default' => array(),
- ),
- 'authorization_levels' => array(
- 'description' => 'Authorization levels for the context.',
- 'type' => 'text',
- 'size' => 'big',
- 'not null' => TRUE,
- 'serialize' => TRUE,
- 'object default' => array(),
- ),
- ),
- 'primary key' => array('cid'),
- 'unique keys' => array(
- 'context' => array('name'),
- ),
- );
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6201.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6201.inc
deleted file mode 100644
index 3fa4ee2..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6201.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * This update unifies the handling of provider and consumer consumer entries.
- */
-function _oauth_common_update_6201() {
- $ret = array();
- // Refresh our schema so that DrupalOAuthConsumer can
- // use drupal_write_record().
- drupal_get_schema('oauth_common_consumer', TRUE);
-
- if (!class_exists('DrupalOAuthConsumer')) {
- $path = drupal_get_path('module', 'oauth_common');
- require_once($path . '/lib/OAuth.php');
- require_once($path . '/includes/DrupalOAuthConsumer.inc');
- }
-
- // Change the oauth_common_consumer primary key to include the
- // provider_consumer field.
- db_drop_primary_key($ret, 'oauth_common_consumer');
- db_add_primary_key($ret, 'oauth_common_consumer', array('consumer_key', 'provider_consumer'));
-
- // The configuration field will be used to store provider_url, access_endpoint
- // and other configuration data.
- db_add_field($ret, 'oauth_common_consumer', 'configuration', array(
- 'description' => t('Consumer configuration'),
- 'type' => 'text',
- 'serialized' => TRUE,
- 'size' => 'big',
- 'not null' => TRUE,
- 'object default' => array(),
- ));
-
- // The consumer type was never used, now it's story ends.
- db_drop_field($ret, 'oauth_common_consumer', 'type');
-
- // Transfer all DrupalOAuthConsumerTokens to DrupalOAuthConsumer
- $res = db_query('SELECT * FROM {oauth_common_consumer_token}');
- while ($ct = db_fetch_array($res)) {
- //TODO: Fix this - the upgrade path might be broken?
- $consumer = new DrupalOAuthConsumer($ct['token_key'], $ct['secret'], 'oob', FALSE, array(
- 'uid' => $ct['uid'],
- 'name' => $ct['provider_url'],
- 'configuration' => array(
- 'provider_url' => $ct['provider_url'],
- 'access_endpoint' => $ct['access_endpoint'],
- ),
- ));
- $consumer->write();
- }
-
- db_drop_table($ret, 'oauth_common_consumer_token');
-
- return $ret;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6202.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6202.inc
deleted file mode 100644
index 1702db8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6202.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * This update allows for longer consumer secrets.
- */
-function _oauth_common_update_6202() {
- $ret = array();
-
- db_change_field($ret, 'oauth_common_consumer', 'consumer_key', 'consumer_key', array(
- 'description' => t('Consumer key.'),
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- ));
-
- db_change_field($ret, 'oauth_common_consumer', 'secret', 'secret', array(
- 'description' => t('Consumer secret.'),
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- ));
-
- db_change_field($ret, 'oauth_common_token', 'secret', 'secret', array(
- 'description' => t('Consumer secret.'),
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- ));
-
- db_change_field($ret, 'oauth_common_token', 'token_key', 'token_key', array(
- 'description' => t('Token key.'),
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- ));
-
- db_change_field($ret, 'oauth_common_token', 'consumer_key', 'consumer_key', array(
- 'description' => t('Consumer key from {oauth_common_consumer}.consumer_key.'),
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- ));
-
- return $ret;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6300.inc b/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6300.inc
deleted file mode 100644
index e256e5c..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/oauth/updates/update.6300.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * This update massively refactors the database.
- */
-function _oauth_common_update_6300() {
- $ret = array();
-
- $oauth_common_consumer = _oauth_common_consumer_schema();
- $oauth_common_token = _oauth_common_token_schema();
- $oauth_common_provider_consumer = _oauth_common_provider_consumer_schema();
- $oauth_common_provider_token = _oauth_common_provider_token_schema();
-
- db_drop_primary_key($ret, 'oauth_common_consumer');
- db_drop_primary_key($ret, 'oauth_common_token');
-
- db_drop_index($ret, 'oauth_common_token', 'token_key_type');
- db_drop_index($ret, 'oauth_common_token', 'consumer_key');
-
- db_drop_index($ret, 'oauth_common_nonce', 'timestamp');
-
- db_add_field($ret, 'oauth_common_consumer', 'csid', $oauth_common_consumer['fields']['csid'], array('primary key' => array('csid')));
- db_add_field($ret, 'oauth_common_consumer', 'key_hash', $oauth_common_consumer['fields']['key_hash'], array('indexes' => array('key_hash' => array('key_hash'))));
-
- db_add_field($ret, 'oauth_common_token', 'tid', $oauth_common_token['fields']['tid'], array('primary key' => array('tid')));
- db_add_field($ret, 'oauth_common_token', 'csid', $oauth_common_token['fields']['csid']);
- db_add_field($ret, 'oauth_common_token', 'key_hash', $oauth_common_token['fields']['key_hash'], array('indexes' => array('key_hash' => array('key_hash'))));
- db_add_field($ret, 'oauth_common_token', 'type_new', $oauth_common_token['fields']['type']);
-
- db_change_field($ret, 'oauth_common_consumer', 'consumer_key', 'consumer_key', $oauth_common_consumer['fields']['consumer_key']);
- db_change_field($ret, 'oauth_common_consumer', 'secret', 'secret', $oauth_common_consumer['fields']['secret']);
-
- db_change_field($ret, 'oauth_common_token', 'token_key', 'token_key', $oauth_common_token['fields']['token_key']);
- db_change_field($ret, 'oauth_common_token', 'secret', 'secret', $oauth_common_token['fields']['secret']);
-
- db_change_field($ret, 'oauth_common_nonce', 'nonce', 'nonce', array(
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE
- ));
- db_change_field($ret, 'oauth_common_nonce', 'token', 'token_key', array(
- 'type' => 'varchar',
- 'length' => 32,
- 'not null' => TRUE,
- ), array('indexes' => array(
- 'timekey' => array('timestamp', 'token_key'),
- )));
-
- db_create_table($ret, 'oauth_common_provider_consumer', $oauth_common_provider_consumer);
- db_create_table($ret, 'oauth_common_provider_token', $oauth_common_provider_token);
-
- $ret[] = update_sql('INSERT INTO {oauth_common_provider_consumer}
- (csid, consumer_key, created, changed, uid, name, context, callback_url)
- SELECT c.csid, c.consumer_key, c.created, c.changed, c.uid, c.name, c.context, c.callback_url
- FROM {oauth_common_consumer} c WHERE c.provider_consumer = 1');
- $ret[] = update_sql('INSERT INTO {oauth_common_provider_token}
- (tid, token_key, created, changed, services, authorized)
- SELECT t.tid, t.token_key, t.created, t.changed, t.services, t.authorized
- FROM {oauth_common_token} t WHERE t.provider_token = 1');
-
- $ret[] = update_sql("UPDATE {oauth_common_consumer} SET key_hash = SHA1(consumer_key)");
- $ret[] = update_sql("UPDATE {oauth_common_token} SET type_new = (type != 'access'), key_hash = SHA1(token_key)");
- $ret[] = update_sql("UPDATE {oauth_common_token} t, {oauth_common_consumer} c SET t.csid = c.csid WHERE t.consumer_key = c.consumer_key");
-
- $to_drop = array('provider_consumer', 'created', 'changed', 'uid', 'name', 'context', 'callback_url');
- foreach ($to_drop as $field) {
- db_drop_field($ret, 'oauth_common_consumer', $field);
- }
-
- $to_drop = array('provider_token', 'type', 'consumer_key', 'created', 'changed', 'services', 'authorized');
- foreach ($to_drop as $field) {
- db_drop_field($ret, 'oauth_common_token', $field);
- }
-
- db_change_field($ret, 'oauth_common_token', 'type_new', 'type', $oauth_common_token['fields']['type']);
-
- return $ret;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/LICENSE.txt b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/LICENSE.txt
deleted file mode 100644
index 2c095c8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/LICENSE.txt
+++ /dev/null
@@ -1,274 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-
- Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
-Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
-verbatim copies of this license document, but changing it is not allowed.
-
- Preamble
-
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public License
-applies to most of the Free Software Foundation's software and to any other
-program whose authors commit to using it. (Some other Free Software
-Foundation software is covered by the GNU Library General Public License
-instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this service if
-you wish), that you receive source code or can get it if you want it, that you
-can change the software or use pieces of it in new free programs; and that
-you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have. You must make
-sure that they, too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If the
-software is modified by someone else and passed on, we want its recipients
-to know that what they have is not the original, so that any problems
-introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
- MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms
-of this General Public License. The "Program", below, refers to any such
-program or work, and a "work based on the Program" means either the
-Program or any derivative work under copyright law: that is to say, a work
-containing the Program or a portion of it, either verbatim or with
-modifications and/or translated into another language. (Hereinafter, translation
-is included without limitation in the term "modification".) Each licensee is
-addressed as "you".
-
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made
-by running the Program). Whether that is true depends on what the Program
-does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it,
-thus forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you
-also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that
-you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or in
-part contains or is derived from the Program or any part thereof, to be
-licensed as a whole at no charge to all third parties under the terms of this
-License.
-
-c) If the modified program normally reads commands interactively when run,
-you must cause it, when started running for such interactive use in the most
-ordinary way, to print or display an announcement including an appropriate
-copyright notice and a notice that there is no warranty (or else, saying that
-you provide a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this License.
-(Exception: if the Program itself is interactive but does not normally print such
-an announcement, your work based on the Program is not required to print
-an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be
-reasonably considered independent and separate works in themselves, then
-this License, and its terms, do not apply to those sections when you distribute
-them as separate works. But when you distribute the same sections as part
-of a whole which is a work based on the Program, the distribution of the
-whole must be on the terms of this License, whose permissions for other
-licensees extend to the entire whole, and thus to each and every part
-regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to
-work written entirely by you; rather, the intent is to exercise the right to
-control the distribution of derivative or collective works based on the
-Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the scope
-of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1
-and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source
-code, which must be distributed under the terms of Sections 1 and 2 above
-on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give
-any third party, for a charge no more than your cost of physically performing
-source distribution, a complete machine-readable copy of the corresponding
-source code, to be distributed under the terms of Sections 1 and 2 above on
-a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for
-noncommercial distribution and only if you received the program in object
-code or executable form with such an offer, in accord with Subsection b
-above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation and
-installation of the executable. However, as a special exception, the source
-code distributed need not include anything that is normally distributed (in
-either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the
-source code from the same place counts as distribution of the source code,
-even though third parties are not compelled to copy the source along with the
-object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy,
-modify, sublicense or distribute the Program is void, and will automatically
-terminate your rights under this License. However, parties who have received
-copies, or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the
-Program or its derivative works. These actions are prohibited by law if you
-do not accept this License. Therefore, by modifying or distributing the
-Program (or any work based on the Program), you indicate your acceptance
-of this License to do so, and all its terms and conditions for copying,
-distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these terms and
-conditions. You may not impose any further restrictions on the recipients'
-exercise of the rights granted herein. You are not responsible for enforcing
-compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License. If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices. Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose
-that choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded. In such
-case, this License incorporates the limitation as if written in the body of this
-License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will be
-similar in spirit to the present version, but may differ in detail to address new
-problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-a version number of this License which applies to it and "any later version",
-you have the option of following the terms and conditions either of that
-version or of any later version published by the Free Software Foundation. If
-the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we sometimes make
-exceptions for this. Our decision will be guided by the two goals of
-preserving the free status of all derivatives of our free software and of
-promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
-PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
-AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
-ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
-LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE
-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
-OR DATA BEING RENDERED INACCURATE OR LOSSES
-SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
-IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/README.txt b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/README.txt
deleted file mode 100644
index 1192bd3..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-For further informations please consult the project page : http://drupal.org/project/tagging
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/add-suggestion.png b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/add-suggestion.png
deleted file mode 100644
index 24688c8..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/add-suggestion.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/add.png b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/add.png
deleted file mode 100644
index 6332fef..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/add.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_extractor.inc b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_extractor.inc
deleted file mode 100644
index 2efd22e..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_extractor.inc
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-// $Id: extractor_simple.inc,v 1.5 2010/09/10 19:21:08 alexb Exp $
-
-/**
- * @file:
- * Simple term extraction.
- */
-
-/**
- * Finds tags in text.
- */
-function drupalwiki_extractor_extract($text, $lang = 'de', $minCount = 2) {
- $text = strip_tags($text);
- $text = str_replace(' ',' ',$text);
- // replace punctation
- $text = preg_replace(array('/[?]/','/[.]/','/[,]/','/:/'),' ',$text);
- $text = drupalwiki_extractor_strip_symbols( $text );
- $text = drupalwiki_extractor_strip_numbers( $text );
-
- $text = drupal_strtolower( $text );
- mb_regex_encoding( "utf-8" );
- //$words = preg_split("/[\s,.:\-\(\)\[\]{}*\/]+/", $text);
- $words = preg_split("/[\s\t]/", $text);
- $result = array();
- // remove stopwords
- $stopWords = drupalwiki_extractor_stop_words();
- $words = array_diff( $words, $stopWords );
-
- // $stemmer = _drupalwiki_extractor_pecl_stem_loaded($lang);
- // dsm($stemmer);
- foreach($words as $key => &$word) {
- $word = trim($word);
- // remove all words starting with a special character, a number or shorter then 3
- if( strlen($word) < 3 || !preg_match("/^[\w]+/", $word) || preg_match("/^[\d]+/", $word) ) {
- unset($words[$key]);
- }
- /*if($stemmer != FALSE) {
- $word = $stemmer($word);
- }*/
- }
-
- $keywordCounts = array_count_values( $words );
- arsort( $keywordCounts, SORT_NUMERIC );
- $result = array();
- foreach($keywordCounts as $key => $count ){
- if($minCount != NULL && $minCount > $count) {
- // skip
- }
- else {
- $result[] = array(
- '#name' => ucfirst($key),
- '#weight' => -$count
- );
- }
- }
- return $result;
-}
-
-function _drupalwiki_extractor_pecl_stem_loaded($lang) {
- // TODO: add more
- switch($lang) {
- case 'de':
- $stemmer = 'stem_german';
- break;
- default:
- $stemmer = 'stem_english';
- break;
- }
-
- return (extension_loaded('stem') && function_exists($stemmer)) ? $stemmer : FALSE;
-}
-
-function drupalwiki_extractor_strip_symbols( $text )
-{
- $plus = '\+\x{FE62}\x{FF0B}\x{208A}\x{207A}';
- $minus = '\x{2012}\x{208B}\x{207B}';
-
- $units = '\\x{00B0}\x{2103}\x{2109}\\x{23CD}';
- $units .= '\\x{32CC}-\\x{32CE}';
- $units .= '\\x{3300}-\\x{3357}';
- $units .= '\\x{3371}-\\x{33DF}';
- $units .= '\\x{33FF}';
-
- $ideo = '\\x{2E80}-\\x{2EF3}';
- $ideo .= '\\x{2F00}-\\x{2FD5}';
- $ideo .= '\\x{2FF0}-\\x{2FFB}';
- $ideo .= '\\x{3037}-\\x{303F}';
- $ideo .= '\\x{3190}-\\x{319F}';
- $ideo .= '\\x{31C0}-\\x{31CF}';
- $ideo .= '\\x{32C0}-\\x{32CB}';
- $ideo .= '\\x{3358}-\\x{3370}';
- $ideo .= '\\x{33E0}-\\x{33FE}';
- $ideo .= '\\x{A490}-\\x{A4C6}';
-
- return preg_replace(
- array(
- // Remove modifier and private use symbols.
- '/[\p{Sk}\p{Co}]/u',
- // Remove mathematics symbols except + - = ~ and fraction slash
- '/\p{Sm}(?<![' . $plus . $minus . '=~\x{2044}])/u',
- // Remove + - if space before, no number or currency after
- '/((?<= )|^)[' . $plus . $minus . ']+((?![\p{N}\p{Sc}])|$)/u',
- // Remove = if space before
- '/((?<= )|^)=+/u',
- // Remove + - = ~ if space after
- '/[' . $plus . $minus . '=~]+((?= )|$)/u',
- // Remove other symbols except units and ideograph parts
- '/\p{So}(?<![' . $units . $ideo . '])/u',
- // Remove consecutive white space
- '/ +/',
- ),
- ' ',
- $text );
-}
-
-/**
- * Strip numbers from text.
- */
-function drupalwiki_extractor_strip_numbers( $text )
-{
- $urlchars = '\.,:;\'=+\-_\*%@&\/\\\\?!#~\[\]\(\)';
- $notdelim = '\p{L}\p{M}\p{N}\p{Pc}\p{Pd}' . $urlchars;
- $predelim = '((?<=[^' . $notdelim . '])|^)';
- $postdelim = '((?=[^' . $notdelim . '])|$)';
-
- $fullstop = '\x{002E}\x{FE52}\x{FF0E}';
- $comma = '\x{002C}\x{FE50}\x{FF0C}';
- $arabsep = '\x{066B}\x{066C}';
- $numseparators = $fullstop . $comma . $arabsep;
- $plus = '\+\x{FE62}\x{FF0B}\x{208A}\x{207A}';
- $minus = '\x{2212}\x{208B}\x{207B}\p{Pd}';
- $slash = '[\/\x{2044}]';
- $colon = ':\x{FE55}\x{FF1A}\x{2236}';
- $units = '%\x{FF05}\x{FE64}\x{2030}\x{2031}';
- $units .= '\x{00B0}\x{2103}\x{2109}\x{23CD}';
- $units .= '\x{32CC}-\x{32CE}';
- $units .= '\x{3300}-\x{3357}';
- $units .= '\x{3371}-\x{33DF}';
- $units .= '\x{33FF}';
- $percents = '%\x{FE64}\x{FF05}\x{2030}\x{2031}';
- $ampm = '([aApP][mM])';
-
- $digits = '[\p{N}' . $numseparators . ']+';
- $sign = '[' . $plus . $minus . ']?';
- $exponent = '([eE]' . $sign . $digits . ')?';
- $prenum = $sign . '[\p{Sc}#]?' . $sign;
- $postnum = '([\p{Sc}' . $units . $percents . ']|' . $ampm . ')?';
- $number = $prenum . $digits . $exponent . $postnum;
- $fraction = $number . '(' . $slash . $number . ')?';
- $numpair = $fraction . '([' . $minus . $colon . $fullstop . ']' .
- $fraction . ')*';
-
- return preg_replace(
- array(
- // Match delimited numbers
- '/' . $predelim . $numpair . $postdelim . '/u',
- // Match consecutive white space
- '/ +/u',
- ),
- ' ',
- $text );
-}
-
-/**
- * Stop words.
- */
-function drupalwiki_extractor_stop_words($lang = 'de') {
- $stopwords['en'] = array('a', 'about', 'above', 'above', 'across', 'after', 'afterwards', 'again', 'against', 'all', 'almost', 'alone', 'along', 'already', 'also','although','always','am','among', 'amongst', 'amoungst', 'amount', 'an', 'and', 'another', 'any','anyhow','anyone','anything','anyway', 'anywhere', 'are', 'around', 'as', 'at', 'back','be','became', 'because','become','becomes', 'becoming', 'been', 'before', 'beforehand', 'behind', 'being', 'below', 'beside', 'besides', 'between', 'beyond', 'bill', 'both', 'bottom','but', 'by', 'call', 'can', 'cannot', 'cant', 'co', 'con', 'could', 'couldnt', 'cry', 'de', 'describe', 'detail', 'do', 'done', 'down', 'due', 'during', 'each', 'eg', 'eight', 'either', 'eleven','else', 'elsewhere', 'empty', 'enough', 'etc', 'even', 'ever', 'every', 'everyone', 'everything', 'everywhere', 'except', 'few', 'fifteen', 'fify', 'fill', 'find', 'fire', 'first', 'five', 'for', 'former', 'formerly', 'forty', 'found', 'four', 'from', 'front
', 'full', 'further', 'get', 'give', 'go', 'had', 'has', 'hasnt', 'have', 'he', 'hence', 'her', 'here', 'hereafter', 'hereby', 'herein', 'hereupon', 'hers', 'herself', 'him', 'himself', 'his', 'how', 'however', 'hundred', 'ie', 'if', 'in', 'inc', 'indeed', 'interest', 'into', 'is', 'it', 'its', 'itself', 'keep', 'last', 'latter', 'latterly', 'least', 'less', 'ltd', 'made', 'many', 'may', 'me', 'meanwhile', 'might', 'mill', 'mine', 'more', 'moreover', 'most', 'mostly', 'move', 'much', 'must', 'my', 'myself', 'name', 'namely', 'neither', 'never', 'nevertheless', 'next', 'nine', 'no', 'nobody', 'none', 'noone', 'nor', 'not', 'nothing', 'now', 'nowhere', 'of', 'off', 'often', 'on', 'once', 'one', 'only', 'onto', 'or', 'other', 'others', 'otherwise', 'our', 'ours', 'ourselves', 'out', 'over', 'own','part', 'per', 'perhaps', 'please', 'put', 'rather', 're', 'same', 'see', 'seem', 'seemed', 'seeming', 'seems', 'serious', 'several', 'she', 'should', 'show', 'side', 'since', 'sincere
', 'six', 'sixty', 'so', 'some', 'somehow', 'someone', 'something', 'sometime', 'sometimes', 'somewhere', 'still', 'such', 'system', 'take', 'ten', 'than', 'that', 'the', 'their', 'them', 'themselves', 'then', 'thence', 'there', 'thereafter', 'thereby', 'therefore', 'therein', 'thereupon', 'these', 'they', 'thickv', 'thin', 'third', 'this', 'those', 'though', 'three', 'through', 'throughout', 'thru', 'thus', 'to', 'together', 'too', 'top', 'toward', 'towards', 'twelve', 'twenty', 'two', 'un', 'under', 'until', 'up', 'upon', 'us', 'very', 'via', 'was', 'we', 'well', 'were', 'what', 'whatever', 'when', 'whence', 'whenever', 'where', 'whereafter', 'whereas', 'whereby', 'wherein', 'whereupon', 'wherever', 'whether', 'which', 'while', 'whither', 'who', 'whoever', 'whole', 'whom', 'whose', 'why', 'will', 'with', 'within', 'without', 'would', 'yet', 'you', 'your', 'yours', 'yourself', 'yourselves', 'the');
-
- $stopwords['de'] = array('ab','bei','da','deshalb','ein','für','haben','hier','ich','ja','kann','machen','muesste','nach','oder','seid','sonst','und','vom','wann','wenn','wie','zu','bin','eines','hat','manche','solches','an','anderm','bis','das','deinem','demselben','dir','doch','einig','er','eurer','hatte','ihnen','ihre','ins','jenen','keinen','manchem','meinen','nichts','seine','soll','unserm','welche','werden','wollte','während','alle','allem','allen','aller','alles','als','also','am','ander','andere','anderem','anderen','anderer','anderes','andern','anderr','anders','auch','auf','aus','bist','bsp.','daher','damit','dann','dasselbe','dazu','daß','dein','deine','deinen','deiner','deines','dem','den','denn','denselben','der','derer','derselbe','derselben','des','desselben','dessen','dich','die','dies','diese','dieselbe','dieselben','diesem','diesen','dieser','dieses','dort','du','durch','eine','einem','einen','einer','einige','einigem','einigen','einiger','einiges','ei
nmal','es','etwas','euch','euer','eure','eurem','euren','eures','ganz','ganze','ganzen','ganzer','ganzes','gegen','gemacht','gesagt','gesehen','gewesen','gewollt','hab','habe','hatten','hin','hinter','ihm','ihn','ihr','ihrem','ihren','ihrer','ihres','im','in','indem','ist','jede','jedem','jeden','jeder','jedes','jene','jenem','jener','jenes','jetzt','kein','keine','keinem','keiner','keines','konnte','können','könnte','mache','machst','macht','machte','machten','man','manchen','mancher','manches','mein','meine','meinem','meiner','meines','mich','mir','mit','muss','musste','müßt','nicht','noch','nun','nur','ob','ohne','sage','sagen','sagt','sagte','sagten','sagtest','sehe','sehen','sehr','seht','sein','seinem','seinen','seiner','seines','selbst','sich','sicher','sie','sind','so','solche','solchem','solchen','solcher','sollte','sondern','um','uns','unse','unsen','unser','unses','unter','viel','von','vor','war','waren','warst','was','weg','weil','weiter','welchem','welchen',
'welcher','welches','werde','wieder','will','wir','wird','wirst','wo','wolle','wollen','wollt','wollten','wolltest','wolltet','würde','würden','z.B.','zum','zur','zwar','zwischen','über','aber','abgerufen','abgerufene','abgerufener','abgerufenes','acht','acute','allein','allerdings','allerlei','allg','allgemein','allmählich','allzu','alsbald','amp','and','andererseits','andernfalls','anerkannt','anerkannte','anerkannter','anerkanntes','anfangen','anfing','angefangen','angesetze','angesetzt','angesetzten','angesetzter','ansetzen','anstatt','arbeiten','aufgehört','aufgrund','aufhören','aufhörte','aufzusuchen','ausdrücken','ausdrückt','ausdrückte','ausgenommen','ausser','ausserdem','author','autor','außen','außer','außerdem','außerhalb','background','bald','bearbeite','bearbeiten','bearbeitete','bearbeiteten','bedarf','bedurfte','bedürfen','been','befragen','befragte','befragten','befragter','begann','beginnen','begonnen','behalten','behielt','beide','beiden','be
iderlei','beides','beim','beinahe','beitragen','beitrugen','bekannt','bekannte','bekannter','bekennen','benutzt','bereits','berichten','berichtet','berichtete','berichteten','besonders','besser','bestehen','besteht','beträchtlich','bevor','bezüglich','bietet','bisher','bislang','biz','bleiben','blieb','bloss','bloß','border','brachte','brachten','brauchen','braucht','bringen','bräuchte','bzw','böden','ca','ca.','collapsed','com','comment','content','da?','dabei','dadurch','dafür','dagegen','dahin','damals','danach','daneben','dank','danke','danken','dannen','daran','darauf','daraus','darf','darfst','darin','darum','darunter','darüber','darüberhinaus','dass','davon','davor','demnach','denen','dennoch','derart','derartig','derem','deren','derjenige','derjenigen','derzeit','desto','deswegen','diejenige','diesseits','dinge','direkt','direkte','direkten','direkter','doc','doppelt','dorther','dorthin','drauf','drei','dreißig','drin','dritte','drunter','drüber','dunklen',
'durchaus','durfte','durften','dürfen','dürfte','eben','ebenfalls','ebenso','ehe','eher','eigenen','eigenes','eigentlich','einbaün','einerseits','einfach','einführen','einführte','einführten','eingesetzt','einigermaßen','eins','einseitig','einseitige','einseitigen','einseitiger','einst','einstmals','einzig','elf','ende','entsprechend','entweder','ergänze','ergänzen','ergänzte','ergänzten','erhalten','erhielt','erhielten','erhält','erneut','erst','erste','ersten','erster','eröffne','eröffnen','eröffnet','eröffnete','eröffnetes','etc','etliche','etwa','fall','falls','fand','fast','ferner','finden','findest','findet','folgende','folgenden','folgender','folgendes','folglich','for','fordern','fordert','forderte','forderten','fortsetzen','fortsetzt','fortsetzte','fortsetzten','fragte','frau','frei','freie','freier','freies','fuer','fünf','gab','ganzem','gar','gbr','geb','geben','geblieben','gebracht','gedurft','geehrt','geehrte','geehrten','geehrter','gefallen','
gefiel','gefälligst','gefällt','gegeben','gehabt','gehen','geht','gekommen','gekonnt','gemocht','gemäss','genommen','genug','gern','gestern','gestrige','getan','geteilt','geteilte','getragen','gewissermaßen','geworden','ggf','gib','gibt','gleich','gleichwohl','gleichzeitig','glücklicherweise','gmbh','gratulieren','gratuliert','gratulierte','gute','guten','gängig','gängige','gängigen','gängiger','gängiges','gänzlich','haette','halb','hallo','hast','hattest','hattet','heraus','herein','heute','heutige','hiermit','hiesige','hinein','hinten','hinterher','hoch','html','http','hundert','hätt','hätte','hätten','höchstens','igitt','image','immer','immerhin','important','indessen','info','infolge','innen','innerhalb','insofern','inzwischen','irgend','irgendeine','irgendwas','irgendwen','irgendwer','irgendwie','irgendwo','je','jed','jedenfalls','jederlei','jedoch','jemand','jenseits','jährig','jährige','jährigen','jähriges','kam','kannst','kaum','kei nes','keinerlei
','keineswegs','klar','klare','klaren','klares','klein','kleinen','kleiner','kleines','koennen','koennt','koennte','koennten','komme','kommen','kommt','konkret','konkrete','konkreten','konkreter','konkretes','konnten','könn','könnt','könnten','künftig','lag','lagen','langsam','lassen','laut','lediglich','leer','legen','legte','legten','leicht','leider','lesen','letze','letzten','letztendlich','letztens','letztes','letztlich','lichten','liegt','liest','links','längst','längstens','mag','magst','mal','mancherorts','manchmal','mann','margin','med','mehr','mehrere','meist','meiste','meisten','meta','mindestens','mithin','mochte','morgen','morgige','muessen','muesst','musst','mussten','muß','mußt','möchte','möchten','möchtest','mögen','möglich','mögliche','möglichen','möglicher','möglicherweise','müssen','müsste','müssten','müßte','nachdem','nacher','nachhinein','nahm','natürlich','ncht','neben','nebenan','nehmen','nein','neu','neue','neuem','neuen','neuer'
,'neues','neun','nie','niemals','niemand','nimm','nimmer','nimmt','nirgends','nirgendwo','nter','nutzen','nutzt','nutzung','nächste','nämlich','nötigenfalls','nützt','oben','oberhalb','obgleich','obschon','obwohl','oft','online','org','padding','per','pfui','plötzlich','pro','reagiere','reagieren','reagiert','reagierte','rechts','regelmäßig','rief','rund','sang','sangen','schlechter','schließlich','schnell','schon','schreibe','schreiben','schreibens','schreiber','schwierig','schätzen','schätzt','schätzte','schätzten','sechs','sect','sehrwohl','sei','seit','seitdem','seite','seiten','seither','selber','senke','senken','senkt','senkte','senkten','setzen','setzt','setzte','setzten','sicherlich','sieben','siebte','siehe','sieht','singen','singt','sobald','sodaß','soeben','sofern','sofort','sog','sogar','solange','solc hen','solch','sollen','sollst','sollt','sollten','solltest','somit','sonstwo','sooft','soviel','soweit','sowie','sowohl','spielen','später','startet'
,'startete','starteten','statt','stattdessen','steht','steige','steigen','steigt','stets','stieg','stiegen','such','suchen','sämtliche','tages','tat','tatsächlich','tatsächlichen','tatsächlicher','tatsächliches','tausend','teile','teilen','teilte','teilten','titel','total','trage','tragen','trotzdem','trug','trägt','tun','tust','tut','txt','tät','ueber','umso','unbedingt','ungefähr','unmöglich','unmögliche','unmöglichen','unmöglicher','unnötig','unsem','unser','unsere','unserem','unseren','unserer','unseres','unten','unterbrach','unterbrechen','unterhalb','unwichtig','usw','var','vergangen','vergangene','vergangener','vergangenes','vermag','vermutlich','vermögen','verrate','verraten','verriet','verrieten','version','versorge','versorgen','versorgt','versorgte','versorgten','versorgtes','veröffentlichen','veröffentlicher','veröffentlicht','veröffentlichte','veröffentlichten','veröffentlichtes','viele','vielen','vieler','vieles','vielleicht','vielmals','vie
r','vollständig','voran','vorbei','vorgestern','vorher','vorne','vorüber','völlig','während','wachen','waere','warum','weder','wegen','weitere','weiterem','weiteren','weiterer','weiteres','weiterhin','weiß','wem','wen','wenig','wenige','weniger','wenigstens','wenngleich','wer','werdet','weshalb','wessen','wichtig','wieso','wieviel','wiewohl','willst','wirklich','wodurch','wogegen','woher','wohin','wohingegen','wohl','wohlweislich','womit','woraufhin','woraus','worin','wurde','wurden','währenddessen','wär','wäre','wären','zahlreich','zehn','zeitweise','ziehen','zieht','zog','zogen','zudem','zuerst','zufolge','zugleich','zuletzt','zumal','zurück','zusammen','zuviel','zwanzig','zwei','zwölf','ähnlich','übel','überall','überallhin','überdies','übermorgen','übrig','übrigens');
-
- return $stopwords[$lang];
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.info b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.info
deleted file mode 100644
index 8885821..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.info
+++ /dev/null
@@ -1,14 +0,0 @@
-; $Id$
-name = Drupal Wiki taggin suggestions
-description = Suggesting terms for the Tagging-Module based on the current content and a algorythm developed for Drupal Wiki
-package = "Drupal Wiki"
-core = 6.x
-dependencies[] = taxonomy
-dependencies[] = tagging
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.module b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.module
deleted file mode 100644
index 0cd24c8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.module
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-// $Id$
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-
-function drupalwiki_tagging_suggest_tagging_suggestions($vid, $node) {
- require 'drupalwiki_extractor.inc';
- $suggestions = array();
- $text = $node->body;
- // TODO: check node->language for current lang
- $terms = drupalwiki_extractor_extract($text,'de', NULL);
- $vids = array($vid);
- _drupalwiki_tagging_suggest_mark_new($terms, $vids);
- return $terms;
-}
-
-/**
- * Look up terms for a given word. Supports up to 2000 terms.
- */
-function _drupalwiki_tagging_suggest_mark_new(&$tags, $vids) {
- if(!is_array($vids) || count($vids) == 0) {
- return;
- }
- static $term_cache = array();
- static $loaded;
-
- if (!$loaded) {
- $result = db_query_range("SELECT td.tid, td.name FROM {term_data} td WHERE td.vid IN (%s)", implode(', ', $vids), 0, 2000);
-
- while ($term = db_fetch_object($result)) {
- $term_cache[strtolower($term->name[0])][$term->name] = $term;
- }
- $loaded = TRUE;
- }
- if (!empty($term_cache)) {
- foreach($tags as &$tag) {
- $firstC = strtolower($tag['#name'][0]);
- if (isset($term_cache[$firstC]) && array_key_exists($tag['#name'], $term_cache[$firstC]) ) {
- }
- else {
- $tag['#new'] = TRUE;
- }
- }
- }
- return $terms;
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/AlchemyAPI.php b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/AlchemyAPI.php
deleted file mode 100644
index 2fd070a..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/AlchemyAPI.php
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-
-require_once("AlchemyAPIParams.php");
-
-class AlchemyAPI
-{
- const XML_OUTPUT_MODE = "xml";
- const JSON_OUTPUT_MODE = "json";
-
- private $_apiKey = '';
- private $_hostPrefix = 'access';
-
- public function setAPIHost($apiHost)
- {
- $this->_hostPrefix = $apiHost;
-
- if (strlen($this->_hostPrefix) < 2)
- {
- throw new Exception("Error setting API host.");
- }
- }
-
- public function setAPIKey($apiKey)
- {
- $this->_apiKey = $apiKey;
-
- if (strlen($this->_apiKey) < 5)
- {
- throw new Exception("Error setting API key.");
- }
- }
-
- public function loadAPIKey($filename)
- {
- $handle = fopen($filename, 'r');
- $theData = fgets($handle, 512);
- fclose($handle);
- $this->_apiKey = rtrim($theData);
-
- if (strlen($this->_apiKey) < 5)
- {
- throw new Exception("Error loading API key.");
- }
- }
-
- public function URLGetRankedNamedEntities($url, $outputMode = self::XML_OUTPUT_MODE, $namedEntityParams = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_NamedEntityParams", $namedEntityParams);
-
- if(is_null($namedEntityParams))
- $namedEntityParams = new AlchemyAPI_NamedEntityParams();
-
- $namedEntityParams->setUrl($url);
- $namedEntityParams->setOutputMode($outputMode);
-
- return $this->GET("URLGetRankedNamedEntities", "url", $namedEntityParams);
- }
-
- public function HTMLGetRankedNamedEntities($html, $url, $outputMode = self::XML_OUTPUT_MODE, $namedEntityParams = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_NamedEntityParams", $namedEntityParams);
-
- if(is_null($namedEntityParams))
- $namedEntityParams = new AlchemyAPI_NamedEntityParams();
-
- $namedEntityParams->setHtml($html);
- $namedEntityParams->setUrl($url);
- $namedEntityParams->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetRankedNamedEntities", "html", $namedEntityParams);
- }
-
- public function TextGetRankedNamedEntities($text, $outputMode = self::XML_OUTPUT_MODE, $namedEntityParams = null)
- {
- $this->CheckText($text, $outputMode);
- $this->CheckParamType("AlchemyAPI_NamedEntityParams", $namedEntityParams);
-
- if(is_null($namedEntityParams))
- $namedEntityParams = new AlchemyAPI_NamedEntityParams();
-
- $namedEntityParams->setText($text);
- $namedEntityParams->setOutputMode($outputMode);
-
- return $this->POST("TextGetRankedNamedEntities", "text", $namedEntityParams);
- }
-
- public function URLGetRankedKeywords($url, $outputMode = self::XML_OUTPUT_MODE, $keywordParams = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_KeywordParams", $keywordParams);
-
- if(is_null($keywordParams))
- $keywordParams = new AlchemyAPI_KeywordParams();
-
- $keywordParams->setUrl($url);
- $keywordParams->setOutputMode($outputMode);
-
- return $this->GET("URLGetRankedKeywords", "url", $keywordParams);
- }
-
- public function HTMLGetRankedKeywords($html, $url, $outputMode = self::XML_OUTPUT_MODE, $keywordParams = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_KeywordParams", $keywordParams);
-
- if(is_null($keywordParams))
- $keywordParams = new AlchemyAPI_KeywordParams();
-
- $keywordParams->setHtml($html);
- $keywordParams->setUrl($url);
- $keywordParams->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetRankedKeywords", "html", $keywordParams);
- }
-
- public function TextGetRankedKeywords($text, $outputMode = self::XML_OUTPUT_MODE, $keywordParams = null)
- {
- $this->CheckText($text, $outputMode);
- $this->CheckParamType("AlchemyAPI_KeywordParams", $keywordParams);
-
- if(is_null($keywordParams))
- $keywordParams = new AlchemyAPI_KeywordParams();
-
- $keywordParams->setText($text);
- $keywordParams->setOutputMode($outputMode);
-
- return $this->POST("TextGetRankedKeywords", "text", $keywordParams);
- }
-
- public function URLGetLanguage($url, $outputMode = self::XML_OUTPUT_MODE, $languageParams = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_LanguageParams", $languageParams);
-
- if(is_null($languageParams))
- $languageParams = new AlchemyAPI_LanguageParams();
-
- $languageParams->setUrl($url);
- $languageParams->setOutputMode($outputMode);
-
- return $this->GET("URLGetLanguage", "url", $languageParams);
- }
-
- public function HTMLGetLanguage($html, $url, $outputMode = self::XML_OUTPUT_MODE, $languageParams = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_LanguageParams", $languageParams);
-
- if(is_null($languageParams))
- $languageParams = new AlchemyAPI_LanguageParams();
-
- $languageParams->setHtml($html);
- $languageParams->setUrl($url);
- $languageParams->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetLanguage", "html", $languageParams);
- }
-
- public function TextGetLanguage($text, $outputMode = self::XML_OUTPUT_MODE, $languageParams = null)
- {
- $this->CheckText($text, $outputMode);
- $this->CheckParamType("AlchemyAPI_LanguageParams", $languageParams);
-
- if(is_null($languageParams))
- $languageParams = new AlchemyAPI_LanguageParams();
-
- $languageParams->setText($text);
- $languageParams->setOutputMode($outputMode);
-
- return $this->POST("TextGetLanguage", "text", $languageParams);
- }
-
-
- public function URLGetCategory($url, $outputMode = self::XML_OUTPUT_MODE, $categorizeParams = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_CategoryParams", $categorizeParams);
-
- if(is_null($categorizeParams))
- $categorizeParams = new AlchemyAPI_CategoryParams();
-
- $categorizeParams->setUrl($url);
- $categorizeParams->setOutputMode($outputMode);
-
- return $this->GET("URLGetCategory", "url", $categorizeParams);
- }
-
- public function HTMLGetCategory($html, $url, $outputMode = self::XML_OUTPUT_MODE, $categorizeParams = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_CategoryParams", $categorizeParams);
-
- if(is_null($categorizeParams))
- $categorizeParams = new AlchemyAPI_CategoryParams();
-
- $categorizeParams->setHtml($html);
- $categorizeParams->setUrl($url);
- $categorizeParams->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetCategory", "html", $categorizeParams);
- }
-
- public function TextGetCategory($text, $outputMode = self::XML_OUTPUT_MODE, $categorizeParams = null)
- {
- $this->CheckText($text, $outputMode);
- $this->CheckParamType("AlchemyAPI_CategoryParams", $categorizeParams);
-
- if(is_null($categorizeParams))
- $categorizeParams = new AlchemyAPI_CategoryParams();
-
- $categorizeParams->setText($text);
- $categorizeParams->setOutputMode($outputMode);
-
- return $this->POST("TextGetCategory", "text", $categorizeParams);
- }
-
- public function URLGetText($url, $outputMode = self::XML_OUTPUT_MODE, $textParams = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_TextParams", $textParams);
-
- if(is_null($textParams))
- $textParams = new AlchemyAPI_TextParams();
-
- $textParams->setUrl($url);
- $textParams->setOutputMode($outputMode);
-
- return $this->GET("URLGetText", "url", $textParams);
- }
-
- public function HTMLGetText($html, $url, $outputMode = self::XML_OUTPUT_MODE, $textParams = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_TextParams", $textParams);
-
- if(is_null($textParams))
- $textParams = new AlchemyAPI_TextParams();
-
- $textParams->setHtml($html);
- $textParams->setUrl($url);
- $textParams->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetText", "html", $textParams);
- }
-
- public function URLGetRawText($url, $outputMode = self::XML_OUTPUT_MODE, $textParams = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_TextParams", $textParams);
-
- if(is_null($textParams))
- $textParams = new AlchemyAPI_TextParams();
-
- $textParams->setUrl($url);
- $textParams->setOutputMode($outputMode);
-
- return $this->GET("URLGetRawText", "url", $textParams);
- }
-
- public function HTMLGetRawText($html, $url, $outputMode = self::XML_OUTPUT_MODE, $textParams = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_TextParams", $textParams);
-
- if(is_null($textParams))
- $textParams = new AlchemyAPI_TextParams();
-
- $textParams->setHtml($html);
- $textParams->setUrl($url);
- $textParams->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetRawText", "html", $textParams);
- }
-
- public function URLGetTitle($url, $outputMode = self::XML_OUTPUT_MODE, $textParams = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_TextParams", $textParams);
-
- if(is_null($textParams))
- $textParams = new AlchemyAPI_TextParams();
-
- $textParams->setUrl($url);
- $textParams->setOutputMode($outputMode);
-
- return $this->GET("URLGetTitle", "url", $textParams);
- }
-
- public function HTMLGetTitle($html, $url, $outputMode = self::XML_OUTPUT_MODE, $textParams = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_TextParams", $textParams);
-
- if(is_null($textParams))
- $textParams = new AlchemyAPI_TextParams();
-
- $textParams->setHtml($html);
- $textParams->setUrl($url);
- $textParams->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetTitle", "html", $textParams);
- }
-
- public function URLGetFeedLinks($url, $outputMode = self::XML_OUTPUT_MODE, $params = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_Params", $params);
-
- if(is_null($params))
- $params = new AlchemyAPI_Params();
-
- $params->setUrl($url);
- $params->setOutputMode($outputMode);
-
- return $this->GET("URLGetFeedLinks", "url", $params);
- }
-
- public function HTMLGetFeedLinks($html, $url, $outputMode = self::XML_OUTPUT_MODE, $params = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_Params", $params);
-
- if(is_null($params))
- $params = new AlchemyAPI_Params();
-
-
- $params->setHtml($html);
- $params->setUrl($url);
- $params->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetFeedLinks", "html", $params);
- }
-
- public function URLGetMicroformats($url, $outputMode = self::XML_OUTPUT_MODE, $params = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_Params", $params);
-
- if(is_null($params))
- $params = new AlchemyAPI_Params();
-
- $params->setUrl($url);
- $params->setOutputMode($outputMode);
-
- return $this->GET("URLGetMicroformatData", "url", $params);
- }
-
- public function HTMLGetMicroformats($html, $url, $outputMode = self::XML_OUTPUT_MODE, $params = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_Params", $params);
-
- if(is_null($params))
- $params = new AlchemyAPI_Params();
-
- $params->setHtml($html);
- $params->setUrl($url);
- $params->setOutputMode($outputMode);
-
- return $this->POST("HTMLGetMicroformatData", "html", $params);
- }
-
- public function URLGetConstraintQuery($url, $query, $outputMode = self::XML_OUTPUT_MODE, $constraintParams = null)
- {
- $this->CheckURL($url, $outputMode);
- $this->CheckParamType("AlchemyAPI_ConstraingQueryParams", $constraintParams);
-
- if (strlen($query) < 2)
- {
- throw new Exception("Invalid constraint query specified.");
- }
-
- if(is_null($constraintParams))
- $constraintParams = new AlchemyAPI_ConstraintQueryParams();
-
- $constraintParams->setUrl($url);
- $constraintParams->setOutputMode($outputMode);
- $constraintParams->setCQuery($query);
-
- return $this->GET("URLGetConstraintQuery", "url", $constraintParams);
- }
-
- public function HTMLGetConstraintQuery($html, $url, $query, $outputMode = self::XML_OUTPUT_MODE, $constraintParams = null)
- {
- $this->CheckHTML($html, $url, $outputMode);
- $this->CheckParamType("AlchemyAPI_ConstraingQueryParams", $constraintParams);
-
- if (strlen($query) < 2)
- {
- throw new Exception("Invalid constraint query specified.");
- }
-
- $constraintParams = new AlchemyAPI_ConstraintQueryParams();
-
- $constraintParams->setUrl($url);
- $constraintParams->setHtml($html);
- $constraintParams->setOutputMode($outputMode);
- $constraintParams->setCQuery($query);
-
- return $this->POST("HTMLGetConstraintQuery", "html", $constraintParams);
- }
-
- private function CheckOutputMode($outputMode)
- {
- if (strlen($this->_apiKey) < 5)
- {
- throw new Exception("Load an API key.");
- }
-
- if (self::XML_OUTPUT_MODE !== $outputMode &&
- self::JSON_OUTPUT_MODE !== $outputMode)
- {
- throw new Exception("Illegal Output Mode specified, see *_OUTPUT_MODE constants.");
- }
- }
-
- private function CheckURL($url, $outputMode)
- {
- $this->CheckOutputMode($outputMode);
-
- if (strlen($url) < 10)
- {
- throw new Exception("Enter a valid URL to analyze.");
- }
- }
-
- private function CheckHTML($html, $url, $outputMode)
- {
- $this->CheckURL($url, $outputMode);
-
- if (strlen($html) < 10)
- {
- throw new Exception("Enter a HTML document to analyze.");
- }
- }
-
- private function CheckText($text, $outputMode)
- {
- $this->CheckOutputMode($outputMode);
-
- if (strlen($text) < 5)
- {
- throw new Exception("Enter some text to analyze.");
- }
- }
-
- private function CheckParamType($className, $class)
- {
- if(!is_null($class) && ($className != get_class($class)) )
- {
- throw new Exception("Trying to pass ".get_class($class)." into a function that requires ".$className);
- }
- }
-
- private function POST()
- { // callMethod, $callPrefix, $parameterObject
- $callMethod = func_get_arg(0);
- $callPrefix = func_get_arg(1);
- $paramObj = func_get_arg(2);
-
- $outputMode = $paramObj->getOutputMode();
-
- $data = "apikey=".$this->_apiKey."&outputMode=".$outputMode.$paramObj->getParameterString();
-
- $params = array('http' => array('method' => 'POST',
- 'Content-type'=> 'application/x-www-form-urlencoded',
- 'Content-length' =>strlen( $data ),
- 'content' => $data
- ));
-
- $hostPrefix = $this->_hostPrefix;
- $endpoint = "http://$hostPrefix.alchemyapi.com/calls/$callPrefix/$callMethod";
-
- $context = stream_context_create($params);
-
- return $this->DoRequest($endpoint,$context,$outputMode);
- }
-
- private function GET()
- { // callMethod, $callPrefix, $parameterObject
- $callMethod = func_get_arg(0);
- $callPrefix = func_get_arg(1);
- $paramObj = func_get_arg(2);
-
- $outputMode = $paramObj->getOutputMode();
-
- $data = "apikey=".$this->_apiKey."&outputMode=".$outputMode.$paramObj->getParameterString();
-
- $params = array('http' => array('method' => 'GET',
- 'Content-type'=> 'application/x-www-form-urlencoded'
- ));
-
- $hostPrefix = $this->_hostPrefix;
- $uri = "http://$hostPrefix.alchemyapi.com/calls/$callPrefix/$callMethod"."?".$data;
-
- $context = stream_context_create($params);
-
- return $this->DoRequest($uri,$context,$outputMode);
-
- }
-
- private function DoRequest($uri,$context, $outputMode)
- {
- $fp = @fopen($uri, 'rb', false, $context);
- if (!($fp))
- {
- throw new Exception("Error making API call.");
- }
-
- $response = @stream_get_contents($fp);
- fclose($fp);
- if ($response === false)
- {
- throw new Exception("Error making API call.");
- }
-
- if (self::XML_OUTPUT_MODE == $outputMode)
- {
- $doc = simplexml_load_string($response);
-
- if (!($doc))
- {
- throw new Exception("Error making API call.");
- }
-
- $status = $doc->xpath("/results/status");
- if ($status[0] != "OK")
- {
- $statusInfo = $doc->xpath("/results/statusInfo");
- throw new Exception("Error making API call: $statusInfo[0]");
- }
- }
- else
- {
- $obj = json_decode($response);
-
- if (is_null($obj))
- {
- throw new Exception("Error making API call.");
- }
- if ("OK" != $obj->{'status'})
- {
- $statusInfo = $obj->{'statusInfo'};
- throw new Exception("Error making API call: $statusInfo");
- }
- }
-
- return $response;
- }
-}
-
-
-?>
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/AlchemyAPIParams.php b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/AlchemyAPIParams.php
deleted file mode 100644
index b1dfb84..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/AlchemyAPIParams.php
+++ /dev/null
@@ -1,630 +0,0 @@
-<?php
-
-/* Parameter class for functions URLGetRankedNamedEntities, HTMLGetRankedNamedEntities, TextGetRankedNamedEntities
-//
-// See http://www.alchemyapi.com/api/entity/proc.html for detailed parameter descriptions
-//
-*/
-class AlchemyAPI_Params{
- private $url = null;
- private $html = null;
- private $text = null;
- private $outputMode = "xml";
- private $customParameters = null;
-
- private function outputMode_arr()
- {
- return array
- (
- 'xml',
- 'json'
- );
- }
-
- public function getUrl(){
- return $this->url;
- }
-
- public function setUrl($url){
- $this->url = $url;
- }
-
- public function getHtml(){
- return $this->html;
- }
-
- public function setHtml($html){
- $this->html = $html;
- }
-
- public function getText(){
- return $this->text;
- }
-
- public function setText($text){
- $this->text = $text;
- }
-
- public function getOutputMode(){
- return $this->outputMode;
- }
-
- public function setOutputMode($outputMode){
- $arr = $this->outputMode_arr();
- $isValid = false;
- for($i=0;$i<count($arr);$i++){
- if($arr[$i] == $outputMode){
- $this->outputMode = $outputMode;
- return;
- }
- }
- if (!$isValid)
- {
- throw new Exception("Invalid setting (".$outputMode.") for parameter outputMode");
- }
- }
-
- public function getCustomParameters(){
- return $this->customParameters;
- }
-
- public function setCustomParameters(){
- $this->customParameters = "";
-
- $numargs = func_num_args();
- for($i = 0; $i < $numargs; $i++)
- {
- $this->customParameters .= "&".func_get_arg($i);
- if ((++$i) < $numargs)
- $this->customParameters .= "=".rawurlencode(func_get_arg($i));
- }
- }
-
- public function getParameterString() {
- $retString = "";
- if(isset($this->url))
- $retString=$retString."&url=".rawurlencode($this->url);
- if(isset($this->html))
- $retString=$retString."&html=".rawurlencode($this->html);
- if(isset($this->text))
- $retString=$retString."&text=".rawurlencode($this->text);
- if(isset($this->customParameters))
- $retString=$retString.$this->customParameters;
- return $retString;
- }
-
-}
-
-class AlchemyAPI_NamedEntityParams extends AlchemyAPI_Params{
-
- private $disambiguate = null;
- private $linkedData = null;
- private $coreference = null;
- private $quotations = null;
- private $sourceText = null;
- private $showSourceText = null;
- private $maxRetrieve = null;
- private $baseUrl = null;
- private $cQuery = null;
- private $xPath = null;
-
- private function sourceText_arr()
- {
- return array
- (
- 'cleaned_or_raw',
- 'cleaned',
- 'raw',
- 'cquery',
- 'xpath'
- );
- }
-
- public function getDisambiguate(){
- return $this->disambiguate;
- }
-
- public function setDisambiguate($disambiguate){
- if ($disambiguate != 0 && $disambiguate != 1)
- {
- throw new Exception("Invalid setting (".$disambiguate.") for parameter disambiguate");
- }
- $this->disambiguate = $disambiguate;
- }
-
- public function getLinkedData(){
- return $this->linkedData;
- }
-
- public function setLinkedData($linkedData){
- if ($linkedData != 0 && $linkedData != 1)
- {
- throw new Exception("Invalid setting (".$linkedData.") for parameter linkedData");
- }
- $this->linkedData = $linkedData;
- }
-
- public function getCoreference(){
- return $this->coreference;
- }
-
- public function setCoreference($coreference){
- if ($coreference != 0 && $coreference != 1)
- {
- throw new Exception("Invalid setting (".$coreference.") for parameter coreference");
- }
- $this->coreference = $coreference;
- }
-
- public function getQuotations(){
- return $this->quotations;
- }
-
- public function setQuotations($quotations){
- if ($quotations != 0 && $quotations != 1)
- {
- throw new Exception("Invalid setting (".$quotations.") for parameter quotations");
- }
- $this->quotations = $quotations;
- }
-
- public function getSourceText(){
- return $this->sourceText;
- }
-
- public function setSourceText($sourceText){
- $arr = $this->sourceText_arr();
- $isValid = false;
- for($i=0;$i<count($arr);$i++){
- if($arr[$i] == $sourceText){
- $this->sourceText = $sourceText;
- return;
- }
- }
- if (!$isValid)
- {
- throw new Exception("Invalid setting (".$sourceText.") for parameter sourceText");
- }
- }
-
- public function getShowSourceText(){
- return $this->showSourceText;
- }
-
- public function setShowSourceText($showSourceText){
- if ($showSourceText != 0 && $showSourceText != 1)
- {
- throw new Exception("Invalid setting (".$showSourceText.") for parameter showSourceText");
- }
- $this->showSourceText = $showSourceText;
- }
-
- public function getMaxRetrieve(){
- return $this->maxRetrieve;
- }
-
- public function setMaxRetrieve($maxRetrieve){
- $this->maxRetrieve = $maxRetrieve;
- }
-
- public function getBaseUrl(){
- return $this->baseUrl;
- }
-
- public function setBaseUrl($baseUrl){
- $this->baseUrl = $baseUrl;
- }
-
- public function getCQuery(){
- return $this->cQuery;
- }
-
- public function setCQuery($cQuery){
- $this->cQuery = $cQuery;
- }
-
- public function getXPath(){
- return $this->xPath;
- }
-
- public function setXPath($xPath){
- $this->xPath = $xPath;
- }
-
-
-
- public function getParameterString() {
- $retString = parent::getParameterString();
- if(isset($this->disambiguate))
- $retString=$retString."&disambiguate=".rawurlencode($this->disambiguate);
- if(isset($this->linkedData))
- $retString=$retString."&linkedData=".rawurlencode($this->linkedData);
- if(isset($this->coreference))
- $retString=$retString."&coreference=".rawurlencode($this->coreference);
- if(isset($this->quotations))
- $retString=$retString.""ations=".rawurlencode($this->quotations);
- if(isset($this->showSourceText))
- $retString=$retString."&showSourceText=".rawurlencode($this->showSourceText);
- if(isset($this->sourceText))
- $retString=$retString."&sourceText=".rawurlencode($this->sourceText);
- if(isset($this->maxRetrieve))
- $retString=$retString."&maxRetrieve=".rawurlencode($this->maxRetrieve);
- if(isset($this->baseUrl))
- $retString=$retString."&baseUrl=".rawurlencode($this->baseUrl);
- if(isset($this->cQuery))
- $retString=$retString."&cquery=".rawurlencode($this->cQuery);
- if(isset($this->xPath))
- $retString=$retString."&xpath=".rawurlencode($this->xPath);
- return $retString;
- }
-
-}
-
-/* Parameter class for functions URLGetCategory, HTMLGetCategory, TextGetCategory
-//
-// See http://www.alchemyapi.com/api/categ/proc.html for detailed parameter descriptions
-//
-*/
-class AlchemyAPI_CategoryParams extends AlchemyAPI_Params{
-
- private $sourceText = null;
- private $cQuery = null;
- private $xPath = null;
- private $baseUrl = null;
-
- private function sourceText_arr()
- {
- return array
- (
- 'cleaned_or_raw',
- 'cquery',
- 'xpath'
- );
- }
-
- public function getSourceText(){
- return $this->sourceText;
- }
-
- public function setSourceText($sourceText){
- $arr = $this->sourceText_arr();
- $isValid = false;
- for($i=0;$i<count($arr);$i++){
- if($arr[$i] == $sourceText){
- $this->sourceText = $sourceText;
- return;
- }
- }
- if (!$isValid)
- {
- throw new Exception("Invalid setting (".$sourceText.") for parameter sourceText");
- }
- }
-
- public function getCQuery(){
- return $this->cQuery;
- }
-
- public function setCQuery($cQuery){
- $this->cQuery = $cQuery;
- }
-
- public function getXPath(){
- return $this->xPath;
- }
-
- public function setXPath($xPath){
- $this->xPath = $xPath;
- }
-
- public function getBaseUrl(){
- return $this->baseUrl;
- }
-
- public function setBaseUrl($baseUrl){
- $this->baseUrl = $baseUrl;
- }
-
- public function getParameterString() {
- $retString = parent::getParameterString();
- if(isset($this->sourceText))
- $retString=$retString."&sourceText=".rawurlencode($this->sourceText);
- if(isset($this->cQuery))
- $retString=$retString."&cquery=".rawurlencode($this->cQuery);
- if(isset($this->xPath))
- $retString=$retString."&xpath=".rawurlencode($this->xPath);
- if(isset($this->baseUrl))
- $retString=$retString."&baseUrl=".rawurlencode($this->baseUrl);
- return $retString;
- }
-
-}
-
-/* Parameter class for functions URLGetLanguage, HTMLGetLanguage, TextGetLanguage
-//
-// See http://www.alchemyapi.com/api/lang/proc.html for detailed parameter descriptions
-//
-*/
-class AlchemyAPI_LanguageParams extends AlchemyAPI_Params{
-
- private $sourceText = null;
- private $cQuery = null;
- private $xPath = null;
-
- private function sourceText_arr()
- {
- return array
- (
- 'cleaned_or_raw',
- 'cleaned',
- 'raw',
- 'cquery',
- 'xpath'
- );
- }
-
- public function getSourceText(){
- return $this->sourceText;
- }
-
- public function setSourceText($sourceText){
- $arr = $this->sourceText_arr();
- $isValid = false;
- for($i=0;$i<count($arr);$i++){
- if($arr[$i] == $sourceText){
- $this->sourceText = $sourceText;
- return;
- }
- }
- if (!$isValid)
- {
- throw new Exception("Invalid setting (".$sourceText.") for parameter sourceText");
- }
- }
-
- public function getCQuery(){
- return $this->cQuery;
- }
-
- public function setCQuery($cQuery){
- $this->cQuery = $cQuery;
- }
-
- public function getXPath(){
- return $this->xPath;
- }
-
- public function setXPath($xPath){
- $this->xPath = $xPath;
- }
-
- public function getParameterString() {
- $retString = parent::getParameterString();
- if(isset($this->sourceText))
- $retString=$retString."&sourceText=".rawurlencode($this->sourceText);
- if(isset($this->cQuery))
- $retString=$retString."&cquery=".rawurlencode($this->cQuery);
- if(isset($this->xPath))
- $retString=$retString."&xpath=".rawurlencode($this->xPath);
- return $retString;
- }
-
-}
-
-/* Parameter class for functions URLGetRankedKeywords, HTMLGetRankedKeywords, TextGetRankedKeywords
-//
-// See http://www.alchemyapi.com/api/keyword/proc.html for detailed parameter descriptions
-//
-*/
-class AlchemyAPI_KeywordParams extends AlchemyAPI_Params{
-
- private $maxRetrieve = null;
- private $sourceText = null;
- private $showSourceText = null;
- private $cQuery = null;
- private $xPath = null;
- private $baseUrl = null;
- private $keywordExtractMode = null;
-
- private function sourceText_arr()
- {
- return array
- (
- 'cleaned_or_raw',
- 'cleaned',
- 'raw',
- 'cquery',
- 'xpath'
- );
- }
-
- public function getMaxRetrieve(){
- return $this->maxRetrieve;
- }
-
- public function setMaxRetrieve($souceText){
- $this->maxRetrieve = $maxRetrieve;
- }
-
- public function getSourceText(){
- return $this->sourceText;
- }
-
- public function setSourceText($sourceText){
- $arr = $this->sourceText_arr();
- $isValid = false;
- for($i=0;$i<count($arr);$i++){
- if($arr[$i] == $sourceText){
- $this->sourceText = $sourceText;
- return;
- }
- }
- if (!$isValid)
- {
- throw new Exception("Invalid setting (".$sourceText.") for parameter sourceText");
- }
- }
-
- public function getShowSourceText(){
- return $this->showSourceText;
- }
-
- public function setShowSourceText($showSourceText){
- if ($showSourceText != 0 && $showSourceText != 1)
- {
- throw new Exception("Invalid setting (".$showSourceText.") for parameter showSourceText");
- }
- $this->showSourceText = $showSourceText;
- }
-
- public function getCQuery(){
- return $this->cQuery;
- }
-
- public function setCQuery($cQuery){
- $this->cQuery = $cQuery;
- }
-
- public function getXPath(){
- return $this->xPath;
- }
-
- public function setXpath($xPath){
- $this->xPath = $xPath;
- }
-
- public function getBaseUrl(){
- return $this->baseUrl;
- }
-
- public function setBaseUrl($baseUrl){
- $this->baseUrl = $baseUrl;
- }
-
- public function getKeywordExtractMode(){
- return $this->keywordExtractMode;
- }
-
- public function setKeywordExtractMode($keywordExtractMode){
- if ($keywordExtractMode != "strict")
- {
- throw new Exception("Invalid setting (".$keywordExtractMode.") for parameter keywordExtractMode");
- }
- $this->keywordExtractMode = $keywordExtractMode;
- }
-
-
- public function getParameterString() {
- $retString = parent::getParameterString();
- if(isset($this->maxRetrieve))
- $retString=$retString."&maxRetrieve=".rawurlencode($this->maxRetrieve);
- if(isset($this->sourceText))
- $retString=$retString."&sourceText=".rawurlencode($this->sourceText);
- if(isset($this->showSourceText))
- $retString=$retString."&showSourceText=".rawurlencode($this->showSourceText);
- if(isset($this->cQuery))
- $retString=$retString."&cquery=".rawurlencode($this->cQuery);
- if(isset($this->xPath))
- $retString=$retString."&xpath=".rawurlencode($this->xPath);
- if(isset($this->baseUrl))
- $retString=$retString."&baseUrl=".rawurlencode($this->baseUrl);
- if(isset($this->keywordExtractMode))
- $retString=$retString."&keywordExtractMode=".rawurlencode($this->keywordExtractMode);
- return $retString;
- }
-
-}
-
-/* Parameter class for functions URLGetText, HTMLGetText, URLGetRawText, HTMLGetRawText, URLGetTitle, HTMLGetTitle
-//
-// See http://www.alchemyapi.com/api/text/proc.html for detailed parameter descriptions
-//
-*/
-class AlchemyAPI_TextParams extends AlchemyAPI_Params{
-
- private $useMetaData = null;
- private $extractLinks = null;
-
- public function getUseMetaData(){
- return $this->useMetaData;
- }
-
- public function setUseMetaData($useMetaData){
- if ($useMetaData != 0 && $useMetaData != 1)
- {
- throw new Exception("Invalid setting (".$useMetaData.") for parameter useMetaData");
- }
- $this->useMetaData = $useMetaData;
- }
-
- public function getExtractLinks(){
- return $this->extractLinks;
- }
-
- public function setExtractLinks($extractLinks){
- if ($extractLinks != 0 && $extractLinks != 1)
- {
- throw new Exception("Invalid setting (".$extractLinks.") for parameter extractLinks");
- }
- $this->extractLinks = $extractLinks;
- }
-
- public function getParameterString() {
- $retString = parent::getParameterString();
- if(isset($this->useMetaData))
- $retString=$retString."&useMetaData=".rawurlencode($this->useMetaData);
- if(isset($this->extractLinks))
- $retString=$retString."&extractLinks=".rawurlencode($this->extractLinks);
- return $retString;
- }
-
-}
-
-/* Parameter class for functions URLGetConstraintQuery, HTMLGetConstraintQuery, TextGetConstraintQuery
-//
-// See http://www.alchemyapi.com/api/scrape/proc.html for detailed parameter descriptions
-//
-*/
-class AlchemyAPI_ConstraintQueryParams extends AlchemyAPI_Params{
-
- private $cQuery = null;
-
- public function getCQuery(){
- return $this->cQuery;
- }
-
- public function setCQuery($cQuery){
- $this->cQuery = $cQuery;
- }
-
- public function getParameterString() {
- $retString = parent::getParameterString();
- if(isset($this->cQuery))
- $retString=$retString."&cquery=".rawurlencode($this->cQuery);
- return $retString;
- }
-
-}
-
-
-/* Parameter class for functions URLGetMicroformats, HTMLGetMicroformats, TextGetMicroformats
-//
-// See http://www.alchemyapi.com/api/mformat/proc.html for detailed parameter descriptions
-//
-*/
-class AlchemyAPI_MicroformatParams extends AlchemyAPI_Params{
-
- public function getParameterString() {
- $retString = parent::getParameterString();
- return $retString;
- }
-
-}
-
-
-
-
-
-
-
-?>
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/README b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/README
deleted file mode 100644
index ce04f05..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Installation:
-
-1. Put the AlchemyAPI module into the tagging/modules folder of your drupal installation.
-
-2. To enable the AlchemyAPI module, a free api key is required. (This is needed
-to make calls to our web based service).
- a. Go to alchemyapi.com to get a free key.
- b. Post this key into the api_key.txt file in the modules/tagging_alchemy_suggest folder.
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/api_key.txt b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/api_key.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/tagging_alchemy_suggest.info b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/tagging_alchemy_suggest.info
deleted file mode 100644
index 04df61a..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/tagging_alchemy_suggest.info
+++ /dev/null
@@ -1,17 +0,0 @@
-; $Id$
-name = Tagging AlchemyAPI suggestions
-description = This plugin exposes suggestions based on the current node content (body) using AlchemyAPI natural language processing technology.
-package = "Taxonomy"
-version = "6.x-2.1"
-core = 6.x
-dependencies[] = tagging
-
-
-
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/tagging_alchemy_suggest.module b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/tagging_alchemy_suggest.module
deleted file mode 100644
index 1ee5f60..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_alchemy_suggest/tagging_alchemy_suggest.module
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-// $Id$
-
-require("AlchemyAPI.php");
-
-function tagging_alchemy_suggest_tagging_suggestions($vid, $node) {
- $alchemyObj = new AlchemyAPI();
- try {
- @$alchemyObj->loadAPIKey( drupal_get_path('module', 'Tagging')."\\modules\\tagging_alchemy_suggest\\api_key.txt");
- }
-
- catch(Exception $e) {
- $suggestions[] = array('#name' => 'AlchemyAPI module needs key to work. See README.', '#weight' => 2 );
- return $suggestions;
- }
-
- $postContent = $node->body;
- if( null == $postContent ) {
- return;
- }
- $entityResult = $alchemyObj->HTMLGetRankedNamedEntities($postContent, "http://www.alchemyapi.com/tools/alchemytagger/?type=post");
-
- $keywordParams = new AlchemyAPI_KeywordParams();
- $keywordParams->setKeywordExtractMode("strict");
- $keywordResult = $alchemyObj->TextGetRankedKeywords($postContent, "xml", $keywordParams);
-
-
- $entitySuggestions = tagging_alchemy_suggest_ParseEntityResponse($entityResult);
- $keywordSuggestions = tagging_alchemy_suggest_ParseKeywordResponse($keywordResult);
- foreach( $keywordSuggestions as $keyword ) {
- $found = false;
- foreach( $entitySuggestions as $entity) {
- if( $entity['#name'] == $keyword['#name'] ) {
- $found = true;
- continue;
- }
- }
- if(!$found)
- $suggestions[] = $keyword;
- }
-
- $suggestions = array_merge($suggestions, $entitySuggestions);
- return $suggestions;
-}
-
-function tagging_alchemy_suggest_ParseEntityResponse($result) {
- $doc = simplexml_load_string($result);
-
- $entities = $doc->xpath("//entity");
-
- $returnEntityArr = array();
- $returnRelevanceArr = array();
- foreach ($entities as $key => $value) {
- $typeArr = $doc->xpath("/results/entities/entity[$key+1]/type");
- $textArr = $doc->xpath("/results/entities/entity[$key+1]/text");
- $relevanceArr = $doc->xpath("/results/entities/entity[$key+1]/relevance");
-
- if (count($typeArr) > 0 && count($textArr) > 0 && strlen($typeArr[0]) > 0) {
- $type = "$typeArr[0]";
- $text = "$textArr[0]";
- $relevance = $relevanceArr[0];
-
- $disambArr = $doc->xpath("/results/entities/entity[$key+1]/disambiguated/name");
- if (count($disambArr) > 0 && strlen($disambArr[0]) > 0) {
- $doDisamb = "true";
- if ($doDisamb == "true") {
- $text = "$disambArr[0]";
- $relevance = ((float)$relevance + 0.05);
- }
- }
- $relevance = ((float)$relevance + 0.2);
- $returnEntityArr[] = array('#name' => $text, '#weight' => ( 10-round(((float)$relevance)*10) ));
- }
- }
-
- return $returnEntityArr;
-}
-
-function tagging_alchemy_suggest_ParseKeywordResponse($result) {
- $doc = simplexml_load_string($result);
-
- $keywords = $doc->xpath("/results/keywords/keyword");
-
- $returnKeywordsArr = array();
- $returnTelevanceArr = array();
- foreach ($keywords as $key => $value) {
- $textArr = $doc->xpath("//results/keywords/keyword[$key+1]/text");
- $text = $textArr[0];
- $relevanceArr = $doc->xpath("//results/keywords/keyword[$key+1]/relevance");
-
- if (count($textArr) > 0 && count($relevanceArr) > 0 && $text!="") {
- $relevance = $relevanceArr[0];
- $returnKeywordsArr[] = array('#name' => $text, '#weight' => ( 10-round(((float)$relevance)*10) ));
- }
- }
- return $returnKeywordsArr;
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_opencalais_suggest/tagging_opencalais_suggest.info b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_opencalais_suggest/tagging_opencalais_suggest.info
deleted file mode 100644
index c2597eb..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_opencalais_suggest/tagging_opencalais_suggest.info
+++ /dev/null
@@ -1,27 +0,0 @@
-; $Id: tagging_opencalais_suggest.info,v 1.1.2.5 2010/10/17 10:23:24 eugenmayer Exp $
-name = Tagging opencalais suggestions
-description = This tagging module exposes suggestions based on the current content (body) using the semantic opencalais service
-package = "Taxonomy"
-core = 6.x
-dependencies[] = taxonomy
-dependencies[] = tagging
-dependencies[] = calais_api
-; Information added by drupal.org packaging script on 2009-12-04
-version = "6.x-2.0"
-core = "6.x"
-project = "tagging_opencalais_suggest"
-datestamp = "1259920274"
-
-; Information added by drupal.org packaging script on 2010-03-18
-version = "6.x-2.1"
-core = "6.x"
-project = "tagging"
-datestamp = "1268902508"
-
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_opencalais_suggest/tagging_opencalais_suggest.module b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_opencalais_suggest/tagging_opencalais_suggest.module
deleted file mode 100644
index fcb7584..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_opencalais_suggest/tagging_opencalais_suggest.module
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-// $Id: tagging_opencalais_suggest.module,v 1.1.2.5 2010/10/17 10:23:24 eugenmayer Exp $
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-
-function tagging_opencalais_suggest_tagging_suggestions($vid, $node) {
- $suggestions = array();
- $result = calais_api_analyze_xml($node->title,$node->body,$node->created);
- foreach($result as $categorie) {
- if($categorie->type == 'URL') {
- continue;
- }
-
- foreach($categorie->terms as $term) {
- $suggestions[] = array('#name' => $term->name, '#weight' => $term->relevance);
- }
- }
- return $suggestions;
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/extractor_ng.inc b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/extractor_ng.inc
deleted file mode 100644
index b9ef41a..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/extractor_ng.inc
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-// $Id$
-
-/**
- * @file:
- * Simple term extraction.
- */
-
-/**
- * Finds tags in text.
- */
-function extractor_ng_extract($text) {
- $text = strip_tags($text);
- $words = _extractor_ng_split($text);
- $vid = variable_get('extractor_ng_vid', 1);
- $result = array();
- for ($pos = 0; $pos < count($words); $pos++) {
- $term_names = $term_tids = $terms = array();
- $word = $words[$pos];
-
- // 1) get all terms any synonyms that start with this word.
- foreach (_extractor_ng_lookup($word) as $term) {
- $term_tids[$term->name] = $term->tid;
- $term_names[$term->name] = $term->name;
- }
-
- // Skip to immediate loop if no results.
- if (!count($term_tids)) {
- continue;
- }
-
- // 2) Order result by length desc.
- $sorted = FALSE;
- $sorted_terms = array_values($term_names);
-
- while (!$sorted) {
- $sorted = TRUE;
- for ($i = 0; $i < count($sorted_terms) - 1; $i++) {
- if (strlen($sorted_terms[$i]) < strlen($sorted_terms[$i+1])) {
- $tmp = $sorted_terms[$i+1];
- $sorted_terms[$i+1] = $sorted_terms[$i];
- $sorted_terms[$i] = $tmp;
- $sorted = FALSE;
- }
- }
- }
- foreach ($sorted_terms as $term) {
- $result[$term_tids[$term]] = $term_names[$term];
- }
- }
-
- return $result;
-}
-
-/**
- * Split text into words.
- */
-function _extractor_ng_split($text) {
- $tmp = preg_split("/[\s,.:\-\(\)\[\]{}*\/]+/", $text);
-
- $result = array();
- $max_word_count = variable_get('tagging_vocab_extractor_suggest_max_word_count', 4);
-
- foreach($tmp as $key => $word) {
- $result[] = $word;
- for($i = 1;$i <=$max_word_count;$i++) {
- if(array_key_exists(($key+$i),$tmp)) {
- $word = "$word {$tmp[$key+$i]}";
- $result[] = $word;
- }
- }
- }
-
- return $result;
-}
-
-/**
- * Look up terms for a given word. Supports up to 2000 terms.
- */
-function _extractor_ng_lookup($word) {
- // Do not bother if word starts with a numeric or if word is in stop word list.
- if (is_numeric($word[0]) || in_array($word, _extractor_ng_stopwords())) {
- return array();
- }
- $terms = array();
- // COLLATE utf8_bin for cs
- $result = db_query('SELECT td.tid, td.name FROM {term_data} as td LEFT JOIN {term_synonym} as ts on ts.tid=td.tid WHERE td.vid = %d AND ( td.name COLLATE utf8_bin ="%s" OR ts.name COLLATE utf8_bin ="%s" )', variable_get('extractor_ng_vid', 1), $word, $word );
- while ($term = db_fetch_object($result)) {
- $terms[$term->tid] = $term;
- }
-
- return $terms;
-}
-
-/**
- * Stop words.
- */
-function _extractor_ng_stopwords() {
- return array('a', 'able', 'about', 'across', 'after', 'all', 'almost', 'also', 'am', 'among', 'an', 'and', 'any', 'are', 'as', 'at', 'be', 'because', 'been', 'but', 'by', 'can', 'cannot', 'could', 'dear', 'did', 'do', 'does', 'either', 'else', 'ever', 'every', 'for', 'from', 'get', 'got', 'had', 'has', 'have', 'he', 'her', 'hers', 'him', 'his', 'how', 'however', 'i', 'if', 'in', 'into', 'is', 'it', 'its', 'just', 'least', 'let', 'like', 'likely', 'may', 'me', 'might', 'most', 'must', 'my', 'neither', 'no', 'nor', 'not', 'of', 'off', 'often', 'on', 'only', 'or', 'other', 'our', 'own', 'rather', 'said', 'say', 'says', 'she', 'should', 'since', 'so', 'some', 'than', 'that', 'the', 'their', 'them', 'then', 'there', 'these', 'they', 'this', 'tis', 'to', 'too', 'twas', 'us', 'wants', 'was', 'we', 'were', 'what', 'when', 'where', 'which', 'while', 'who', 'whom', 'why', 'will', 'with', 'would', 'yet', 'you', 'your');
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.admin.inc b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.admin.inc
deleted file mode 100644
index 657259e..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.admin.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-// $Id$
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-/*
- * Providing a administration interface for tagging_vocab_extractor.
- */
-function tagging_vocab_extractor_suggest_admin_settings() {
- $form['tagging_vocab_extractor_suggest_cck'] = array(
- '#type' => 'textfield',
- '#title' => t('CCK fields to scan'),
- '#description' => t('Comma seperated list of cck field names, which will be scanned for terms if they exist'),
- '#valid' => 'string',
- '#default_value' => variable_get('tagging_vocab_extractor_suggest_cck', '')
- );
-
- $form['tagging_vocab_extractor_suggest_max_word_count'] = array(
- '#type' => 'textfield',
- '#title' => t('Maximum word count'),
- '#description' => t('Maximum word count of multi-word terms'),
- '#valid' => 'string',
- '#default_value' => variable_get('tagging_vocab_extractor_suggest_max_word_count', 4)
- );
-
- return system_settings_form($form);
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.info b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.info
deleted file mode 100644
index b1366f3..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.info
+++ /dev/null
@@ -1,15 +0,0 @@
-; $Id$
-name = Tagging vocab extractor suggestions
-description = This tagging module exposes terms-suggestions which are part of a vocabulary and could be found in the title, teaser, body and (cck) using the extractor plugin.(Synonyms are derived to their parent)
-package = "Taxonomy"
-core = 6.x
-dependencies[] = tagging
-dependencies[] = extractor
-project = "tagging_vocab_extractor_suggest"
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.module b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.module
deleted file mode 100644
index 47bcf8c..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_extractor_suggest/tagging_vocab_extractor_suggest.module
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-// $Id$
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-
-/*
- * Implementation of hook_menu
-*/
-function tagging_vocab_extractor_suggest_menu() {
- $items = array();
- $items['admin/settings/tagging_vocab_extractor_suggest/settings'] = array (
- 'type' => MENU_NORMAL_ITEM,
- 'title' => 'Tagging Vocab Extractor configuration',
- 'description' => 'Configuration options for the Tagging Vocab Extractor submodule',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('tagging_vocab_extractor_suggest_admin_settings'),
- 'access arguments' => array('administer site configuration'),
- 'file' => 'tagging_vocab_extractor_suggest.admin.inc'
- );
-
- return $items;
-}
-
-/*
- * Implements hook_tagging_suggestions API
- */
-function tagging_vocab_extractor_suggest_tagging_suggestions($vid, $node) {
- $terms = array();
- // Include our new extractor for terms and synonyms
- require_once( drupal_get_path('module','tagging_vocab_extractor_suggest').'/extractor_ng.inc' );
-
- // Get all terms in selected CCK fields
- $cck_terms = array();
- $cck_fields = explode(',',variable_get('tagging_vocab_extractor_suggest_cck', ''));
- if($cck_fields != '' && count($cck_fields) > 0) {
- $cck_terms = _tagging_vocab_extractor_suggest_cck_handler($cck_fields,$node);
- $terms = tagging_vocab_extractor_suggest_array_merge_recursive_distinct($terms,$cck_terms);
- }
- // Get all terms from the body
- $body_terms = extractor_extract($node->body,'extractor_ng',NULL );
- $terms = tagging_vocab_extractor_suggest_array_merge_recursive_distinct($terms,$body_terms);
-
- // Get all terms from the teaser
- $teaser_terms = extractor_extract($node->teaser,'extractor_ng',NULL );
- $terms = tagging_vocab_extractor_suggest_array_merge_recursive_distinct($terms,$teaser_terms);
-
- // Get all terms from the title
- $title_terms = extractor_extract($node->title,'extractor_ng',NULL );
- $terms = tagging_vocab_extractor_suggest_array_merge_recursive_distinct($terms,$title_terms);
-
- // Add the weight
- $result = array();
- foreach($terms as $key => $term) {
- $result[] = array('#weight' => (1/$key), '#name' => $term);
- }
- return $result;
-}
-
-/*
- * For every given CCK field, check if the node has such and if
- * extract all terms
- */
-function _tagging_vocab_extractor_suggest_cck_handler($cck_fields,$node) {
- if($node == NULL) {
- return array();
- }
- $result = array();
- foreach($cck_fields as $field) {
- $field = trim($field);
-
- if(array_key_exists( $field, get_object_vars( $node) ) ) {
-
- $terms = array();
- foreach($node->$field as $value) {
-
- $new_terms = extractor_extract($value['value'],'extractor_ng',NULL );
- $terms = tagging_vocab_extractor_suggest_array_merge_recursive_distinct($terms,$new_terms);
- }
- $result = tagging_vocab_extractor_suggest_array_merge_recursive_distinct($result,$terms);
- }
- }
- return $result;
-}
-
-function tagging_vocab_extractor_suggest_array_merge_recursive_distinct ( array &$array1, array &$array2 )
-{
- $merged = $array1;
-
- foreach ( $array2 as $key => &$value )
- {
- if ( is_array ( $value ) && isset ( $merged [$key] ) && is_array ( $merged [$key] ) )
- {
- $merged [$key] = tagging_vocab_extractor_suggest_array_merge_recursive_distinct ( $merged [$key], $value );
- }
- else
- {
- $merged [$key] = $value;
- }
- }
-
- return $merged;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_suggest/tagging_vocab_suggest.info b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_suggest/tagging_vocab_suggest.info
deleted file mode 100644
index 616e221..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_suggest/tagging_vocab_suggest.info
+++ /dev/null
@@ -1,15 +0,0 @@
-; $Id: tagging_vocab_suggest.info,v 1.1.2.4 2010/10/17 10:23:24 eugenmayer Exp $
-name = Tagging full-vocabular suggestion
-description = This tagging module exposes all vocabulary terms of a the vocabulary as suggestions (no matter what is in the content).
-package = "Taxonomy"
-core = 6.x
-dependencies[] = taxonomy
-dependencies[] = tagging
-
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_suggest/tagging_vocab_suggest.module b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_suggest/tagging_vocab_suggest.module
deleted file mode 100644
index 260887e..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/modules/tagging_vocab_suggest/tagging_vocab_suggest.module
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// $Id: tagging_vocab_suggest.module,v 1.1.2.4 2010/10/17 10:23:24 eugenmayer Exp $
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-
-function tagging_vocab_suggest_tagging_suggestions($vid, $node) {
- $result = db_query('select * from {term_data} where vid=%d',$vid);
- $suggestions = array();
- while ($term = db_fetch_object($result)) {
- $suggestions[] = array('#weight' => $term->weight, '#name' => $term->name);
- }
-
- return $suggestions;
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/remove.png b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/remove.png
deleted file mode 100644
index c01402b..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/remove.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tag.png b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tag.png
deleted file mode 100644
index 9757fc6..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tag.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.admin.inc b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.admin.inc
deleted file mode 100644
index 91865ca..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.admin.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-// $Id: tagging.admin.inc,v 1.5.2.4 2010/10/17 10:23:24 eugenmayer Exp $
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-
-/*
- * Providing a administration interface for tagging.
- */
-function tagging_admin_settings() {
- $form['tagging_show_max_suggestion'] = array(
- '#type' => 'textfield',
- '#title' => t('Maximum suggestions'),
- '#description' => t('Maximum suggestions to show in the user-interface. Please use a number. Put "0" for no limit'),
- '#valid' => 'integer',
- '#default_value' => variable_get('tagging_show_max_suggestion', 20)
- );
-
- $form['tagging_show_suggestion_example'] = array(
- '#type' => 'checkbox',
- '#title' => t('Provide example suggestions (example implementation of hook_tagging_suggestion)'),
- '#description' => t('This will show a set of static suggestion in the user-interface. This should be only an example, you have to implement your own proper suggestion handler afterward and deacativate this one!'),
- '#default_value' => variable_get('tagging_show_suggestion_example', 1)
- );
-
- return system_settings_form($form);
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.css b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.css
deleted file mode 100644
index a2e6ec5..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.css
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $Id: tagging.css,v 1.12.2.5 2010/10/17 10:23:24 eugenmayer Exp $
- * Author: Eugen Mayer (http://kontextwork.de)
- * Copyright 2010
- */
-
-.tagging-tag {
- margin:5px 3px 5px 3px;
- cursor:pointer;
- background: url('remove.png') white no-repeat right center;
- padding:3px 19px 3px 3px;
- border:1px solid grey;
- -moz-border-radius:4px;
- -webkit-border-radius: 4px;
- float:left;
-}
-
-.tagging-suggest-tag {
- background: url('add.png') white no-repeat right;
- background-color: #c3f47f;
- margin:5px 5px 5px 5px;
- padding:3px 18px 3px 3px;
- cursor:pointer;
- -moz-border-radius:4px;
- -webkit-border-radius: 4px;
- border:1px solid grey;
- float:left;
-}
-
-.tagging-suggestion-new {
- background-color: #FCF392;
-}
-
-#tagging-widget-container .form-item {
- margin:0px;
- padding:0px;
- clear:both;
-}
-
-#tagging-widget-container {
- clear:both;
-}
-
-#tagging-widget-container .tagging-widget-input {
- width:150px;
- float:left;
- margin:3px 0px 3px 0px;
-}
-
-.tagging-button {
- float:left;
- margin:3px 0px 0px 5px;
- width:19px;
- height:19px;
- background:url('add.png') transparent no-repeat center center;
-}
-
-.tagging-curtags-wrapper {
- background-color:#eee;
- padding:5px 0px 10px 0px;
- display:inline-block;
- width:100%;
-}
-.tagging-curtags-wrapper label {
- padding:0px 0px 4px 20px;
- margin-left:5px;
- background:url('tag.png') transparent no-repeat left center;
- display:block;
-}
-
-.tagging-suggestions-wrapper {
- clear:both;
- background-color:#eee;
- padding:10px 0px 5px 0px;
- display:inline-block;
- width:100%;
-}
-
-.tagging-suggestions-wrapper label {
- padding:0px 0px 4px 2px;
- display:block;
-}
-
-
-/*#tagging-widget-container .tagging-button-container,, #tagging-widget-container .field-prefix*/
-#tagging-widget-container .field-suffix{
- float:left;
-}
-
-.taggin-widget-input-wrapper #autocomplete {
- background-color:white;
-}
-
-.clearfix:after {
- clear:both;
- content:".";
- display:block;
- font-size:0;
- height:0;
- visibility:hidden;
-}
-
-.clearfix { display:block; }
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.info b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.info
deleted file mode 100644
index 6a0c337..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.info
+++ /dev/null
@@ -1,15 +0,0 @@
-; $Id: tagging.info,v 1.12.2.6 2010/10/17 10:23:24 eugenmayer Exp $
-name = Tagging
-description = This widget is replacing the default Drupal-Tagging-Interface with a more visual driven one, to make tagging even easier. (by <a href="http://kontextwork.de"KontextWork</a>)
-package = "Drupal Wiki"
-version = "6.x-2.4"
-core = 6.x
-dependencies[] = taxonomy
-project = "tagging"
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.init.js b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.init.js
deleted file mode 100644
index 02e5c5d..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.init.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id: tagging.init.js,v 1.12.2.6 2010/10/17 10:23:24 eugenmayer Exp $
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-Drupal.behaviors.tagging = function() {
- $('input.tagging-widget-input:not(.tagging-processed)').tagging();
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.install b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.install
deleted file mode 100644
index 489f72d..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.install
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// $Id: tagging.install,v 1.12.2.6 2010/10/17 10:23:24 eugenmayer Exp $
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-
-/**
- * @file
- * Installation/updates for tagging
- */
-
- /**
- * Implementation of hook_install().
- */
-function tagging_install() {
- db_query("UPDATE {system} SET weight = 10 WHERE name = 'tagging'");
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function tagging_uninstall(){
- db_query("DELETE from {variable} WHERE name LIKE 'tagging_inject_%'");
-}
\ No newline at end of file
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.module b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.module
deleted file mode 100644
index 6da1277..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.module
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-// $Id: tagging.module,v 1.14.2.6 2010/10/17 10:23:24 eugenmayer Exp $
-
-// Author: Eugen Mayer (http://kontextwork.de)
-// Copyright 2010
-
-/**
- * hook_menu
- */
-function tagging_menu() {
- $items = array();
- $items['admin/settings/tagging/settings'] = array (
- 'type' => MENU_NORMAL_ITEM,
- 'title' => 'Tagging configuration',
- 'description' => 'Configuration options for the tagging module',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('tagging_admin_settings'),
- 'access arguments' => array('administer site configuration'),
- 'file' => 'tagging.admin.inc'
- );
-
- return $items;
-}
-
-/**
- * Implementing hook_elements
- * Registering the new form element, so we can render the tagging form element properly
- */
-function tagging_elements() {
- $type['tagging_widget'] = array(
- '#input' => TRUE,
- '#after_build' => array('_tagging_widget_javascript'),
- '#process' => array('_tagging_add_suggestions'),
- '#default_value' => -1,
- );
- return $type;
-}
-
-/**
- * Implementation of hook_form_alter.
- *
- */
-function tagging_form_alter(&$form, $form_state, $form_id) {
- // Check if we are editting a node and we actually have a tag taxonomy.
- if ($form['#id'] == 'node-form' && isset($form['taxonomy']['tags'])) {
- foreach ($form['taxonomy']['tags'] as $id => $values) {
- if (variable_get('tagging_inject_'. $id, 0) == 1) {
- $form['taxonomy']['tags'][$id]['#type'] = 'tagging_widget';
- $form['taxonomy']['tags'][$id]['#vid'] = $id;
- $form['taxonomy']['tags'][$id]['#nid'] = $form['nid']['#value'];
- }
- }
- }
-
- // Check if user_terms is present
- if (isset($form['user_terms'])) {
- // Iterate all the available vocabularies
- foreach ($form['user_terms'] as $key => $value) {
- // Only act on form items containing vocabularies
- if (strstr($key, 'user_terms_')) {
- // Extract the vid
- $id = str_replace('user_terms_', '', $key);
- // Make sure it's numeric
- if (is_numeric($id)) {
- // Check if the tagging widget is enabled for this
- if (variable_get('tagging_inject_' . $id, 0)) {
- $form['user_terms'][$key]['#type'] = 'tagging_widget';
- $form['user_terms'][$key]['#vid'] = $id;
- $form['user_terms'][$key]['#uid'] = $form['#uid'];
- }
- }
- }
- }
- }
-}
-
-/**
- * Implementation of hook_form_ID_alter.
- *
- */
-function tagging_form_taxonomy_form_vocabulary_alter(&$form, $form_state ) {
- $form['settings']['tagging_inject'] = array(
- '#type' => 'checkbox',
- '#title' => t('Tagging Widget'),
- '#weight' => 10,
- '#default_value' => variable_get('tagging_inject_'. $form['vid']['#value'], 0),
- '#description' => t('Use the visual tagging-widget, when this taxonomy is shown to the user'),
- );
- $form['#submit'][] = 'tagging_form_vocabulary_submit';
-}
-
-/**
- * Implementing hook_theme.
- */
-function tagging_theme() {
- return array(
- 'tagging_widget' => array('arguments' => array('element' => NULL) ),
- 'tagging_widget_button' => array('arguments' => array('vid' => NULL) ),
- 'tagging_widget_wrapper' => array('arguments' => array('content' => NULL, 'vid' => NULL) ),
- 'tagging_suggestions_list' => array('arguments' => array('suggestions' => array(), 'vid' => NULL )),
- 'tagging_tags_list' => array('arguments' => array('tags' => array(), 'vid' => NULL) )
- );
-}
-
-/**
- * Rendering the tagging widget.
- */
-function theme_tagging_widget($element) {
- // TODO: Maybe use a file as a template..but otherwise...performance?
- $vid = $element['#vid'];
- $cur_tags = '';
-
- $id = "tagging-widget-input-$vid";
- $fieldset['#title'] = $element['#title'];
- $fieldset['#collapsed'] = false;
- // Well this is the original. We actually just need it in the background, so that we
- // dont need to fight in the validation filter. We can let the normal taxonomy.modul
- // validators and submitters do their job.
- $element['#type'] = 'hidden';
- $element['#attributes']['class'] = "tagging-widget-target-$vid";
- $old_input = theme('hidden', $element);
-
- // Ok now lets render the input textfield we will use for the tagging
- $element['#type'] = 'textfield';
- // Its convention that the tagging-widget-VID class it addid. That vid will be used
- // to get the unique "context" id for all the other wrappers and functions.
- $element['#attributes']['class'] = "tagging-widget-input $id";
- $element['#id']= $id;
- $element['#title']= "";
-
- if($element['#description'] == '') {
- $element['#description'] = t("Type and press enter to add the tag");
- }
- $element['#field_suffix'] = theme('tagging_widget_button', $vid).$old_input;
- $output .= theme('tagging_tags_list',split(',',$element['#value']),$vid)
- .'<div class="taggin-widget-input-wrapper clearfix">'
- .theme('textfield', $element)
- .'</div>'
- .theme('tagging_suggestions_list', $element['#suggestions'], $vid);
- $fieldset['#value'] = $output;
- $output = theme('fieldset',$fieldset);
- return theme('tagging_widget_wrapper',$output,$vid);
-}
-
-/**
- * Rendering the widget button
- */
-function theme_tagging_widget_button($vid) {
- return '<a class="tagging-button-container" href="#" title="'.t('Add').'"><span class="tagging-button tagging-button-'.$vid.'"></span></a>';
-}
-
-/**
- * Rendering the wrapper of the widget
- */
-function theme_tagging_widget_wrapper($content, $vid) {
- return "<div id='tagging-widget-container'>$content</div>";
-}
-
-
-/**
- * Rendering suggestions for a specific vocabulary
- */
-function theme_tagging_tags_list($tags, $vid) {
- $cur_tags = '';
- // they are sorted already
- foreach ($tags as $term) {
- if($term == '') {
- continue;
- }
- // TODO: use # here...but out of any reason it gets encoded to %23 in html
- // using trim here, as mostly the old tagging system was "one, two, three"..
- $term = "<span class='tagging-tag'>"._tagging_check_tag($term)."</span>";
-
- $link = l($term, '', array('html' => true, 'attributes' => array('title' => t('Remove tag'), 'fragment' => '#')));
- $cur_tags .= $link;
- }
- return "<div class='tagging-curtags-wrapper tagging-curtags-wrapper-$vid'><label>".t('Assigned Tags:')."</label>$cur_tags</div>";
-}
-
-function _tagging_check_tag($tag) {
- $tag = trim(check_plain($tag));
- return $tag;
-}
-
-/**
- * Rendering suggestions
- * we need $vid for namespacing only
- */
-function theme_tagging_suggestions_list($suggestions, $vid) {
- $suggested_tags = '';
- // They are sorted already.
- foreach ($suggestions as $term) {
- if($term['#name'] == '') {
- continue;
- }
- // TODO: Use # here...but out of any reason it gets encoded to %23 in html.
- $title = t('Add this already existing tag');
- $class = 'tagging-suggest-tag';
- if(array_key_exists('#new',$term) && $term['#new'] == TRUE) {
- $class .= ' tagging-suggestion-new';
- $title = t('Add this new tag');
- }
- $term = "<span id='tagging-$vid' class='{$class}'>"._tagging_check_tag($term['#name'])."</span>";
- $link = l($term, '', array('html' => true, 'attributes' => array('title' =>$title )));
- $suggested_tags .= $link;
- }
- // If we have any suggestions, then place the wrapper.
- if($suggested_tags != '') {
- return "<div class='tagging-suggestions-wrapper tagging-suggestions-wrapper-$vid'><label>"
- . t('Suggestions') . ":</label>$suggested_tags</div>";
- }
- // We have no suggestions, so no need to show any output
- return '';
-}
-
-/**
- * Defining new hook: hook_tagging_suggestion
- * Modules can use this hook to implement their methods to provide suggestions for tagging
- * the current node
- */
-function _tagging_add_suggestions($element) {
- // TODO: Quite expensive here. Should we only fetch the body? This might
- // change in the future
- $node = node_load($element['#nid']);
- /*
- * @vid: This is the vid the suggestions have been called for. You can use this to decide whether you
- * want to suggest something or not for this vocabulary
- * @node: This is the complete expanded node object. Use this to e.g. base your suggestions on the body
- * of the node or the title or whatever you wish on
- */
- $suggestions = module_invoke_all('tagging_suggestions', $element['#vid'], $node);
- drupal_alter('tagging_suggestions', $suggestions);
-
- // Validation
- if ( !is_array($suggestions) ) {
- $suggestions = array();
- watchdog(WATCHDOG_WARNING, 'Tagging: Could not parse suggestion array - maybe some hooks are out of bound?');
- }
- // Iam not going to hold the devs hand and validate if we got a valid array with #name / #weight
- uasort($suggestions,'element_sort');
- // Only show a maximum ammount of suggesitons
- if(variable_get('tagging_show_max_suggestion', 20) > 0) {
- $suggestions = array_slice($suggestions,0, variable_get('tagging_show_max_suggestion', 20));
- }
- $element['#suggestions'] = $suggestions;
- return $element;
-}
-
-
-/**
- * Implementing #process of the form element tagging_widget.
- * Adding Javascript-Libraries needed, if a widget has been placed.
- */
-function _tagging_widget_javascript($form_element, &$form_state) {
- drupal_add_css(drupal_get_path('module', 'tagging') .'/tagging.css', 'module');
- drupal_add_js(drupal_get_path('module', 'tagging') .'/tagging.plugin.js', 'module');
- drupal_add_js(drupal_get_path('module', 'tagging') .'/tagging.init.js', 'module');
- return $form_element;
-}
-
-/**
- * Saving the variable, whether to show the widget for a taxonomy or not
- */
-function tagging_form_vocabulary_submit($form, &$form_state) {
- variable_set('tagging_inject_'. $form_state['values']['vid'], $form_state['values']['tagging_inject']);
- return TRUE;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.plugin.js b/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.plugin.js
deleted file mode 100644
index 2d85f52..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/tagging/tagging.plugin.js
+++ /dev/null
@@ -1,259 +0,0 @@
-// $Id: tagging.plugin.js,v 1.12.2.6 2010/10/17 10:23:24 eugenmayer Exp $
-/**
- * @author Eugen Mayer (http://kontextwork.de)
- * @Copyright 2010 KontextWork
- */
-(function($) {
- $.fn.tagging = function() {
- return this.each( function(){
- // **************** Init *****************/
- var context = get_context($(this).attr('class'));
-
- if(context === null) {
- alert('cant initialize tagging-widget: "'+$(this).attr('id')+'"..did you forget the "taggig-widget-$CONTEXT" class?');
- return;
- }
- // Our containers.
- var input_sel = '.tagging-widget-input-'+context;
- var button_sel = '.tagging-button-'+context;
- var wrapper_sel = '.tagging-curtags-wrapper-'+context;
- var suggestions_wrapper_sel = '.tagging-suggestions-wrapper-'+context;
- var target_sel = '.tagging-widget-target-'+context;
- var suggest_class = 'tagging-suggest-tag';
- var tag_class = 'tagging-tag';
- var suggest_sel = '.'+suggest_class;
- var tag_sel = '.'+tag_class;
-
- // Lets set all things up.
- bind_taglist_events();
- bind_button();
- update_tags();
- bind_enter();
- check_dublicates();
-
- $(input_sel).val('');
- $(this).addClass('tagging-processed');
- // **************** Helper methods *****************/
- /*
- * Adds a tag to the visual list and to the hidden input field (target).
- */
- function add_tag(tag, autoupdate) {
- tag = Drupal.checkPlain(tag);
- $(wrapper_sel).append("<span class='"+tag_class+"'>"+tag+"</span>");
- if(autoupdate) {
- update_tags();
- }
- }
-
- /*
- * Removes a tag out of the visual list and out of the hidden input field (target).
- */
- function remove_tag(e) {
- $(e).remove();
- unbind_taglist_events();
- update_tags();
- bind_taglist_events();
- reshow_suggestion_if_exists($(e).text());
- }
-
- /*
- * Hides a tag out of the visual list. Suggestions need this to restore later
- */
- function hide_tag(e) {
- $(e).hide();
- unbind_taglist_events();
- update_tags();
- bind_taglist_events();
- }
-
- /*
- * Updates the hidden input textfield with current tags.
- * We do so, that we later can pass the tags to the taxonomy validators
- * and dont have to fight with module weights.
- */
- function update_tags() {
- var tags = new Array();
- $(wrapper_sel+' '+tag_sel).each( function () {
- tags.push($(this).text());
- });
- $(target_sel).val(tags.join(','));
- }
-
- /*
- * Checks, if the tag already exists. Lets avoid the dublicates
- * we have seen in the past. We dont tell the use anything, we
- * just do as we would have added it, as the user expects to have the tag
- * added, no matter its there or not.
- */
- function tag_exists(tag) {
- var tag = $.trim(tag.toLowerCase());
- var found = false;
- $(wrapper_sel+' '+tag_sel).each(function() {
- if($.trim($(this).text().toLowerCase()) == tag) {
- found = true;
- return;
- }
- });
- return found;
- }
-
- /*
- * If a tag is removed from the tag list, we check here if it was a suggestion before
- * if yes, we show it again in the suggestion list
- */
- function reshow_suggestion_if_exists(tag) {
- $(suggestions_wrapper_sel+' '+suggest_sel+':hidden').each(function() {
- if($(this).text() === tag) {
- $(this).show();
- }
- });
- }
-
- /*
- * Adds the button to the inputfield. Actuall the button is optional
- * as we also add (primary) by pressing enter.
- */
- function bind_button() {
- $(button_sel).bind('click',function() {
- tags = $(input_sel).not('.tag-processed').val().split(',');
- $.each(tags, function(i, tag) {
- tag = jQuery.trim(tag);
- if (tag != '' && !tag_exists(tag)) {
- add_tag(tag, false);
- }
- });
- $(input_sel).val('');
- update_tags();
- bind_taglist_events();
- return false;
- });
- }
-
- /*
- * Event for keypress on the input field of the tagging-widget.
- */
- function bind_enter() {
- if ($.browser.mozilla || $.browser.opera) {
- $(input_sel).bind('keypress',check_enter);
- }
- else {
- $(input_sel).bind('keydown',check_enter);
- }
- }
-
- /*
- * Checks, if enter is pressed. If yes, close the autocompletition
- * use the selected item and add it to the tag-list.
- */
- function check_enter(event) {
- var key = event.which;
- if (key == 13) {
- $('#autocomplete').each(function() {
- this.owner.hidePopup();
- });
- $(button_sel).trigger('click');
- event.preventDefault();
- return false;
- }
- return true;
- }
-
- /*
- * Check for dupblicates in suggestions and allready assgined tags.
- * Hide suggestions on match.
- */
- function check_dublicates(){
- // TODO: Using this optimized selector somehow interfers with the
- // fckeditor as a module. Yet no idea what happens.
- // sel = suggestions_wrapper_sel + ' div' + suggest_sel + ":visble";
-
- // Fallback selector
- sel = suggestions_wrapper_sel + ' span' + suggest_sel;
- $(sel).each(function(){
- if( tag_exists($(this).text()) ) {
- $(this).hide();
- }
- });
- }
-
- /*
- * Adds the remove-tag methods to the tags in the wrapper.
- */
- function bind_taglist_events() {
- $(wrapper_sel+' span'+tag_sel+':not(span.processed)').each(function() {
- $(this).addClass('processed');
- // We use non anonymuos binds to be properly able to unbind them.
- $(this).bind('click',remove_tag_click);
- });
-
-
- // For suggestion, we only hide tags. When those tags are remove from the tag
- // list, we can simply check for the existence and show them again
- $(suggestions_wrapper_sel+' span'+suggest_sel+':not(span.processed)').each(function() {
- // We use non anonymuos binds to be able to properly unbind them
- $(this).addClass('processed');
- $(this).bind('click',add_suggestion_tag_click);
- });
- }
-
- /*
- * Click event for a suggested tag.
- */
- function add_suggestion_tag_click () {
- $(this).addClass('processed');
- tag = $(this).text();
- // skip, if this tag is already assigned
- if (tag_exists(tag)) {
- return false;
- }
- add_tag(tag);
- hide_tag(this);
- return false;
- }
-
- /*
- * Click event for a tag.
- */
- function remove_tag_click() {
- remove_tag(this); return false;
- }
-
- /*
- * During updating of the tags, we unbind the events to avoid
- * sideffects.
- */
- function unbind_taglist_events() {
- $(wrapper_sel+' '+tag_sel).each(function() {
- $(this).removeClass('processed');
- $(this).unbind('click',remove_tag_click);
- return false;
- }
- );
-
- $(suggestions_wrapper_sel+' '+suggest_sel).each(function() {
- $(this).removeClass('processed');
- $(this).unbind('click',add_suggestion_tag_click);
- return false;
- }
- );
- }
-
- /*
- * Extracts the content ID - for drupal thats the VID.
- * This is extracted from the tagging-widget-XX class
- * if the input element, which actuall has the tagging-widget class.
- */
- function get_context(classes) {
- context = null;
- $(classes.split(' ')).each(function(){
- match = this.match(/tagging[-]widget[-]input[-](\d+)/i);
- if (match != null) {
- context = match[1];
- }
- });
- return context;
- }
- }
- );
- }
-})(jQuery);
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/LICENSE.txt b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/LICENSE.txt
deleted file mode 100644
index 2c095c8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/LICENSE.txt
+++ /dev/null
@@ -1,274 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-
- Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
-Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
-verbatim copies of this license document, but changing it is not allowed.
-
- Preamble
-
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public License
-applies to most of the Free Software Foundation's software and to any other
-program whose authors commit to using it. (Some other Free Software
-Foundation software is covered by the GNU Library General Public License
-instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this service if
-you wish), that you receive source code or can get it if you want it, that you
-can change the software or use pieces of it in new free programs; and that
-you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have. You must make
-sure that they, too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If the
-software is modified by someone else and passed on, we want its recipients
-to know that what they have is not the original, so that any problems
-introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
- MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms
-of this General Public License. The "Program", below, refers to any such
-program or work, and a "work based on the Program" means either the
-Program or any derivative work under copyright law: that is to say, a work
-containing the Program or a portion of it, either verbatim or with
-modifications and/or translated into another language. (Hereinafter, translation
-is included without limitation in the term "modification".) Each licensee is
-addressed as "you".
-
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made
-by running the Program). Whether that is true depends on what the Program
-does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it,
-thus forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you
-also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that
-you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or in
-part contains or is derived from the Program or any part thereof, to be
-licensed as a whole at no charge to all third parties under the terms of this
-License.
-
-c) If the modified program normally reads commands interactively when run,
-you must cause it, when started running for such interactive use in the most
-ordinary way, to print or display an announcement including an appropriate
-copyright notice and a notice that there is no warranty (or else, saying that
-you provide a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this License.
-(Exception: if the Program itself is interactive but does not normally print such
-an announcement, your work based on the Program is not required to print
-an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be
-reasonably considered independent and separate works in themselves, then
-this License, and its terms, do not apply to those sections when you distribute
-them as separate works. But when you distribute the same sections as part
-of a whole which is a work based on the Program, the distribution of the
-whole must be on the terms of this License, whose permissions for other
-licensees extend to the entire whole, and thus to each and every part
-regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to
-work written entirely by you; rather, the intent is to exercise the right to
-control the distribution of derivative or collective works based on the
-Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the scope
-of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1
-and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source
-code, which must be distributed under the terms of Sections 1 and 2 above
-on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give
-any third party, for a charge no more than your cost of physically performing
-source distribution, a complete machine-readable copy of the corresponding
-source code, to be distributed under the terms of Sections 1 and 2 above on
-a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for
-noncommercial distribution and only if you received the program in object
-code or executable form with such an offer, in accord with Subsection b
-above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation and
-installation of the executable. However, as a special exception, the source
-code distributed need not include anything that is normally distributed (in
-either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the
-source code from the same place counts as distribution of the source code,
-even though third parties are not compelled to copy the source along with the
-object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy,
-modify, sublicense or distribute the Program is void, and will automatically
-terminate your rights under this License. However, parties who have received
-copies, or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the
-Program or its derivative works. These actions are prohibited by law if you
-do not accept this License. Therefore, by modifying or distributing the
-Program (or any work based on the Program), you indicate your acceptance
-of this License to do so, and all its terms and conditions for copying,
-distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these terms and
-conditions. You may not impose any further restrictions on the recipients'
-exercise of the rights granted herein. You are not responsible for enforcing
-compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License. If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices. Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose
-that choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded. In such
-case, this License incorporates the limitation as if written in the body of this
-License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will be
-similar in spirit to the present version, but may differ in detail to address new
-problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-a version number of this License which applies to it and "any later version",
-you have the option of following the terms and conditions either of that
-version or of any later version published by the Free Software Foundation. If
-the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we sometimes make
-exceptions for this. Our decision will be guided by the two goals of
-preserving the free status of all derivatives of our free software and of
-promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
-PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
-AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
-ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
-LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE
-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
-OR DATA BEING RENDERED INACCURATE OR LOSSES
-SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
-IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/README.txt b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/README.txt
deleted file mode 100644
index 3f02344..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/README.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-// $Id: README.txt,v 1.3.2.3 2007/08/20 14:41:10 mh86 Exp $
-
-README - TAXONOMY MANAGER
-**************************
-
-
-SHORT PROJECT DESCRIPTION
---------------------------
-This module provides a powerful interface for managing vocabularies of the taxonomy module.
-It's especially very useful for long sets of vocabularies.
-
-Features:
- * dynamic tree view
- * mass deleting
- * mass adding of new terms
- * moving of terms in hierarchies
- * merging of terms
- * fast weight changing with up and down arrows (and AJAX saving)
- * AJAX powered term editing form
- * simple search interface
-
-
-REQUIREMENTS
-------------
- - Taxonomy module enabled
- - JavaScript enabled in your browser
- - a user with 'administer taxonomy' permission
-
-
-INSTALLATION
-------------
-1. Place the entire taxonomy_manager directory into your Drupal sites/all/modules/ directory.
-
-2. Enable the taxonomy manager module by navigating to:
-
- administer > site building > modules
-
-
-USING THE TAXONOMY MANAGER
---------------------------
-To use the Taxonomy Manager go to administer > content management > taxonomy manager. This page
-contains a list of all available vocabularies. By clicking at one of the vocabularies, you get
-redirected to the Taxonomy Manager interface, where you can edit the whole tree structure and
-terms.
-If you want to edit any general vocabulary settings or if you want to create a new one, go to
-the categories (administer > content management > categories) page.
-
-The interface contains a search bar, a toolbar with some operations, a tree view and if a term
-gets selected a form for editing the term data.
-The following lines describe all operations and some terminology.
-
- - Tree View
- The tree view shows all terms of the vocabulary with their hierarchical relations. If your
- list of terms gets very long, there is a paging mechanism included with a page size of 50 terms.
- If you are having hierarchical vocabularies, all parent terms have a plus symbol, which
- means you can expand them to show their child terms. Use the minus symbol to collapse
- them again.
- In multiple hierarchies, if one term has more parents, the term gets shown under
- each of its parents.
-
- - Adding of terms
- For adding new term, click on the 'Add' Button. A fieldset containing some textfields expands.
- If you want to close this fieldset, click 'Cancel'.
- To insert a new term, fill in any textfield. Each textfield can only contain one term.
- You don't have to fill in all textfields, they can be left empty.
- Depending on your hierarchy settings, it's possible to insert terms and to directly assign
- a parent to them. If you want to do this, select a parent term in the tree view by marking
- the checkbox. If you have multiple hierarchies enabled, it's even possible to assign the
- new inserted terms to more parents at once by selecting more terms in the tree view.
-
- - Weight Editing
- Every term has a weight. This weight determines the position the terms get listed. If terms
- have the same weight, they are ordered alphabetically.
- If you want to change the weight, you have 3 ways to do that.
- 1st way: select the terms you want to move by one position (can be more terms at once) and press
- either the up or the down button in the toolbar. All saving is done automatically through
- AJAX.
- 2nd way: every term in tree view has a mouseover effect. When you move your mouse over a term, two
- small up and down arrows will appear. Click them to move this term by one
- position.
- 3rd way: click on the term, where you want to change the weight. A form for editing the
- term data appears on the right side of the tree view. At the bottom of this
- form, there is a select field, which shows the current weight. By changing the
- value, the tree view gets automatically reordered and the values are saved to the
- database through AJAX.
-
- - Deleting
- If you want to delete terms from the vocabulary, select them by marking the checkbox and click
- the 'Delete' button. A fieldset, where you have to confirm the deletion, expands.
- For hierarchical vocabularies (single or multi), the fieldset contains an option, which says:
- 'Delete children of selected, if there are any'. Check this if you want to delete all children
- of a selected parent term. Otherwise, if you are deleting the last parent of terms, the terms
- get added to root level.
-
- - Moving
- This operation is only available in hierarchical (single or multiple) vocabularies. It allows
- you to change hierarchies by moving terms from one parent to one other.
- Select all terms you want to move by marking the checkbox. Click the 'Move' button. A fieldset with
- some options expands.
- This fielset contains a autocomplete field, where you have to determine the parent term (under which
- the terms should be moved). If you want to move terms to the root level, leave this field empty.
- This autocomplete form allows you to either choose a parent term from the list of exisitng terms
- or to insert a new terms, which will be used as parent (this parent term will be added to the root
- level).
- In multiple hierarchical vocabularies, it's possible to move terms to more parents in one step by
- inserting more terms into the autocomplete field and separating them by commas. Additional, there
- appears an option ('Keep old parents and add new one'), which prevents the replacing of old parents.
-
- - Merging
- With the merging action, you can put terms with the same meaning together (e.g. your vocabulary
- contains: SoC, Summer of Code, GSoC, Google Summer of Code). All terms, that get merged into
- one other, get synonyms of resulting term (here called merged or main term). Additional
- all term-node association gets automatically updated (this means nodes, that had a merging term
- assigned, now get the resulting merged term instead). All merging terms are deleted afterwards.
- In the Taxonomy Manager, you can do that by selecting all terms you want to merge and to click
- the 'Merge' button. A fieldset with an autocomplete field an some options expands. In the
- autocomplete field you have to specify the resulting merged term (into which the selected get merged).
- The merged term can be either chosen from the list of existing terms or can be inserted automatically
- and used as merged term.
- Additional, there are some options available (they depend on the vocabulary settings). If you want
- to add any kind of relations (parents, children, related terms) from the merging terms to the
- resulting merged term, select one (or more) of them.
-
- The default taxonomy term page, which shows all assigned nodes, is overriden by the Taxonomy
- Manager, so that former merged terms can be considered (if someone calls a term, that was merged,
- it redirects to the resulting merged term).
-
- NOTE: At the moment, the Taxonomy Manager only cares about the term-node association inserted
- into the term_node table (by the taxonomy module). If you are using any CCK modules, like
- CCK Taxonomy or Content Taxonomy, which (can) save the term - node association in cck tables,
- don't use the Merging action, because changes are not handled.
- If you are using Views filters instead of the default taxonomy term page, merged terms are
- either respected.
- If you want to customize this by yourself or have some other module, you can use following
- function taxonomy_manager_merge_get_main_term($tid) for getting the main term id (if there
- is any main term, else return 0). The term merge history gets saved in the
- taxonomy_manager_merge table (main_tid, merged_tid) and gets additional cached, so that
- checking for a merged terms causes nearly no performance loss.
-
- - Editing term data
- If you want to edit or read some term properties, click on the term. A fieldset on the right side
- of the tree view gets loaded. This contains all term related information and can be edited. If you
- want to change the term name or the description, fill in any changes you want and click the saving
- symbol. All saving is done through AJAX, so no reload is necessary.
- Additional, this page contains listing of synonyms, related terms and parents (depends on your
- vocabulary settings).
- Every listed entry has an delete operation. By clicking the delete symbol, the relation gets deleted.
- In case of synonyms, the names get deleted from the database. If you are deleting a related term or a
- parent, this doesn't delete the term itself, only the relation.
- For adding new synonyms, the listing has a textfield below. Insert there any new synonym and click the
- plus symbol.
- For adding a new related term or a new parent (if multi hierarchy), there is a autocomplete field below
- the listing. Use this to insert new terms or to choose existing ones and assign them to the current term.
-
- - Using the search
- At the top of the page, there is a collapsed fieldset, called 'Search'. This search allows you to
- directly select an existing term for editing. Else, if your input doesn't match an existing term,
- the value will be used for filtering root level terms (this doesn't affect any child term).
-
-
-
-AUTHOR
-------
-Matthias Hutterer
-User: mh86 at drupal.org
-Email: m_hutterer at hotmail.com
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/css/taxonomy_manager.css b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/css/taxonomy_manager.css
deleted file mode 100755
index 1170712..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/css/taxonomy_manager.css
+++ /dev/null
@@ -1,466 +0,0 @@
-
-/**
- * Taxonomy Manager Tree formating
- */
-
-#taxonomy-manager-form {
- line-height: 120%;
-}
-
-#taxonomy-manager-double-tree-form fieldset,
-#taxonomy-manager-form fieldset {
- margin: 0.5em 0;
-}
-
-#taxonomy-manager-double-tree-form .left,
-#taxonomy-manager-form .left {
- margin-left: 0;
-}
-
-#taxonomy2-manager-tree-outer-div,
-#taxonomy-manager-tree-outer-div {
- height: 550px;
- overflow: auto;
- width: 46%;
-}
-
-#taxonomy2-manager-tree-outer-div fieldset,
-#taxonomy-manager-tree-outer-div fieldset {
- margin: 0;
- padding: 0 5px;
-}
-
-.taxonomy-manager-tree-size {
- padding: 0px;
- margin: 0px;
- /*height: 7px;*/
- text-align: right;
- display: inline;
-}
-
-.taxonomy-manager-tree-size img {
- cursor: pointer;
-}
-
-#taxonomy2-manager-tree-wrapper,
-#taxonomy-manager-tree-wrapper {
- margin-top: 0em;
-}
-
-/* address .treeview additional with #taxonomy-manager to make it compatible with the admin module */
-#taxonomy-manager .treeview,
-.treeview,
-.treeview ul {
- padding: 0;
- margin: 0;
- list-style: none;
-}
-
-#taxonomy-manager .treeview .form-item,
-.treeview .form-item {
- margin: 0;
- padding: 0;
- display: inline;
-}
-
-#taxonomy-manager .treeview li,
-.treeview li {
- margin: 0;
- padding: 0 0 0 15px;
-}
-
-#taxonomy-manager .hitArea,
-.hitArea {
- float: left;
- height: 15px;
- width: 15px;
- margin-left: -15px;
- cursor: pointer;
- _background: #fff;
- _filter: alpha(opacity=0);
- _display: inline;
-}
-
-#taxonomy-manager .treeview li,
-.treeview li {
- background: url(../images/tv-item.gif) 0 0 no-repeat;
-}
-#taxonomy-manager .treeview .collapsable,
-.treeview .collapsable {
- background-image: url(../images/tv-collapsable.gif);
-}
-#taxonomy-manager .treeview .expandable,
-.treeview .expandable {
- background-image: url(../images/tv-expandable.gif);
-}
-#taxonomy-manager .treeview .last,
-.treeview .last {
- background-image: url(../images/tv-item-last.gif);
-}
-#taxonomy-manager .treeview .lastCollapsable,
-.treeview .lastCollapsable {
- background-image: url(../images/tv-collapsable-last.gif);
-}
-#taxonomy-manager .treeview .lastExpandable,
-.treeview .lastExpandable {
- background-image: url(../images/tv-expandable-last.gif);
-}
-
-.term-line {
- display: inline;
-}
-
-.term-item {
- display: inline;
- padding-right: 5px;
-}
-
-.term-has-more-siblings {
- height: 38px;
- cursor: pointer;
-}
-
-.term-next-count {
- float: left;
- padding-top: 10px;
- color: #4ca108;
-}
-
-.term-downarrow-img {
-}
-
-.term-operations {
- display: inline;
- padding-left: 5px;
-}
-
-.term-operations span.select-all-children {
- text-decoration: none;
- width: 16px;
- height: 16px;
- background-repeat: no-repeat;
- background-image: url(../images/select-all-children.png);
-}
-.term-operations span.unselect-all-children {
- text-decoration: none;
- width: 16px;
- height: 16px;
- background-repeat: no-repeat;
- background-image: url(../images/unselect-all-children.png);
-}
-
-.term-operations img.term-up,
-.term-operations img.term-down,
-.term-operations span.select-all-children,
-.term-operations span.unselect-all-children,
-.term-operations a img {
- cursor: pointer;
- vertical-align: bottom;
-}
-
-.term-operations a:link,
-.term-operations a:visited,
-.term-operations a:hover,
-.term-operations a:active {
- text-decoration: none;
-}
-
-.highlightActiveTerm{
- background-color:#dddddd;
-}
-.highlightActiveTerm a{
- font-weight: bold;
-}
-
-#edit-taxonomy2-manager-top-language-wrapper,
-#edit-taxonomy-manager-top-language-wrapper {
- padding: 0;
- padding-right: 0.5em;
- margin: 0;
- text-align: right;
- display: inline;
-}
-#edit-taxonomy2-manager-top-language-wrapper label,
-#edit-taxonomy-manager-top-language-wrapper label {
- display: inline;
-}
-
-.taxonomy-manager-tree-top {
- text-align: right;
-}
-
-#taxonomy-manager-double-tree-operations {
- float: left;
- margin-left: 8px;
- margin-right: 8px;
- margin-top: 120px;
- display: inline;
-}
-
-.taxonomy-manager-double-tree-operations-buttons input {
- padding: 0;
- margin: 0;
-}
-
-#double-tree-msg {
- /*border: 2px solid #000000;
- padding: 6px;
- background: #FFFFE0; */
-}
-
-/**
- * Taxonomy Manger Toolbar
- */
-#taxonomy-manager-toolbar-throbber {
- float: right;
- margin: 0px;
- padding: 0px;
- height: 25px;
-}
-
-#taxonomy-manager-toolbar-buttons {
- float:left;
-}
-
-input.taxonomy-manager-buttons {
- border: thin solid;
- border-color: #cccccc #555555 #555555 #cccccc;
- background-color: #f2f2f2;
- background-repeat: no-repeat;
- background-position:3px;
- padding-left: 26px;
- padding-bottom: 3px;
- padding-right: 3px;
- height: 28px;
-}
-
-input.add {
- background-image: url(../images/list-add.png);
-}
-
-input#edit-weight-up {
- background-image: url(../images/go-up.png);
-}
-
-input#edit-weight-down {
- background-image: url(../images/go-down.png);
-}
-
-input.delete {
- background-image: url(../images/list-remove.png);
-}
-
-input.move {
- background-image: url(../images/move.png);
-}
-
-input.merge {
- background-image: url(../images/merge.png);
-}
-
-input.cancel {
- background-image: url(../images/dialog-cancel.png);
-}
-
-input.search {
- background-image: url(../images/edit-find.png);
-}
-
-input.export {
- background-image: url(../images/csv.png);
-}
-
-input.save {
- background-image: url(../images/document-save.png);
-}
-
-input.double-tree {
- background-image: url(../images/double-tree.png);
-}
-
-input.double-tree-disable {
- background-image: url(../images/double-tree-disable.png);
-}
-
-
-/**
- * Taxonomy Manager Search
- */
-#taxonomy-manager-search .fieldset-wrapper {
- overflow: visible; /*fixes hidden autocomplete result in FF*/
-}
-
-#edit-search-button {
- margin-top: 15px;
- margin-left: 10px;
- float: left;
-}
-
-#edit-find-field {
- float: left;
- line-height: 150%;
-}
-
-#edit-find-field .form-item {
- padding: 0;
- margin: 0;
-}
-
-
-/**
- * Term Data Form
- */
-
-#taxonomy-term-data fieldset {
- padding: 0.8em;
-}
-
-.term-data-overlay {
- position: absolute;
- left: 280px;
- top: 270px;
- width: 400px;
- z-index: 100;
- background: #FFFFFF;
-}
-
-.term-data-overlay fieldset {
- border-width: 6px;
- border-style: ridge;
-}
-
-.term-data-overlay legend {
- font-weight: bold;
- cursor: move;
- background-image: url(../images/move-small.png);
- background-repeat:no-repeat;
- background-position: 1px 4px;
- padding-left: 16px;
- line-height: 150%;
-}
-
-#term-data-close {
- padding: 0;
- margin: 0;
- text-align: right;
- line-height: 100%;
-
-}
-
-#term-data-close span {
- text-decoration: none;
- width: 16px;
- height: 16px;
- background-repeat: no-repeat;
- background-image: url(../images/dialog-cancel-small.png);
- cursor: pointer;
-}
-
-#term-data-close span:hover {
- background-image: url(../images/dialog-cancel-small-hover.png);
-}
-
-.term-data-autocomplete-add span {
- text-decoration: none;
- width: 22px;
- height: 22px;
- display:block;
- background-image: url(../images/list-add.png);
-}
-
-.term-data-autocomplete-add span:hover {
- text-decoration: none;
- background-image: url(../images/list-add-hover.png);
-}
-
-.taxonomy-term-data-operations span {
- text-decoration: none;
- width: 22px;
- height: 22px;
- display:block;
- background-image: url(../images/list-remove.png);
-}
-
-.taxonomy-term-data-operations span:hover {
- text-decoration: none;
- background-image: url(../images/list-remove-hover.png);
-}
-
-#taxonomy-term-data #edit-term-data-name-wrapper {
- margin-top: 0;
-}
-
-#taxonomy-term-data .resizable-textarea {
- width: 100%;
-}
-
-#taxonomy-term-data fieldset {
- margin-top: 0;
- padding-top: 0;
-}
-.taxonomy-term-data-operations {
- cursor: pointer;
-}
-
-.term-data-autocomplete {
- display: inline;
-}
-.term-data-autocomplete-add {
- display: inline;
- cursor: pointer;
-}
-.term-data-autocomplete-add img {
- vertical-align: bottom;
-}
-
-#edit-term-data-name {
- width: 100%;
-}
-
-#term-data-description {
- height: 130px;
-}
-
-#taxonomy-term-data .form-item {
- margin-bottom: 0.3em;
- margin-top: 0.3em;
-}
-
-#taxonomy-term-data table .form-item {
- margin-bottom: 0.2em;
-}
-
-#taxonomy-term-data table {
- margin-top: 0.5em;
- margin-bottom: 0em;
-}
-
-#taxonomy-term-data td, th {
- padding-top: 0.1em;
- padding-bottom: 0.1em;
- padding-left: 0.5em;
- padding-right: 0.5em;
-}
-
-#taxonomy-term-data .message,
-#taxonomy-term-data .messages {
- margin: 1px 0;
-}
-
-#edit-term-data-save {
- margin: 0.5em 0;
-}
-
-.clear {
- clear: both;
-}
-
-/**
- overwrites some css settings from the admin module, which break the layout of the taxonomy manager
-*/
-#taxonomy-manager div.form-item:after,
-#taxonomy-manager ul.links:after,
-#taxonomy-manager div.admin-panel .body:after,
-#taxonomy-manager .clear-block:after {
- display: inline;
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/2downarrow.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/2downarrow.png
deleted file mode 100644
index a644171..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/2downarrow.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/ajax-loader.gif b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/ajax-loader.gif
deleted file mode 100644
index 427a5da..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/ajax-loader.gif and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/connect.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/connect.png
deleted file mode 100644
index e2ed3c3..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/connect.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/csv.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/csv.png
deleted file mode 100644
index e795ffc..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/csv.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel-small-hover.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel-small-hover.png
deleted file mode 100644
index b5de2c5..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel-small-hover.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel-small.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel-small.png
deleted file mode 100644
index ed750bd..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel-small.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel.png
deleted file mode 100644
index 0629c50..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/dialog-cancel.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/document-save.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/document-save.png
deleted file mode 100644
index ad03079..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/document-save.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/double-tree-disable.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/double-tree-disable.png
deleted file mode 100644
index e18b89f..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/double-tree-disable.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/double-tree.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/double-tree.png
deleted file mode 100644
index 4445d2a..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/double-tree.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/edit-find.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/edit-find.png
deleted file mode 100644
index da3f826..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/edit-find.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-down-small.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-down-small.png
deleted file mode 100644
index f16fc28..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-down-small.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-down.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-down.png
deleted file mode 100644
index 2b76993..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-down.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-next.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-next.png
deleted file mode 100644
index 42ce6ac..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-next.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-previous.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-previous.png
deleted file mode 100644
index 976fd77..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-previous.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-up-small.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-up-small.png
deleted file mode 100644
index e9d0687..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-up-small.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-up.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-up.png
deleted file mode 100644
index 65b0d40..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/go-up.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/grippie.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/grippie.png
deleted file mode 100644
index 51a70a0..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/grippie.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/link-small.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/link-small.png
deleted file mode 100644
index b6c13cc..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/link-small.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-add-hover.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-add-hover.png
deleted file mode 100644
index 8acc062..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-add-hover.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-add.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-add.png
deleted file mode 100644
index 82498f8..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-add.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-remove-hover.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-remove-hover.png
deleted file mode 100644
index d205453..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-remove-hover.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-remove.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-remove.png
deleted file mode 100644
index 0120cf5..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/list-remove.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/merge.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/merge.png
deleted file mode 100644
index 08bad32..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/merge.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/move-small.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/move-small.png
deleted file mode 100644
index 65041a1..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/move-small.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/move.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/move.png
deleted file mode 100644
index 2aee07f..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/move.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/select-all-children.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/select-all-children.png
deleted file mode 100644
index 4b510a8..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/select-all-children.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-collapsable-last.gif b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-collapsable-last.gif
deleted file mode 100755
index 4acff93..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-collapsable-last.gif and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-collapsable.gif b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-collapsable.gif
deleted file mode 100755
index 857262f..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-collapsable.gif and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-expandable-last.gif b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-expandable-last.gif
deleted file mode 100755
index 1ede2de..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-expandable-last.gif and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-expandable.gif b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-expandable.gif
deleted file mode 100755
index 305d57f..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-expandable.gif and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-item-last.gif b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-item-last.gif
deleted file mode 100755
index 42a139a..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-item-last.gif and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-item.gif b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-item.gif
deleted file mode 100755
index 281e5dc..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/tv-item.gif and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/unselect-all-children.png b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/unselect-all-children.png
deleted file mode 100644
index dfab9a8..0000000
Binary files a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/images/unselect-all-children.png and /dev/null differ
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/csv_export.js b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/csv_export.js
deleted file mode 100644
index 23f4fa3..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/csv_export.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * CSV Export
- *
- * adds click event to export button and makes AJAX call to get the CSV data
- */
-
-Drupal.behaviors.TaxonomyManagerCSVExport = function(context) {
-
- if (!$('#taxonomy-manager-toolbar' + '.tm-csv-processed').size()) {
- $('#taxonomy-manager-toolbar').addClass('tm-csv-processed');
- var url = Drupal.settings.exportCSV['url'];
- var vid = Drupal.settings.taxonomytree['vid'];
-
- $("#edit-export-submit").click(function() {
- var area = $("#edit-export-csv");
- var param = new Object();
- param['delimiter'] = $("#edit-export-delimiter").val();
- param['depth'] = $("#edit-export-depth").val();
- param['option'] = $("#taxonomy_manager_export_options").find("input[type=radio][checked]").val();
- param['vid'] = vid;
- var tid = 0;
- $('.treeview').find("input[type=checkbox][checked]").each(function() {
- tid = Drupal.getTermId($(this).parents("li").eq(0));
- });
- param['tid'] = tid;
-
- $.post(url, param, function(data) {
- $(area).val(data);
- });
- return false;
- });
- }
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/doubleTree.js b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/doubleTree.js
deleted file mode 100644
index 09f18d2..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/doubleTree.js
+++ /dev/null
@@ -1,182 +0,0 @@
-
-/**
- * Double Tree Object
- */
-Drupal.DoubleTree = function(tree1, tree2) {
- this.leftTree = tree1;
- this.rightTree = tree2;
- this.selected_terms = new Array();
- this.selected_parents = new Array();
- this.direction = "left-to-right";
- this.updateWholeTree = false;
- this.url = Drupal.settings.DoubleTree['url'];
- this.param = new Object();
-
- this.attachOperations();
-}
-
-/**
- * attaches click events to the operations and collects selected terms
- */
-Drupal.DoubleTree.prototype.attachOperations = function() {
- var doubleTree = this;
- $('#taxonomy-manager-double-tree-operations :input').click(function() {
- doubleTree.selected_terms = new Array();
- doubleTree.selected_parents = new Array();
- doubleTree.param = new Object();
-
- var button_value = $(this).val();
- doubleTree.param['op'] = 'move';
-
- if (button_value == 'Move right' || button_value == "Switch right") {
- doubleTree.selected_terms = doubleTree.leftTree.getSelectedTerms();
- doubleTree.selected_parents = doubleTree.rightTree.getSelectedTerms();
- doubleTree.param['voc1'] = doubleTree.leftTree.vocId;
- doubleTree.param['voc2'] = doubleTree.rightTree.vocId;
- }
- else {
- doubleTree.direction = "right-to-left";
- doubleTree.selected_parents = doubleTree.leftTree.getSelectedTerms();
- doubleTree.selected_terms = doubleTree.rightTree.getSelectedTerms();
- doubleTree.param['voc1'] = doubleTree.rightTree.vocId;
- doubleTree.param['voc2'] = doubleTree.leftTree.vocId;
- }
-
- if (button_value == "translation") {
- doubleTree.param['op'] = 'translation';
- if (doubleTree.selected_terms.length != 1 || doubleTree.selected_parents.length != 1) {
- doubleTree.showMsg(Drupal.t("Select one term per tree to add a new translation."), "error");
- return false;
- }
- }
- else if (button_value == "Switch right" || button_value == "Switch left") {
- doubleTree.param['op'] = 'switch';
- doubleTree.updateWholeTree = true;
- }
-
- if (doubleTree.selected_terms.length == 0) {
- doubleTree.showMsg(Drupal.t("No terms selected."), "error");
- return false;
- }
- doubleTree.send();
- return false;
- });
-}
-
-/**
- * sends selected terms to the server and receives the response message
- */
-Drupal.DoubleTree.prototype.send = function() {
- var doubleTree = this;
-
- $(this.selected_parents).each(function() {
- var tid = Drupal.getTermId(this);
- doubleTree.param['selected_parents['+ tid +']'] = tid;
- });
-
- $(this.selected_terms).each(function() {
- var tid = Drupal.getTermId(this);
- doubleTree.param['selected_terms['+ tid +']'] = tid;
- var parentID = Drupal.getParentId(this);
- if (typeof(parentID) == "undefined") {
- doubleTree.updateWholeTree = true;
- }
- doubleTree.param['selected_terms_parent['+ tid +']'] = parentID;
- });
-
- $.ajax({
- data: doubleTree.param,
- type: "POST",
- url: this.url,
- dataType: 'json',
- success: function(response, status) {
- doubleTree.showMsg(response.data, response.type);
- if (response.type == "status" && (doubleTree.param['op'] == "move" || doubleTree.param['op'] == "switch")) {
- doubleTree.updateTrees();
- }
- }
- });
-}
-
-/**
- * updates both trees
- */
-Drupal.DoubleTree.prototype.updateTrees = function() {
- var doubleTree = this;
- if (this.selected_parents.length == 0 || this.updateWholeTree) {
- //selected terms might be moved to root level, so update whole tree
- var term_to_expand = Drupal.getTermId(this.selected_terms.shift());
- doubleTree.leftTree.loadRootForm(term_to_expand);
- doubleTree.rightTree.loadRootForm(term_to_expand);
- }
- else {
- //remove selected terms and update all parents
- var parents_to_update = new Object();
- $(this.selected_terms).each(function() {
- var parent_tid = Drupal.getParentId(this);
- parents_to_update[parent_tid] = parent_tid;
- });
- $(this.selected_parents).each(function() {
- var tid = Drupal.getTermId(this);
- parents_to_update[tid] = tid
- });
- for (var i in parents_to_update) {
- var tid = parents_to_update[i];
- doubleTree.updateTree(tid);
- }
- }
-}
-
-/**
- * shows response msg from ajax request
- */
-Drupal.DoubleTree.prototype.showMsg = function(msg, type) {
- var msg_box = '#double-tree-msg';
- $(msg_box).remove();
- $('#taxonomy-manager').before('<div id="double-tree-msg" class="messages '+ type +'">'+ msg +' <a href="">Close</a></div>');
- $(msg_box).find("a").click(function() {
- $(this).parent().remove();
- return false;
- });
-}
-
-/**
- * helper function to update a tree node for a given term id
- */
-Drupal.DoubleTree.prototype.updateTree = function(tid) {
- var doubleTree = this;
- var left_li = this.leftTree.getLi(tid);
- var right_li = this.rightTree.getLi(tid);
-
- this.leftTree.loadChildForm(left_li, true, function(li, tree) {
- doubleTree.updateLi(li, tree);
- });
- this.rightTree.loadChildForm(right_li, true, function(li, tree) {
- doubleTree.updateLi(li, tree);
- });
-}
-
-/**
- * fixes displaying of li node after loading child form
- */
-Drupal.DoubleTree.prototype.updateLi = function(li, tree) {
- var children = $(li).children("ul");
- if (children.text() == "") {
- $(li).attr("class", "");
- $(li).children("div.hitArea").remove();
- }
- else if ($(li).hasClass("expandable") || $(li).hasClass("lastExpandable")) {
- $(children).hide();
- }
- else if (!$(li).hasClass("collapsable") && !$(li).hasClass("lastCollapsable")) {
- $(li).prepend('<div class="hitArea" />');
- $(li).addClass("collapsable");
- $(li).removeClass("last");
- $(li).children("div.hitArea").click(function() {
- tree.toggleTree(li);
- tree.loadChildForm(li);
- });
- }
-}
-
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/hideForm.js b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/hideForm.js
deleted file mode 100644
index e650e1e..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/hideForm.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id: hideForm.js,v 1.2.2.1.2.6.2.2 2009/07/29 08:30:54 mh86 Exp $
-
-/**
- * @file shows / hides form elements
- */
-
-Drupal.behaviors.TaxonomyManagerHideForm = function(context) {
- var settings = Drupal.settings.hideForm || [];
- if (settings['div']) {
- if (!$('#taxonomy-manager-toolbar' + '.tm-hideForm-processed').size()) {
- $('#taxonomy-manager-toolbar').addClass('tm-hideForm-processed');
- if (!(settings['div'] instanceof Array)) {
- Drupal.attachHideForm(settings['div'], settings['show_button'], settings['hide_button']);
- }
- else {
- for (var i=0; i<settings['div'].length; i++) {
- Drupal.attachHideForm(settings['div'][i], settings['show_button'][i], settings['hide_button'][i]);
- }
- }
- }
- }
-}
-
-/**
- * adds click events to show / hide button
- */
-Drupal.attachHideForm = function(div, show_button, hide_button) {
- var hide = true;
- div = $("#"+ div);
- show_button = $("#"+ show_button);
- hide_button = $("#"+ hide_button);
-
- //don't hide if there is an error in the form
- $(div).find("input").each(function() {
- if($.className.has(this, "error")) {
- hide = false;
- }
- });
-
- if (!hide) {
- $(div).show();
- }
-
- $(show_button).click(function() {
- $(div).toggle();
- return false;
- });
-
- $(hide_button).click(function() {
- $(div).hide();
- return false;
- });
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/termData.js b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/termData.js
deleted file mode 100644
index 55739bc..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/termData.js
+++ /dev/null
@@ -1,291 +0,0 @@
-// $Id: termData.js,v 1.1.2.3.2.8.2.13 2010/01/30 16:37:29 mh86 Exp $
-
-/**
- * @file js support for term editing form for ajax saving and tree updating
- */
-
-//global var that holds the current term link object
-var active_term = new Object();
-
-//holds tree objects, useful in double tree interface, when both trees needs to be updated
-var trees = new Object();
-
-/**
- * attaches term data form, used after 'Saves changes' ahah submit
- */
-Drupal.behaviors.TaxonomyManagerTermData = function(context) {
- if (!$('#taxonomy-manager-toolbar' + '.tm-termData-processed').size()) {
- var vid = $('#edit-term-data-vid').val();
- for (var id in trees) {
- var tree = trees[id];
- if (tree.vocId == vid) {
- Drupal.attachTermDataForm(tree);
- break;
- }
- }
- }
-}
-
-/**
- * attaches Term Data functionality, called by tree.js
- */
-Drupal.attachTermData = function(ul, tree) {
- trees[tree.treeId] = tree;
- Drupal.attachTermDataLinks(ul, tree);
-
- if (!$('#taxonomy-manager-toolbar' + '.tm-termData-processed').size()) {
- Drupal.attachTermDataForm(tree);
- }
-}
-
-/**
- * adds click events to the term links in the tree structure
- */
-Drupal.attachTermDataLinks = function(ul, tree) {
- $(ul).find('a.term-data-link').click(function() {
- Drupal.activeTermSwapHighlight(this);
- var li = $(this).parents("li");
- var termdata = new Drupal.TermData(Drupal.getTermId(li), this.href +'/true', li, tree);
- termdata.load();
- return false;
- });
-}
-
-/**
-* hightlights current term
-*/
-Drupal.activeTermSwapHighlight = function(link) {
- try {
- $(active_term).parent().removeClass('highlightActiveTerm');
- } catch(e) {}
- active_term = link;
- $(active_term).parent().addClass('highlightActiveTerm');
-}
-
-/**
- * attaches click events to next siblings
- */
-Drupal.attachTermDataToSiblings = function(all, currentIndex, tree) {
- var nextSiblings = $(all).slice(currentIndex);
- $(nextSiblings).find('a.term-data-link').click(function() {
- var li = $(this).parents("li");
- var termdata = new Drupal.TermData(Drupal.getTermId(li), this.href +'/true', li, tree);
- termdata.load();
- return false;
- });
-}
-
-/**
- * adds click events to term data form, which is already open, when page gets loaded
- */
-Drupal.attachTermDataForm = function(tree) {
- $('#taxonomy-manager-toolbar').addClass('tm-termData-processed');
- var tid = $('#edit-term-data-tid').val();
- if (tid) {
- var li = tree.getLi(tid);
- var termLink = $(li).children("div.term-line").find("a.term-data-link");
- Drupal.activeTermSwapHighlight(termLink);
- var url = Drupal.settings.termData['term_url'] +'/'+ tid +'/true';
- var termdata = new Drupal.TermData(tid, url, li, tree);
- termdata.form();
- }
-}
-
-/**
- * TermData Object
- */
-Drupal.TermData = function(tid, href, li, tree) {
- this.href = href;
- this.tid = tid;
- this.li = li;
- this.tree = tree
- this.form_build_id = tree.form_build_id;
- this.form_id = tree.form_id;
- this.vid = tree.vocId;
- this.div = $('#taxonomy-term-data');
-}
-
-
-/**
- * loads ahah form from given link and displays it on the right side
- */
-Drupal.TermData.prototype.load = function() {
- var url = this.href;
- var termdata = this;
- var param = new Object();
- param['form_build_id'] = this.form_build_id;
- param['form_id'] = this.form_id;
-
- $.get(url, param, function(data) {
- termdata.insertForm(data);
- });
-}
-
-/**
- * inserts received html data into form wrapper
- */
-Drupal.TermData.prototype.insertForm = function(data) {
- $(this.div).html(data);
- this.form();
-}
-
-/**
- * adds events to possible operations
- */
-Drupal.TermData.prototype.form = function() {
- var termdata = this;
- this.param = new Object();
-
- try {
- Drupal.behaviors.textarea(this.div);
- Drupal.behaviors.autocomplete(this.div);
- Drupal.behaviors.ahah(this.div);
- } catch(e) {} //autocomplete or textarea js not added to page
-
- this.param['tid'] = this.tid;
- this.param['vid'] = this.vid;
-
- $(this.div).find('div.term-data-autocomplete-add > span').click(function() {
- termdata.param['attr_type'] = $(this).attr("class");
- termdata.param['value'] = $(this).parents("tr").find('input:text').attr('value');
- termdata.param['op'] = 'add';
- $('#taxonomy-term-data-fieldset :input').each(function() {
- termdata.param[$(this).attr('id')] = $(this).attr('value');
- });
- termdata.send();
- });
-
- $(this.div).find('td.taxonomy-term-data-operations > span').click(function() {
- termdata.param['attr_type'] = $(this).attr("class");
- termdata.param['info'] = $(this).attr("id");
- var value = $(this).parent().siblings(".taxonomy-term-data-name").attr("id");
- termdata.param['value'] = value.substring(5);
- termdata.param['op'] = 'delete';
- $('#taxonomy-term-data-fieldset :input').each(function() {
- termdata.param[$(this).attr('id')] = $(this).attr('value');
- });
- termdata.send();
- });
-
- $(this.div).find('#edit-term-data-weight').change(function() {
- termdata.param['value'] = this.value;
- termdata.param['attr_type'] = 'weight';
- termdata.param['op'] = 'update';
- termdata.send();
- });
-
- $(this.div).find('#edit-term-data-language').change(function() {
- termdata.param['value'] = this.value;
- termdata.param['attr_type'] = 'language';
- termdata.param['op'] = 'update';
- termdata.send();
- });
-
- $(this.div).find('#edit-term-data-save').click(function() {
- $('#taxonomy-manager-toolbar').removeClass("tm-termData-processed");
- termdata.param['value'] = $('#edit-term-data-name').attr('value');
- termdata.updateTermName();
- });
-
- $(this.div).find('#term-data-close span').click(function() {
- termdata.div.children().hide();
- });
-
- $(this.div).find('a.taxonomy-term-data-name-link').click(function() {
- var url = this.href;
- var tid = url.split("/").pop();
- var li = termdata.tree.getLi(tid);
- termdata.tree.loadRootForm(tid);
- termdata_new = new Drupal.TermData(tid, this.href +'/true', li, termdata.tree);
- termdata_new.load();
- return false;
- });
-
- $(this.div).find("legend").each(function() {
- var staticOffsetX, staticOffsetY = null;
- var left, top = 0;
- var div = termdata.div;
- var pos = $(div).position();
- $(this).mousedown(startDrag);
-
- function startDrag(e) {
- if (staticOffsetX == null && staticOffsetY == null) {
- staticOffsetX = e.pageX;
- staticOffsetY = e.pageY;
- }
- $(document).mousemove(performDrag).mouseup(endDrag);
- return false;
- }
-
- function performDrag(e) {
- left = e.pageX - staticOffsetX;
- top = e.pageY - staticOffsetY;
- $(div).css({position: "absolute", "left": pos.left + left +"px", "top": pos.top + top +"px"});
- return false;
- }
-
- function endDrag(e) {
- $(document).unbind("mousemove", performDrag).unbind("mouseup", endDrag);
- }
- });
-}
-
-/**
- * sends updated data through param
- */
-Drupal.TermData.prototype.send = function() {
- var termdata = this;
- var url= Drupal.settings.termData['url'];
- if (this.param['value'] != '' && this.param['attr_type'] != '') {
- $.ajax({
- data: termdata.param,
- type: "POST",
- url: url,
- dataType: 'json',
- success: function(response, status) {
- termdata.update();
- termdata.insertForm(response.data);
- }
- });
- }
-}
-
-/**
- * updates term data form and if necessary tree structure
- */
-Drupal.TermData.prototype.update = function() {
- for (var id in trees) {
- var tree = trees[id];
- if (tree.vocId == this.vid) {
- this.updateTree(tree);
- }
- }
-}
-
-Drupal.TermData.prototype.updateTree = function(tree) {
- if (this.param['attr_type'] == 'parent' || (this.param['attr_type'] == 'related' && this.param['op'] == 'add') || (this.param['attr_type'] == 'language' && this.param['op'] == 'update')) {
- tree.loadRootForm(this.tid);
- }
- else if (this.param['attr_type'] == 'weight') {
- var parentLi = $(this.li).parents("li");
- if ($(parentLi).is("li")) {
- tree.loadChildForm(parentLi, true);
- }
- else {
- //no parent li --> root level terms
- //load whole Tree
- tree.loadRootForm(this.tid);
- }
- }
-}
-
-/**
- * updates term name in tree structure
- */
-Drupal.TermData.prototype.updateTermName = function() {
- var name = Drupal.checkPlain(this.param['value']);
- $('fieldset#taxonomy-term-data-fieldset legend').html(name);
- $('ul.treeview li input:hidden[class=term-id][value='+ this.tid +']')
- .siblings('div.form-item')
- .find('label.option a').html(name);
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/tree.js b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/tree.js
deleted file mode 100755
index 2b4de94..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/tree.js
+++ /dev/null
@@ -1,453 +0,0 @@
-// $Id: tree.js,v 1.4.2.4.2.9.2.13 2009/08/10 13:47:45 mh86 Exp $
-
-/**
- * @files js for collapsible tree view with some helper functions for updating tree structure
- */
-
-Drupal.behaviors.TaxonomyManagerTree = function(context) {
- var settings = Drupal.settings.taxonomytree || [];
- var id, vid;
- if (settings['id']) {
- if (!(settings['id'] instanceof Array)) {
- id = settings['id'];
- vid = settings['vid'];
- if (!$('#'+ id + '.tm-processed').size()) {
- new Drupal.TaxonomyManagerTree(id, vid);
- }
- }
- else {
- var trees = new Array(settings['id'].length);
- for (var i = 0; i < settings['id'].length; i++) {
- id = settings['id'][i];
- vid = settings['vid'][i];
- if (!$('#'+ id + '.tm-processed').size()) {
- trees[i] = new Drupal.TaxonomyManagerTree(id, vid);
- }
- }
- if (trees.length == 2) {
- var doubleTreeSettings = Drupal.settings.DoubleTree || [];
- if (doubleTreeSettings['enabled']) {
- new Drupal.DoubleTree(trees[0], trees[1]);
- }
- }
- }
- }
-
- //only add throbber for TM sites
- var throbberSettings = Drupal.settings.TMAjaxThrobber || [];
- if (throbberSettings['add']) {
- if (!$('#taxonomy-manager-toolbar' + '.tm-processed').size()) {
- $('#taxonomy-manager-toolbar').addClass('tm-processed');
- Drupal.attachThrobber();
- Drupal.attachResizeableTreeDiv();
- }
- }
-}
-
-
-Drupal.TaxonomyManagerTree = function(id, vid) {
- this.div = $("#"+ id);
- this.ul = $(this.div).children();
-
- this.form = $(this.div).parents('form');
- this.form_build_id = $(this.form).children().children(':input[name="form_build_id"]').val();
- this.form_id = $(this.form).children().children(' :input[name="form_id"]').val();
- this.language = this.getLanguage();
- this.treeId = id;
- this.vocId = vid;
-
- this.attachTreeview(this.ul);
- this.attachSiblingsForm(this.ul);
- this.attachSelectAllChildren(this.ul);
- this.attachLanguageSelector();
-
- //attach term data js, if enabled
- var term_data_settings = Drupal.settings.termData || [];
- if (term_data_settings['url']) {
- Drupal.attachTermData(this.ul, this);
- }
-
- $(this.div).addClass("tm-processed");
-}
-
-/**
- * adds collapsible treeview to a given list
- */
-Drupal.TaxonomyManagerTree.prototype.attachTreeview = function(ul, currentIndex) {
- var tree = this;
- if (currentIndex) {
- ul = $(ul).slice(currentIndex);
- }
- var expandableParent = $(ul).find("div.hitArea");
- $(expandableParent).click(function() {
- var li = $(this).parent();
- tree.toggleTree(li);
- tree.loadChildForm(li);
- });
- $(expandableParent).parent("li.expandable, li.lastExpandable").children("ul").hide();
-}
-
-/**
- * toggles a collapsible/expandable tree element by swaping classes
- */
-Drupal.TaxonomyManagerTree.prototype.toggleTree = function(node) {
- $(node).children("ul").toggle();
- this.swapClasses(node, "expandable", "collapsable");
- this.swapClasses(node, "lastExpandable", "lastCollapsable");
-}
-
-/**
- * helper function for swapping two classes
- */
-Drupal.TaxonomyManagerTree.prototype.swapClasses = function(node, c1, c2) {
- if ($(node).hasClass(c1)) {
- $(node).removeClass(c1).addClass(c2);
- }
- else if ($(node).hasClass(c2)) {
- $(node).removeClass(c2).addClass(c1);
- }
-}
-
-
-/**
- * loads child terms and appends html to list
- * adds treeview, weighting etc. js to inserted child list
- */
-Drupal.TaxonomyManagerTree.prototype.loadChildForm = function(li, update, callback) {
- var tree = this;
- if ($(li).is(".has-children") || update == true) {
- $(li).removeClass("has-children");
- if (update) {
- $(li).children("ul").remove();
- }
- var parentId = Drupal.getTermId(li);
- if (!(Drupal.settings.childForm['url'] instanceof Array)) {
- url = Drupal.settings.childForm['url'];
- }
- else {
- url = Drupal.settings.childForm['url'][0];
- }
- url += '/'+ this.treeId +'/'+ this.vocId +'/'+ parentId;
- var param = new Object();
- param['form_build_id'] = this.form_build_id;
- param['form_id'] = this.form_id;
- param['tree_id'] = this.treeId;
- param['language'] = this.language;
-
- $.get(url, param, function(data) {
- $(li).append(data);
- var ul = $(li).children("ul");
- tree.attachTreeview(ul);
- tree.attachSiblingsForm(ul);
- tree.attachSelectAllChildren(ul);
-
- //only attach other features if enabled!
- var weight_settings = Drupal.settings.updateWeight || [];
- if (weight_settings['up']) {
- Drupal.attachUpdateWeightTerms(li);
- }
- var term_data_settings = Drupal.settings.termData || [];
- if (term_data_settings['url']) {
- Drupal.attachTermDataLinks(ul, tree);
- }
-
- if (typeof(callback) == "function") {
- callback(li, tree);
- }
- });
- }
-}
-
-/**
- * function for reloading root tree elements
- */
-Drupal.TaxonomyManagerTree.prototype.loadRootForm = function(tid) {
- if (!(Drupal.settings.childForm['url'] instanceof Array)) {
- url = Drupal.settings.childForm['url'];
- }
- else {
- url = Drupal.settings.childForm['url'][0];
- }
- var tree = this;
- url += '/'+ this.treeId +'/'+ this.vocId +'/0/'+ tid;
-
- var param = new Object();
- param['form_build_id'] = this.form_build_id;
- param['form_id'] = this.form_id;
- param['tree_id'] = this.treeId;
- param['language'] = this.language;
-
- $.get(url, param, function(data) {
- $('#'+ tree.treeId).html(data);
- var ul = $('#'+ tree.treeId).children("ul");
- tree.attachTreeview(ul);
- tree.attachSiblingsForm(ul);
- tree.attachSelectAllChildren(ul);
- Drupal.attachUpdateWeightTerms(ul);
- Drupal.attachTermDataLinks(ul, tree);
- if (tid) {
- var termLink = $("#"+ tree.treeId).find(":input[value="+ tid +"]").parent().find("a.term-data-link");
- Drupal.activeTermSwapHighlight(termLink);
- }
-
- var lang = $('#edit-'+ tree.treeId +'-language').val();
- if (lang != "" && lang != tree.langauge) {
- $(tree.div).parent().siblings("div.taxonomy-manager-tree-top").find("select.language-selector option[value="+ lang +"]").attr("selected", "selected");
- }
- });
-}
-
-
-/**
- * adds link for loading next siblings terms, when click terms get loaded through ahah
- * adds all needed js like treeview, weightning, etc.. to new added terms
- */
-Drupal.TaxonomyManagerTree.prototype.attachSiblingsForm = function(ul) {
- var tree = this;
- if (!(Drupal.settings.siblingsForm['url'] instanceof Array)) {
- url = Drupal.settings.siblingsForm['url'];
- }
- else {
- url = Drupal.settings.siblingsForm['url'][0];
- }
- var list = "li.has-more-siblings div.term-has-more-siblings";
- if (ul) {
- list = $(ul).find(list);
- }
-
- $(list).bind('click', function() {
- $(this).unbind("click");
- var li = this.parentNode.parentNode;
- var all = $('li', li.parentNode);
- var currentIndex = all.index(li);
-
- var page = Drupal.getPage(li);
- var prev_id = Drupal.getTermId(li);
- var parentId = Drupal.getParentId(li);
-
- url += '/'+ tree.treeId +'/'+ page +'/'+ prev_id +'/'+ parentId;
-
- var param = new Object();
- param['form_build_id'] = tree.form_build_id;
- param['form_id'] = tree.form_id;
- param['tree_id'] = tree.treeId;
- param['language'] = tree.language;
-
- $.get(url, param, function(data) {
- $(list).remove();
- $(li).after(data);
- tree.attachTreeview($('li', li.parentNode), currentIndex);
- tree.attachSelectAllChildren($('li', li.parentNode), currentIndex);
-
- //only attach other features if enabled!
- var weight_settings = Drupal.settings.updateWeight || [];
- if (weight_settings['up']) {
- Drupal.attachUpdateWeightTerms($('li', li.parentNode), currentIndex);
- }
- var term_data_settings = Drupal.settings.termData || [];
- if (term_data_settings['url']) {
- Drupal.attachTermDataToSiblings($('li', li.parentNode), currentIndex, tree);
- }
-
- $(li).removeClass("last").removeClass("has-more-siblings");
- $(li).children().children('.term-operations').hide();
- tree.swapClasses(li, "lastExpandable", "expandable");
- tree.attachSiblingsForm($(li).parent());
- });
- });
-}
-
-
-/**
- * helper function for getting out the current page
- */
-Drupal.getPage = function(li) {
- return $(li).find("input:hidden[class=page]").attr("value");
-}
-
-
-/**
- * returns terms id of a given list element
- */
-Drupal.getTermId = function(li) {
- return $(li).children().children("input:hidden[class=term-id]").attr("value");
-}
-
-/**
- * return term id of a prent of a given list element
- * if no parent exists (root level), returns 0
- */
-Drupal.getParentId = function(li) {
- var parentId;
- try {
- var parentLi = $(li).parent("ul").parent("li");
- parentId = Drupal.getTermId(parentLi);
- } catch(e) {
- return 0;
- }
- return parentId;
-}
-
-/**
- * update classes for tree view, if list elements get swaped
- */
-Drupal.updateTree = function(upTerm, downTerm) {
- if ($(upTerm).is(".last")) {
- $(upTerm).removeClass("last");
- Drupal.updateTreeDownTerm(downTerm);
- }
- else if ($(upTerm).is(".lastExpandable")) {
- $(upTerm).removeClass("lastExpandable").addClass("expandable");
- Drupal.updateTreeDownTerm(downTerm);
- }
- else if ($(upTerm).is(".lastCollapsable")) {
- $(upTerm).removeClass("lastCollapsable").addClass("collapsable");
- Drupal.updateTreeDownTerm(downTerm);
- }
-}
-
-/**
- * update classes for tree view for a list element moved downwards
- */
-Drupal.updateTreeDownTerm = function(downTerm) {
- if ($(downTerm).is(".expandable")) {
- $(downTerm).removeClass("expandable").addClass("lastExpandable");
- }
- else if ($(downTerm).is(".collapsable")) {
- $(downTerm).removeClass("collapsable").addClass("lastCollapsable");
- }
- else {
- $(downTerm).addClass("last");
- }
-}
-
-/**
- * Adds button next to parent term to select all available child checkboxes
- */
-Drupal.TaxonomyManagerTree.prototype.attachSelectAllChildren = function(parent, currentIndex) {
- var tree = this;
- if (currentIndex) {
- parent = $(parent).slice(currentIndex);
- }
- $(parent).find('span.select-all-children').click(function() {
- tree.SelectAllChildrenToggle(this);
- });
-}
-
-/**
- * (un-)selects nested checkboxes
- */
-Drupal.TaxonomyManagerTree.prototype.SelectAllChildrenToggle = function(span) {
- var tree = this;
- if ($(span).hasClass("select-all-children")) {
- var li = $(span).parents("li:first");
- if ($(li).hasClass("has-children")) {
- this.loadChildForm(li, true, function(li, tree1) {
- tree.swapClasses(li, "expandable", "collapsable");
- tree.swapClasses(li, "lastExpandable", "lastCollapsable");
- var this_span = $(li).find('span.select-all-children:first');
- tree.SelectAllChildrenToggle(this_span);
- return;
- });
- }
- else {
- $(span).removeClass("select-all-children").addClass("unselect-all-children");
- $(span).attr("title", Drupal.t("Unselect all children"));
- $(span).parents("li:first").find('ul:first').each(function() {
- var first_element = $(this).find('.term-line:first');
- $(first_element).parent().siblings("li").find('div.term-line:first :checkbox').attr('checked', true);
- $(first_element).find(' :checkbox').attr('checked', true);
- });
- }
- }
- else {
- $(span).removeClass("unselect-all-children").addClass("select-all-children");
- $(span).parents(".term-line").siblings("ul").find(':checkbox').attr("checked", false);
- $(span).attr("title", Drupal.t("Select all children"));
- }
-}
-
-/**
- * language selector
- */
-Drupal.TaxonomyManagerTree.prototype.attachLanguageSelector = function() {
- var tree = this;
- var selector = $(tree.div).parent().siblings("div.taxonomy-manager-tree-top").find("select.language-selector");
- $(selector).not(".selector-processed").change(function() {
- tree.language = $(this).val();
- tree.loadRootForm();
- });
- $(selector).addClass("selector-processed");
-
-}
-Drupal.TaxonomyManagerTree.prototype.getLanguage = function() {
- var lang = $('#edit-taxonomy-manager-top-language').val();
- if (typeof(lang) == "undefined") {
- return "";
- }
- return lang;
-}
-
-/**
- * return array of selected terms
- */
-Drupal.TaxonomyManagerTree.prototype.getSelectedTerms = function() {
- var terms = new Array();
- $(this.div).find("input[type=checkbox][checked]").each(function() {
- var term = $(this).parents("li").eq(0);
- terms.push(term);
- });
- return terms;
-}
-
-/**
- * returns li node for a given term id, if it exists in the tree
- */
-Drupal.TaxonomyManagerTree.prototype.getLi = function(termId) {
- return $(this.div).find("input:hidden[class=term-id][value="+ termId +"]").parent().parent();
-}
-
-/**
- * attaches a throbber element to the taxonomy manager
- */
-Drupal.attachThrobber = function() {
- var div = $('#taxonomy-manager');
- var throbber = $('<img src="'+ Drupal.settings.taxonomy_manager['modulePath'] +'images/ajax-loader.gif" alt="" height="25">');
- throbber.appendTo("#taxonomy-manager-toolbar-throbber").hide();
- throbber.ajaxStart(function(){
- $(this).show();
- $(div).css('opacity', '0.5');
- })
- .ajaxStop(function(){
- $(this).hide();
- $(div).css('opacity', '1');
- });
-}
-
-/**
-* makes the div resizeable
-*/
-Drupal.attachResizeableTreeDiv = function() {
- $('img.div-grippie').each(function() {
- var staticOffset = null;
- var div = $(this).parents("fieldset").parent();
- $(this).mousedown(startDrag);
-
- function startDrag(e) {
- staticOffset = div.width() - e.pageX;
- div.css('opacity', 0.5);
- $(document).mousemove(performDrag).mouseup(endDrag);
- return false;
- }
-
- function performDrag(e) {
- div.width(Math.max(200, staticOffset + e.pageX) + 'px');
- return false;
- }
-
- function endDrag(e) {
- $(document).unbind("mousemove", performDrag).unbind("mouseup", endDrag);
- div.css('opacity', 1);
- }
- });
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/updateWeight.js b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/updateWeight.js
deleted file mode 100644
index 66b914b..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/js/updateWeight.js
+++ /dev/null
@@ -1,233 +0,0 @@
-// $Id: updateWeight.js,v 1.2.2.1.2.7.2.2 2009/07/30 13:30:27 mh86 Exp $
-
-/**
- * @file js for changing weights of terms with Up and Down arrows
- */
-
-//object to store weights (tid => weight)
-var weights = new Object();
-
-Drupal.behaviors.TaxonomyManagerWeights = function(context) {
- var settings = Drupal.settings.updateWeight || [];
- if (!$('#taxonomy-manager-toolbar' + '.tm-weights-processed').size()) {
- $('#taxonomy-manager-toolbar').addClass('tm-weights-processed');
- Drupal.attachUpdateWeightToolbar(settings['up'], settings['down']);
- Drupal.attachUpdateWeightTerms();
- }
-}
-
-/**
- * adds click events for Up and Down buttons in the toolbar, which
- * allow the moving of selected (can be more) terms
- */
-Drupal.attachUpdateWeightToolbar = function(upButton, downButton) {
- var selected;
- var url = Drupal.settings.updateWeight['url'];
-
- $('#'+ upButton).click(function() {
- selected = Drupal.getSelectedTerms();
- for (var i=0; i < selected.length; i++) {
- var upTerm = selected[i];
- var downTerm = $(upTerm).prev();
-
- Drupal.orderTerms(upTerm, downTerm);
- }
- if (selected.length > 0) {
- $.post(url, weights);
- }
- });
-
-
- $('#'+ downButton).click(function() {
- selected = Drupal.getSelectedTerms();
- for (var i=selected.length-1; i >= 0; i--) {
- var downTerm = selected[i];
- var upTerm = $(downTerm).next();
-
- Drupal.orderTerms(upTerm, downTerm);
- }
- if (selected.length > 0) {
- $.post(url, weights);
- }
- });
-}
-
-/**
- * adds small up and down arrows to each term
- * arrows get displayed on mouseover
- */
-Drupal.attachUpdateWeightTerms = function(parent, currentIndex) {
- var settings = Drupal.settings.updateWeight || [];
- var disable = settings['disable_mouseover'];
-
- if (!disable) {
- var url = Drupal.settings.updateWeight['url'];
-
- var termLineClass = 'div.term-line';
- var termUpClass = 'img.term-up';
- var termDownClass = 'img.term-down';
-
- if (parent && currentIndex) {
- parent = $(parent).slice(currentIndex);
- }
- if (parent) {
- termLineClass = $(parent).find(termLineClass);
- termUpClass = $(parent).find(termUpClass);
- termDownClass = $(parent).find(termDownClass);
- }
-
- $(termLineClass).mouseover(function() {
- $(this).find('div.term-operations').show();
- });
-
- $(termLineClass).mouseout(function() {
- $(this).find('div.term-operations').hide();
- });
-
- $(termUpClass).click(function() {
- var upTerm = $(this).parents("li").eq(0);
- var downTerm = $(upTerm).prev();
-
- Drupal.orderTerms(upTerm, downTerm);
- $.post(url, weights);
-
- $(downTerm).find(termLineClass).unbind('mouseover');
- setTimeout(function() {
- $(upTerm).find('div.term-operations').hide();
- $(downTerm).find(termLineClass).mouseover(function() {
- $(this).find('div.term-operations').show();
- });
- }, 1500);
-
- });
-
-
- $(termDownClass).click(function() {
- var downTerm = $(this).parents("li").eq(0);
- var upTerm = $(downTerm).next();
-
- Drupal.orderTerms(upTerm, downTerm);
- $.post(url, weights);
-
- $(upTerm).find(termLineClass).unbind('mouseover');
- setTimeout(function() {
- $(downTerm).find('div.term-operations').hide();
- $(upTerm).find(termLineClass).mouseover(function() {
- $(this).find('div.term-operations').show();
- });
- }, 1500);
-
- });
- }
-
-}
-
-/**
- * return array of selected terms
- */
-Drupal.getSelectedTerms = function() {
- var terms = new Array();
- $('.treeview').find("input[type=checkbox][checked]").each(function() {
- var term = $(this).parents("li").eq(0);
- terms.push(term);
- });
-
- return terms;
-}
-
-/**
- * reorders terms
- * - swap list elements in DOM
- * - post updated weights to callback in php
- * - update classes of tree view
- */
-Drupal.orderTerms = function(upTerm, downTerm) {
- try {
- Drupal.getTermId(upTerm);
- Drupal.swapTerms(upTerm, downTerm);
- Drupal.swapWeights(upTerm, downTerm);
- Drupal.updateTree(upTerm, downTerm);
- } catch(e) {
- //no next item, because term to update is last child, continue
- }
-}
-
-/**
- * simple swap of two elements
- */
-Drupal.swapTerms = function(upTerm, downTerm) {
- $(upTerm).after(downTerm);
- $(downTerm).before(upTerm);
-}
-
-/**
- * updating weights of swaped terms
- * if two terms have different weights, then weights are being swapped
- * else, if both have same weights, upTerm gets decreased
- *
- * if prev/next siblings of up/down terms have same weights as current
- * swapped, they have to be updated by de/increasing weight (by 1) to ensure
- * unique position of swapped terms
- */
-Drupal.swapWeights = function(upTerm, downTerm) {
- var upWeight = Drupal.getWeight(upTerm);
- var downWeight = Drupal.getWeight(downTerm);
- var downTid = Drupal.getTermId(downTerm);
- var upTid = Drupal.getTermId(upTerm);
-
- //same weight, decrease upTerm
- if (upWeight == downWeight) {
- weights[upTid] = --upWeight;
- }
- //different weights, swap
- else {
- weights[upTid] = downWeight;
- weights[downTid] = upWeight;
- }
-
- //update prev siblings if necessary
- try {
- if (Drupal.getWeight($(upTerm).prev()) >= upWeight) {
- $(upTerm).prevAll().each(function() {
- var id = Drupal.getTermId(this);
- var weight = Drupal.getWeight(this);
- weights[id] = --weight;
- });
- }
- } catch(e) {
- //no prev
- }
-
- //update next siblings if necessary
- try {
- if (Drupal.getWeight($(downTerm).next()) <= downWeight) {
- $(downTerm).nextAll().each(function() {
- var id = Drupal.getTermId(this);
- var weight = Drupal.getWeight(this);
- weights[id] = ++weight;
- });
- }
- } catch(e) {
- //no next
- }
-
-}
-
-/**
- * helper to return weight of a term
- */
-Drupal.getWeight = function(li) {
- var id = Drupal.getTermId(li);
- var weight;
-
- if (weights[id] != null) {
- weight = weights[id];
- }
- else {
- weight = $(li).find("input:hidden[class=weight-form]").attr("value");
- }
-
- return weight;
-}
-
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.admin.inc b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.admin.inc
deleted file mode 100644
index 3d67e01..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.admin.inc
+++ /dev/null
@@ -1,2582 +0,0 @@
-<?php
-// $Id: taxonomy_manager.admin.inc,v 1.1.2.17.2.33 2010/01/31 17:47:27 mh86 Exp $
-
-/**
- *
- * @file
- * Taxonomy Manager Admin
- *
- * contains all forms and saving function for the Taxonomy Manager
- *
- */
-
-/**
- * list of vocabularies, which link to Taxonomy Manager interface
- */
-function taxonomy_manager_voc_list() {
- $output = l(t('Add new vocabulary'), 'admin/content/taxonomy/add/vocabulary') .' | ';
- $output .= l(t('Edit vocabulary settings'), 'admin/content/taxonomy') .'<br /><br />';
-
- $vocabularies = taxonomy_get_vocabularies();
- $voc_list = array();
-
- foreach ($vocabularies as $vocabulary) {
- $voc_list[] = l($vocabulary->name, 'admin/content/taxonomy_manager/voc/'. $vocabulary->vid);
- }
- if (!count($voc_list)) {
- $voc_list[] = t('No Vocabularies available');
- }
- $output .= theme('item_list', $voc_list, t("Vocabularies:"));
- return $output;
-}
-
-/**
- * defines forms for taxonomy manager interface
- *
- * @param $vid vocabulary id
- * @param $tid a term id, if not 0, displays term editing from for given tid on right side
- * @param $search_string a string to filter root level terms
- */
-function taxonomy_manager_form(&$form_state, $vid, $tid = 0, $filter = NULL) {
- // Check for confirmation forms.
- if (isset($form_state['confirm_delete'])) {
- return taxonomy_manager_term_confirm_delete($form_state, $vid);
- }
-
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
- drupal_add_css($module_path .'css/taxonomy_manager.css');
- drupal_add_js($module_path .'js/hideForm.js');
- drupal_add_js($module_path .'js/updateWeight.js');
- drupal_add_js($module_path .'js/termData.js');
-
- drupal_add_js(array('termData' => array('url' => url("admin/content/taxonomy_manager/termdata/edit/". $vid), 'tid' => $tid, 'term_url' => url('admin/content/taxonomy_manager/termdata/'. $vid))), 'setting'); //TODO check if values necessary and correct
-
- drupal_add_js(array('updateWeight' => array('up' => 'edit-weight-up', 'down' => 'edit-weight-down', 'url' => url('admin/content/taxonomy_manager/weight/'), 'disable_mouseover' => variable_get('taxonomy_manager_disable_mouseover', 0))), 'setting');
- drupal_add_js(array('TMAjaxThrobber' => array('add' => TRUE)), 'setting');
- drupal_add_js(array('taxonomy_manager' => array('modulePath' => (url($module_path) == $module_path) ? $module_path : (base_path() . $module_path))), 'setting');
-
- $form = array();
-
- $voc = taxonomy_vocabulary_load($vid);
-
- drupal_set_title(t("Taxonomy Manager - %voc_name", array("%voc_name" => $voc->name)));
-
- if (!is_numeric($voc->vid)) {
- $text = t('No vocabulary with this ID available! Check this <a href="!list">list</a> for available vocabularies or <a href="!create">create</a> a new one', array('!list' => url('admin/content/taxonomy_manager'), '!create' => url('admin/content/taxonomy/add/vocabulary')));
- $form['text'] = array(
- '#value' => $text,
- );
- return $form;
- }
-
- $form['vid'] = array('#type' => 'value', "#value" => $vid);
-
- if (_taxonomy_manager_voc_is_empty($vid)) {
- $text = t('No terms available');
- $form['text'] = array(
- '#value' => $text,
- );
- $form += taxonomy_manager_add_form($voc, FALSE);
- return $form;
- }
-
- $form['#cache'] = TRUE;
-
- $form['taxonomy']['#tree'] = TRUE;
-
- $form['taxonomy']['manager'] = array(
- '#type' => 'fieldset',
- '#title' => check_plain($voc->name),
- '#weight' => 10,
- '#tree' => TRUE,
- );
-
- $form['taxonomy']['manager']['top'] = array(
- '#value' => '',
- '#prefix' => '<div class="taxonomy-manager-tree-top">',
- '#suffix' => '</div>',
- );
-
- if (module_exists('i18ntaxonomy')) {
- if (i18ntaxonomy_vocabulary($vid) == I18N_TAXONOMY_TRANSLATE) {
- if ($tid) {
- $language = _taxonomy_manager_term_get_lang($tid);
- }
- else {
- $lang = language_default();
- $language = $lang->language;
- }
- $form['taxonomy']['manager']['top']['language'] = array(
- '#type' => 'select',
- '#title' => t('Language'),
- '#default_value' => $language,
- '#options' => array('' => t('All'), 'no language' => t('no language')) + locale_language_list('name'),
- '#attributes' => array('class' => 'language-selector'),
- );
- }
- }
-
- $form['taxonomy']['manager']['top']['size'] = array('#value' => '<div class="taxonomy-manager-tree-size">'. theme("image", $module_path ."images/grippie.png", t("Resize tree"), t("Resize tree"), array('class' => "div-grippie")) .'</div>');
-
- $form['taxonomy']['manager']['tree'] = array(
- '#type' => 'taxonomy_manager_tree',
- '#vid' => $vid,
- '#pager' => TRUE,
- '#search_string' => ($tid) ? NULL : $filter,
- '#language' => isset($language) ? $language : '',
- '#term_to_expand' => $tid,
- );
-
- $search_description = t("You can search directly for exisiting terms.
- If your input doesn't match an existing term, it will be used for filtering root level terms (useful for non-hierarchical vocabularies).");
-
- $form['search'] = array(
- '#type' => 'fieldset',
- '#attributes' => array('id' => 'taxonomy-manager-search'),
- '#title' => t('Search'),
- '#description' => $search_description,
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#tree' => TRUE,
- );
-
- $form['search']['field'] = array(
- '#type' => 'textfield',
- '#title' => t('Search String'),
- '#autocomplete_path' => 'taxonomy_manager/autocomplete/'. $voc->vid,
- '#prefix' => '<div id="edit-find-field">',
- '#suffix' => '</div>',
- );
-
- $form['search']['button'] = array(
- '#type' => 'submit',
- '#attributes' => array('class' => 'taxonomy-manager-buttons search'),
- '#value' => t('Search'),
- '#suffix' => '<div class="clear"></div>',
- );
- $search_options = array(
- 'synonyms' => t('Include synonyms'),
- 'subtrees' => t('Search under selected terms'),
- );
- if (module_exists('i18ntaxonomy')) {
- if (i18ntaxonomy_vocabulary($vid) == I18N_TAXONOMY_TRANSLATE) {
- $search_options['language'] = t('Search within selected language');
- }
- }
- $form['search']['options'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Search options'),
- '#options' => $search_options,
- );
-
- $form['toolbar'] = array(
- '#type' => 'fieldset',
- '#title' => t('Toolbar'),
- '#attributes' => array('id' => 'taxonomy-manager-toolbar'),
- );
-
- $form['toolbar']['weight_up'] = array(
- '#type' => 'button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons'),
- '#value' => t('Up'),
- '#theme' => 'no_submit_button',
- '#prefix' => '<div id="taxonomy-manager-toolbar-buttons">',
- );
-
- $form['toolbar']['weight-down'] = array(
- '#type' => 'button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons'),
- '#value' => t('Down'),
- '#theme' => 'no_submit_button',
- );
-
- $form['toolbar']['delete_confirm'] = array(
- '#type' => 'button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons delete'),
- '#value' => t('Delete'),
- '#theme' => 'no_submit_button',
- /*'#ahah' => array(
- 'path' => 'admin/content/taxonomy_manager/toolbar/form',
- 'method' => 'replace',
- 'event' => 'click',
- 'wrapper' => 'taxonomy-manager-toolbar-forms',
- 'progress' => array(),
- ),*/
- );
-
- $form['toolbar']['add_show'] = array(
- '#type' => 'button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons add'),
- '#value' => t('Add'),
- '#theme' => 'no_submit_button',
- );
-
- $form['toolbar']['move_show'] = array(
- '#type' => 'button',
- '#value' => t('Move'),
- '#attributes' => array('class' => 'taxonomy-manager-buttons move'),
- '#theme' => 'no_submit_button',
- );
-
- $form['toolbar']['merge_show'] = array(
- '#type' => 'button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons merge'),
- '#value' => t('Merge'),
- '#theme' => 'no_submit_button',
- );
-
- $form['toolbar']['export_show'] = array(
- '#type' => 'button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons export'),
- '#value' => t('CSV Export'),
- '#theme' => 'no_submit_button',
- );
- $form['toolbar']['double_tree_show'] = array(
- '#type' => 'button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons double-tree'),
- '#value' => t('Double Tree'),
- '#theme' => 'no_submit_button',
- );
-
- $form['toolbar']['wrapper'] = array(
- '#type' => 'markup',
- '#value' => '<div id="taxonomy-manager-toolbar-throbber"></div><div class="clear"></div>',
- '#weight' => 20,
- '#prefix' => '</div>',
- );
- $form['toolbar_forms_wrapper'] = array(
- '#type' => 'markup',
- '#value' => '<div id="taxonomy-manager-toolbar-forms"></div>',
- );
-
-
- $form += taxonomy_manager_add_form($voc);
-
- $form += taxonomy_manager_merge_form($voc);
-
- $form += taxonomy_manager_move_form($voc);
-
- $form += taxonomy_manager_confirm_delete($voc);
-
- $form += taxonomy_manager_export_form($voc);
-
- $form += taxonomy_manager_double_tree_settings_form($voc);
-
- if ($tid) {
- $form += taxonomy_manager_form_term_data($tid);
- }
- else {
- $form['term_data'] = array('#tree' => TRUE);
- }
-
- // add save button for term_data already to the form array,
- // but do not render (see theme_taxonomy_manager_form) if not needed
- // otherwise an #ahah callback on dynamically added forms makes problems
- $form['term_data']['save'] = array(
- '#type' => 'submit',
- '#value' => t('Save changes'),
- '#submit' => array(''),
- '#attributes' => array('class' => 'taxonomy-manager-buttons save'),
- '#ahah' => array(
- 'path' => 'admin/content/taxonomy_manager/termdata/edit',
- 'method' => 'replace',
- 'event' => 'click',
- 'wrapper' => 'taxonomy-term-data',
- 'progress' => array('type' => ''),
- ),
- '#weight' => 20,
- );
-
-
- return $form;
-}
-
-function taxonomy_manager_double_tree_form(&$form_state, $vid1, $vid2, $tid = 0, $filter = NULL) {
- // Check for confirmation forms.
- if (isset($form_state['confirm_delete'])) {
- return taxonomy_manager_term_confirm_delete($form_state, $vid1, $vid2);
- }
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
-
- $form = taxonomy_manager_form($form_state, $vid1, $tid, $filter);
-
- drupal_add_js(array('DoubleTree' => array('enabled' => TRUE, 'url' => url('admin/content/taxonomy_manager/double-tree/edit'))), 'setting');
- drupal_add_js($module_path .'js/doubleTree.js');
-
- $form['disable'] = array(
- '#value' => l(t('Disable Double Tree'), 'admin/content/taxonomy_manager/voc/'. $vid1),
- '#weight' => -100,
- );
-
- $voc2 = taxonomy_vocabulary_load($vid2);
- $form['vid2'] = array('#type' => 'value', "#value" => $vid2);
-
- $form['taxonomy2'] = array(
- '#tree' => TRUE,
- );
-
- $form['taxonomy2']['manager'] = array(
- '#type' => 'fieldset',
- '#title' => check_plain($voc2->name),
- '#weight' => 10,
- '#tree' => TRUE,
- );
-
- $form['taxonomy2']['manager']['top'] = array(
- '#value' => '',
- '#prefix' => '<div class="taxonomy-manager-tree-top">',
- '#suffix' => '</div>',
- );
-
- if (module_exists('i18ntaxonomy')) {
- if (i18ntaxonomy_vocabulary($vid2) == I18N_TAXONOMY_TRANSLATE) {
- if ($tid) {
- $language = _taxonomy_manager_term_get_lang($tid);
- }
- else {
- $lang = language_default();
- $language = $lang->language;
- }
- $form['taxonomy2']['manager']['top']['language'] = array(
- '#type' => 'select',
- '#title' => t('Language'),
- '#default_value' => $language,
- '#options' => array('' => t('All'), 'no language' => t('no language')) + locale_language_list('name'),
- '#attributes' => array('class' => 'language-selector'),
- );
- }
- }
-
- $form['taxonomy2']['manager']['top']['size'] = array('#value' => '<div class="taxonomy-manager-tree-size">'. theme("image", $module_path ."images/grippie.png", t("Resize tree"), t("Resize tree"), array('class' => "div-grippie")) .'</div>');
-
- $form['taxonomy2']['manager']['tree'] = array(
- '#type' => 'taxonomy_manager_tree',
- '#vid' => $vid2,
- '#pager' => TRUE,
- '#search_string' => ($tid) ? NULL : $filter,
- '#language' => isset($language) ? $language : '',
- '#term_to_expand' => $tid,
- );
-
- $form['double-tree']['operations'] = array(
- '#tree' => TRUE,
- );
- $form['double-tree']['operations']['move_right'] = array(
- '#type' => 'image_button',
- '#value' => 'Move right',
- '#attributes' => array('title' => t('Move right')),
- '#src' => $module_path ."images/go-next.png",
- //'#executes_submit_callback' => FALSE,
- '#prefix' => '<div class="taxonomy-manager-double-tree-operations-buttons">',
- '#suffix' => '</div>',
- );
- $form['double-tree']['operations']['move_left'] = array(
- '#type' => 'image_button',
- '#value' => 'Move left',
- '#attributes' => array('title' => t('Move left')),
- '#src' => $module_path ."images/go-previous.png",
- //'#executes_submit_callback' => FALSE,
- '#prefix' => '<div class="taxonomy-manager-double-tree-operations-buttons">',
- '#suffix' => '</div>',
- );
- //switch operations
- if ($vid1 != $vid2) {
- $form['double-tree']['operations']['move_right']['#value'] = 'Switch right';
- $form['double-tree']['operations']['move_right']['#attributes']['title'] = t('Switch selected terms and its children to the right voc');
- $form['double-tree']['operations']['move_left']['#value'] = 'Switch left';
- $form['double-tree']['operations']['move_left']['#attributes']['title'] = t('Switch selected terms and its children to the left voc');
- }
- else if (isset($language)) {
- $form['double-tree']['operations']['add_translation'] = array(
- '#type' => 'image_button',
- '#value' => 'translation',
- '#attributes' => array('title' => t('Add Translation')),
- '#src' => $module_path ."images/connect.png",
- //'#executes_submit_callback' => FALSE,
- '#prefix' => '<div class="taxonomy-manager-double-tree-operations-buttons">',
- '#suffix' => '</div>',
- );
- }
-
- return $form;
-}
-
-function taxonomy_manager_toolbar_forms() {
- /*$params = $_GET;
- $form = array();
- $form_state = array('submitted' => FALSE);
- $form = form_get_cache($params['form_build_id'], $form_state);
-
- $form += taxonomy_manager_confirm_delete($form['vid']);
- $form = form_builder($param['form_id'], $form, $form_state);
- drupal_prepare_form($param['form_id'], $form, $form_state);
- $form = form_builder($param['form_id'], $form, $form_state);
- form_set_cache($params['form_build_id'], $form, $form_state);
-
- $output = drupal_render($form['delete']);
-
-
- print drupal_to_js(array('status' => TRUE, 'data' => $output));
- exit;*/
-}
-
-/**
- * confirmation form for deleting selected terms
- */
-function taxonomy_manager_confirm_delete($voc) {
- drupal_add_js(array('hideForm' => array(
- 'show_button' => 'edit-delete-confirm',
- 'hide_button' => 'edit-delete-cancel',
- 'div' => 'del-confirm-form')), 'setting');
-
- $form = array();
-
- $form['delete'] = array(
- '#type' => 'fieldset',
- '#attributes' => array('id' => 'del-confirm-form', 'style' => 'display:none;'),
- '#tree' => TRUE,
- '#title' => t('Confirmation'),
- );
-
- $question = t('Are you sure you want to delete all selected terms? ');
- $info = t('Remember all term specific data will be lost. This action cannot be undone.');
-
- $form['delete']['text'] = array('#value' => "<b>". $question ."</b><br/>". $info);
-
- $options = array(
- 'delete_orphans' => t('Delete children of selected terms, if there are any'),
- );
-
- $form['delete']['options'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Options'),
- '#options' => $options,
- );
-
- $form['delete']['delete'] = array(
- '#type' => 'submit',
- '#value' => t('Delete'),
- '#attributes' => array('class' => 'taxonomy-manager-buttons delete'),
- '#submit' => array('taxonomy_manager_form_delete_submit'),
- '#validate' => array('taxonomy_manager_form_delete_validate'),
- );
-
- $form['delete']['cancel'] = array(
- '#type' => 'button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons cancel'),
- '#value' => t('Cancel'),
- '#theme' => 'no_submit_button',
- );
-
- return $form;
-}
-
-/**
- * form for adding terms
- */
-function taxonomy_manager_add_form($voc, $hide_form = TRUE) {
- if ($hide_form) {
- drupal_add_js(array('hideForm' => array(
- 'show_button' => 'edit-add-show',
- 'hide_button' => 'edit-add-cancel',
- 'div' => 'add-form')), 'setting');
- $attributes = array('id' => 'add-form', 'style' => 'display:none;');
- }
- else {
- $attributes = array('id' => 'add-form');
- }
-
- $form = array();
-
- $description = "";
- $description = t("If you have selected one or more terms in the tree view, the new terms are automatically children of those.");
-
- $form['add'] = array(
- '#type' => 'fieldset',
- '#tree' => TRUE,
- '#attributes' => $attributes,
- '#title' => t('Add new terms'),
- '#description' => $description,
- );
-
- for ($i=0; $i<6; $i++) {
- $form['add']['term'][$i] = array(
- '#type' => 'textfield',
- );
- }
- $form['add']['mass'] = array(
- '#type' => 'fieldset',
- '#tree' => TRUE,
- '#title' => t('Mass term import (with textarea)'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
- $form['add']['mass']['mass_add'] = array(
- '#type' => 'textarea',
- '#title' => t('Terms'),
- '#description' => t('One term per line'),
- '#rows' => 10,
- );
- $form['add']['add'] = array(
- '#type' => 'submit',
- '#attributes' => array('class' => 'taxonomy-manager-buttons add'),
- '#value' => t('Add'),
- '#validate' => array('taxonomy_manager_form_add_validate'),
- '#submit' => array('taxonomy_manager_form_add_submit'),
- );
- $form['add']['cancel'] = array(
- '#type' => 'button',
- '#value' => t('Cancel'),
- '#theme' => 'no_submit_button',
- '#attributes' => array('class' => 'taxonomy-manager-buttons cancel'),
- );
-
- return $form;
-
-}
-
-
-/**
- * form for merging terms
- */
-function taxonomy_manager_merge_form($voc) {
- drupal_add_js(array('hideForm' => array(
- 'show_button' => 'edit-merge-show',
- 'hide_button' => 'edit-merge-cancel',
- 'div' => 'merge-form')), 'setting');
-
- $form = array();
-
- $description .= t("The selected terms get merged into one term.
- This resulting merged term can either be an exisiting term or a completely new term.
- The selected terms will automatically get synomyms of the merged term and will be deleted afterwards.");
-
- $form['merge'] = array(
- '#type' => 'fieldset',
- '#tree' => TRUE,
- '#attributes' => array('id' => 'merge-form', 'style' => 'display:none;'),
- '#title' => t('Merging of terms'),
- '#description' => $description,
- );
-
- $form['merge']['main_term'] = array(
- '#type' => 'textfield',
- '#title' => t('Resulting merged term'),
- '#description' => t("Enter a unique term name or a term id with 'term-id:[tid]'"),
- '#required' => FALSE,
- '#autocomplete_path' => 'taxonomy_manager/autocomplete/'. $voc->vid,
- );
-
- $options = array();
-
- $options['collect_parents'] = t('Collect all parents of selected terms an add it to the merged term');
- $options['collect_children'] = t('Collect all children of selected terms an add it to the merged term');
- $options['collect_relations'] = t('Collect all relations of selected terms an add it to the merged term');
-
- if (count($options) > 0) {
- $form['merge']['options'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Options'),
- '#options' => $options,
- );
- }
-
- $form['merge']['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Merge'),
- '#attributes' => array('class' => 'taxonomy-manager-buttons merge'),
- '#validate' => array('taxonomy_manager_form_merge_validate'),
- '#submit' => array('taxonomy_manager_form_merge_submit'),
- );
-
- $form['merge']['cancel'] = array(
- '#type' => 'button',
- '#value' => t('Cancel'),
- '#attributes' => array('class' => 'taxonomy-manager-buttons cancel'),
- '#theme' => 'no_submit_button',
- );
-
- return $form;
-}
-
-/**
- * form for moving terms in hierarchies
- */
-function taxonomy_manager_move_form($voc) {
- drupal_add_js(array('hideForm' => array(
- 'show_button' => 'edit-move-show',
- 'hide_button' => 'edit-move-cancel',
- 'div' => 'move-form')), 'setting');
-
- $form = array();
-
- $description = t("You can change the parent of one or more selected terms.
- If you leave the autocomplete field empty, the term will be a root term.");
-
- $form['move'] = array(
- '#type' => 'fieldset',
- '#tree' => TRUE,
- '#attributes' => array('id' => 'move-form', 'style' => 'display:none;'),
- '#title' => t('Moving of terms'),
- '#description' => $description,
- );
-
- $form['move']['parents'] = array(
- '#type' => 'textfield',
- '#title' => t('Parent term(s)'),
- '#description' => t("Enter a unique term name or a term id with 'term-id:[tid]'. Separate multiple parent terms with commas."),
- '#required' => FALSE,
- '#autocomplete_path' => 'taxonomy_manager/autocomplete/'. $voc->vid,
- );
-
- $options = array();
- $options['keep_old_parents'] = t('Keep old parents and add new ones (multi-parent). Otherwise old parents get replaced.');
- $form['move']['options'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Options'),
- '#options' => $options,
- );
-
- $form['move']['submit'] = array(
- '#type' => 'submit',
- '#attributes' => array('class' => 'taxonomy-manager-buttons move'),
- '#value' => t('Move'),
- '#validate' => array('taxonomy_manager_form_move_validate'),
- '#submit' => array('taxonomy_manager_form_move_submit'),
- );
-
- $form['move']['cancel'] = array(
- '#type' => 'button',
- '#value' => t('Cancel'),
- '#attributes' => array('class' => 'taxonomy-manager-buttons cancel'),
- '#theme' => 'no_submit_button',
- );
-
- return $form;
-}
-
-/**
- * form for exporting terms
- */
-function taxonomy_manager_export_form($voc) {
- drupal_add_js(array('hideForm' => array(
- 'show_button' => 'edit-export-show',
- 'hide_button' => 'edit-export-cancel',
- 'div' => 'export-form')), 'setting');
-
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
- drupal_add_js($module_path .'js/csv_export.js');
-
- drupal_add_js(array('exportCSV' => array('url' => url("admin/content/taxonomy_manager/export"))), 'setting');
-
- $form = array();
-
- $form['export'] = array(
- '#type' => 'fieldset',
- '#tree' => TRUE,
- '#attributes' => array('id' => 'export-form', 'style' => 'display:none;'),
- '#title' => t('CSV Export'),
- '#description' => $description,
- );
-
-
- $form['export']['delimiter'] = array(
- '#type' => 'textfield',
- '#title' => t('Delimiter for CSV File'),
- '#required' => FALSE,
- '#default_value' => ";",
- );
-
- $options['whole_voc'] = t('Whole Vocabulary');
- $options['children'] = t('Child terms of a selected term');
- $options['root_terms'] = t('Root level terms only');
-
- $form['export']['options'] = array(
- '#type' => 'radios',
- '#title' => t('Terms to export'),
- '#options' => $options,
- '#default_value' => 'whole_voc',
- '#prefix' => '<div id="taxonomy_manager_export_options">',
- '#suffix' => '</div>',
- );
-
- $form['export']['depth'] = array(
- '#type' => 'textfield',
- '#title' => t('Depth of tree'),
- '#description' => t('The number of levels of the tree to export. Leave empty to return all levels.'),
- );
-
- $form['export']['csv'] = array(
- '#type' => 'textarea',
- '#title' => t('Exported CSV'),
- '#description' => t('The generated code will appear here (per AJAX). You can copy and paste the code into a .csv file. The csv has following columns: voc id | term id | term name | description | parent id 1 | ... | parent id n'),
- '#rows' => 8,
- );
-
- $form['export']['submit'] = array(
- '#type' => 'submit',
- '#attributes' => array('class' => 'taxonomy-manager-buttons export'),
- '#value' => t('Export now'),
- '#theme' => 'no_submit_button',
- );
-
- $form['export']['cancel'] = array(
- '#type' => 'button',
- '#value' => t('Cancel'),
- '#attributes' => array('class' => 'taxonomy-manager-buttons cancel'),
- '#theme' => 'no_submit_button',
- );
-
- return $form;
-}
-
-function taxonomy_manager_double_tree_settings_form($voc) {
- drupal_add_js(array('hideForm' => array(
- 'show_button' => 'edit-double-tree-show',
- 'hide_button' => 'edit-double-tree-cancel',
- 'div' => 'double-tree-settings-form')), 'setting');
-
- $form = array();
-
- $form['double_tree'] = array(
- '#type' => 'fieldset',
- '#tree' => TRUE,
- '#attributes' => array('id' => 'double-tree-settings-form', 'style' => 'display:none;'),
- '#title' => t('Double Tree Settings'),
- '#description' => t('Specify settings for second tree. Choose the same vocabulary if you want to move terms in the hierarchy or if you want to add new translations within a multilingual vocabulary. Choose a different vocabulary if you want to switch terms among these vocabularies.'),
- );
-
- $options = array();
- $vocs = taxonomy_get_vocabularies();
- foreach ($vocs as $v) {
- $options[$v->vid] = $v->name;
- }
- $form['double_tree']['voc2'] = array(
- '#type' => 'select',
- '#title' => t('Vocabulary for second tree'),
- '#options' => $options,
- '#default_value' => $voc->vid,
- );
-
- $form['double_tree']['submit'] = array(
- '#type' => 'submit',
- '#attributes' => array('class' => 'taxonomy-manager-buttons double-tree'),
- '#value' => t('Enable Double Tree'),
- '#submit' => array('taxonomy_manager_form_double_tree_submit'),
- );
- if (arg(3) == "double-tree") {
- $form['double_tree']['disable'] = array(
- '#type' => 'submit',
- '#attributes' => array('class' => 'taxonomy-manager-buttons double-tree-disable'),
- '#value' => t('Disable Double Tree'),
- '#submit' => array('taxonomy_manager_form_double_tree_disable_submit'),
- );
- }
- $form['double_tree']['cancel'] = array(
- '#type' => 'button',
- '#value' => t('Cancel'),
- '#attributes' => array('class' => 'taxonomy-manager-buttons cancel'),
- '#theme' => 'no_submit_button',
- );
-
- return $form;
-}
-
-/**
- * menu callback for displaying term data form
- *
- * if this function gets called by ahah, then the term data form gets
- * generated, rendered and return
- * otherwise, if no ahah call, redirect to original form with $vid and $tid as parameters
- *
- * @param $vid
- * @param $tid
- * @param $ahah if true, return rendered form, else redirect
- */
-function taxonomy_manager_update_term_data_form($vid, $tid, $ahah = FALSE, $print = TRUE, $msg = "", $is_error_msg = FALSE) {
- if (!$ahah) {
- drupal_goto('admin/content/taxonomy_manager/voc/'. $vid .'/'. $tid);
- }
- $GLOBALS['devel_shutdown'] = FALSE; //prevent devel queries footprint
-
- $params = $_GET;
-
- //actually we don not need do use the caching because the saving only happens through a AJAX callback
- //and it's a bit faster, cache loading, form building and cache saving needs some time else.
- /*$form_state = array('submitted' => FALSE);
- $form = form_get_cache($params['form_build_id'], $form_state);
- unset($form['term_data']);
- $form = form_builder($param['form_id'], $form, $form_state);*/
-
- $term_form = taxonomy_manager_form_term_data($tid);
- $term_form['term_data']['save'] = array(
- '#type' => 'submit',
- '#value' => t('Save changes'),
- '#submit' => array(''),
- '#attributes' => array('class' => 'taxonomy-manager-buttons save'),
- '#ahah' => array(
- 'path' => 'admin/content/taxonomy_manager/termdata/edit',
- 'method' => 'replace',
- 'event' => 'click',
- 'wrapper' => 'taxonomy-term-data',
- 'progress' => array('type' => ''),
- ),
- '#weight' => 20,
- );
- if ($msg != "") {
- $term_form['term_data']['msg'] = array(
- '#type' => 'markup',
- '#prefix' => '<div class="messages status">',
- '#suffix' => '</div>',
- '#value' => $msg,
- '#weight' => -20,
- );
- if ($is_error_msg) {
- $term_form['term_data']['msg']['#value'] = t("Error! Your last operation couldn't be performed because of following problem:") ." ". $msg;
- $term_form['term_data']['msg']['#prefix'] = '<div class="message error">';
- }
- }
- $form = $term_form;
-
- drupal_prepare_form('taxonomy_manager_form', $form, $form_state);
- $form = form_builder('taxonomy_manager_form', $form, $form_state);
- //form_set_cache($params['form_build_id'], $form, $form_state);
-
- $output = drupal_render($form['term_data']);
-
- if ($print) {
- print $output;
- exit();
- }
- return $output;
-}
-
-/**
- * term data editing form
- *
- * @param $tid
- */
-function taxonomy_manager_form_term_data($tid) {
- $term = taxonomy_get_term($tid);
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
- $vocabulary = taxonomy_vocabulary_load($term->vid);
-
- //prevent that title of the fieldset is too long
- $title = $term->name;
- if (drupal_strlen($title) >= 33) {
- $title = drupal_substr($title, 0, 33) ."...";
- }
- $title .= " (". $term->tid .")";
- $title = check_plain($title);
-
- $form['term_data'] = array(
- '#type' => 'fieldset',
- '#title' => $title,
- '#attributes' => array('id' => 'taxonomy-term-data-fieldset'),
- '#tree' => TRUE,
- );
-
- $form['term_data']['close'] = array(
- '#value' => '<div id="term-data-close"><span title="'. t('Close') .'"> </span></div>',
- '#weight' => -100,
- );
-
- $form['term_data']['tid'] = array('#type' => 'hidden', '#value' => $tid);
-
- $form['term_data']['name'] = array(
- '#type' => 'textfield',
- '#title' => t('Name'),
- '#default_value' => $term->name,
- '#size' => 35,
- '#maxlength' => 255,
- '#required' => TRUE,
- '#weight' => -20,
- );
-
- $form['term_data']['description'] = array(
- '#type' => 'textarea',
- '#title' => t('Description'),
- '#default_value' => $term->description,
- '#cols' => 35,
- '#rows' => 3,
- );
-
- $synonyms = taxonomy_get_synonyms($term->tid);
- asort($synonyms);
- $form['term_data']['synonyms'] = _taxonomy_manager_form_term_data_lists($term, $synonyms, t('Synonyms'), 'synonym', FALSE);
- $form['term_data']['synonyms']['#tree'] = TRUE;
- $form['term_data']['synonyms']['#weight'] = '50';
-
- $form['term_data']['relations'] = _taxonomy_manager_form_term_data_lists($term, taxonomy_get_related($term->tid), t('Relations'), 'related');
- $form['term_data']['relations']['#tree'] = TRUE;
- $form['term_data']['relations']['#weight'] = '51';
-
- $parents = taxonomy_get_parents($term->tid);
- $form['term_data']['parents'] = _taxonomy_manager_form_term_data_lists($term, $parents, t('Parents'), 'parent', TRUE);
- $form['term_data']['parents']['#tree'] = TRUE;
- $form['term_data']['parents']['#weight'] = '52';
-
- if (module_exists('i18ntaxonomy')) {
- if (i18ntaxonomy_vocabulary($term->vid) == I18N_TAXONOMY_TRANSLATE) {
- $translations = i18ntaxonomy_term_get_translations(array('tid' => $term->tid), FALSE);
- $form['term_data']['translations'] = _taxonomy_manager_form_term_data_translations($term, $translations, t('Translations'), 'translation', TRUE);
- $form['term_data']['translations']['#tree'] = TRUE;
- $form['term_data']['translations']['#weight'] = '53';
-
- $form['term_data']['language'] = array(
- '#type' => 'select',
- '#title' => t('Language'),
- '#default_value' => isset($term) && !empty($term->language) ? $term->language : '',
- '#options' => array('' => '') + locale_language_list('name'),
- '#description' => t('This term belongs to a multilingual vocabulary. You can set a language for it.'),
- '#weight' => 54,
- );
- }
- }
-
- $form['term_data']['weight'] = array(
- '#type' => 'weight',
- '#default_value' => $term->weight,
- '#delta' => 50,
- '#prefix' => '<div id="term-data-weight">',
- '#suffix' => '</div>',
- '#title' => t('Weight'),
- '#weight' => 55,
- );
-
- $link_img = theme("image", $module_path ."images/link-small.png", "link to term page");
- $form['term_data']['link'] = array('#value' => '<br />'. l($link_img .' '. t('Go to the term page'), taxonomy_term_path($term), array('attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description), 'target' => '_blank'), 'html' => TRUE)), '#weight' => '56');
- $form['term_data']['vid'] = array('#type' => 'hidden', '#value' => $term->vid);
-
- return $form;
-}
-
-/**
- * helper function for generating tables with values and delete op and field for adding
- *
- * @param $term term object which is going to be displayed
- * @param $values array of values to show, e.g related terms, synonyms, parents, children
- * @param $header_type string to display as header
- * @param $attr attribute type to show, can be 'related', 'synonym', 'parent', 'child'
- * @param $autocomplete if true, adds autocomplete, else a textfield
- * @param $add if true, shows add operation
- * @return an form array
- */
-function _taxonomy_manager_form_term_data_lists($term, $values, $header_type, $attr, $autocomplete = TRUE, $add = TRUE) {
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
- $rows = array();
-
- $form['#theme'] = 'taxonomy_manager_term_data_extra';
- $form['data'] = array();
- foreach ($values as $tid => $value) {
- if (is_object($value)) {
- $name = $value->name;
- $id = $value->tid;
- $vid = $value->vid;
- $extra_info = taxonomy_manager_tree_term_extra_info($value);
- }
- else {
- $name = $value;
- $id = $value;
- }
- $form['data'][$id][] = array(
- '#value' => (isset($vid) && $vid > 0) ? l($name, 'admin/content/taxonomy_manager/termdata/'. $vid ."/". $id, array('attributes' => array('title' => $extra_info, 'class' => 'taxonomy-term-data-name-link'))) : check_plain($name),
- '#row-class' => 'taxonomy-term-data-name',
- '#row-id' => 'term-'. $id,
- );
- $form['data'][$id][] = array(
- '#value' => '<span class="'. $attr .'" title="'. t('Remove') .'"> </span>',
- '#row-class' => 'taxonomy-term-data-operations',
- );
- }
- $form['headers'][] = array('#value' => $header_type);
- $form['headers'][] = array('#value' => '');
-
- $form['op'] = array();
- if ($add) {
- $form['op']['add'] = array(
- '#type' => 'textfield',
- '#prefix' => '<div class="term-data-autocomplete">',
- '#suffix' => '</div>',
- '#size' => 35,
- );
- if ($autocomplete) {
- $form['op']['add']['#autocomplete_path'] = 'taxonomy_manager/autocomplete/'. $term->vid;
- }
-
- $form['op']['add_button'] = array(
- '#value' => '<span class="'. $attr .'" title="'. t('Add') .'"> </span>',
- '#prefix' => '<div class="term-data-autocomplete-add">',
- '#suffix' => '</div>',
- );
- }
-
- return $form;
-
-}
-
-/**
- * helper function for generating a table listing the translations
- */
-function _taxonomy_manager_form_term_data_translations($term, $translations, $header_type, $attr, $autocomplete = TRUE, $add = TRUE) {
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
- $rows = array();
-
- $form['#theme'] = 'taxonomy_manager_term_data_extra';
- $form['data'] = array();
-
- foreach ($translations as $tid => $value) {
- if (is_object($value)) {
- $name = $value->name;
- $id = $value->tid;
- $vid = $value->vid;
- $lang = $value->language;
- $trid = $value->trid;
- $extra_info = taxonomy_manager_tree_term_extra_info($value);
- }
- $form['data'][$id][] = array(
- '#value' => (isset($vid) && $vid > 0) ? l($name, 'admin/content/taxonomy_manager/termdata/'. $vid ."/". $id, array('attributes' => array('title' => $extra_info))) : check_plain($name),
- '#row-class' => 'taxonomy-term-data-name',
- '#row-id' => 'term-'. $id,
- );
- $form['data'][$id][] = array(
- '#value' => check_plain(locale_language_name($lang)),
- '#row-class' => 'taxonomy-term-data-lang',
- '#row-id' => 'term-lang-'. $id,
- );
- $form['data'][$id][] = array(
- '#value' => '<span class="'. $attr .'" title="'. t('Remove') .'"> </span>',
- '#row-class' => 'taxonomy-term-data-operations',
- );
- }
- $form['headers'][] = array('#value' => $header_type);
- $form['headers'][] = array('#value' => t('Language'));
- $form['headers'][] = array('#value' => '');
-
- $form['op'] = array();
- if ($add) {
- $form['op']['add'] = array(
- '#type' => 'textfield',
- '#prefix' => '<div class="term-data-autocomplete">',
- '#suffix' => '</div>',
- '#size' => 35,
- );
- $form['op']['lang'] = array(
- '#type' => 'select',
- '#options' => array('' => '') + locale_language_list('name'),
- '#default value' => '',
- );
- if ($autocomplete) {
- $form['op']['add']['#autocomplete_path'] = 'taxonomy_manager/autocomplete/'. $term->vid;
- }
-
- $form['op']['add_button'] = array(
- '#value' => '<span class="'. $attr .'" title="'. t('Add') .'"> </span>',
- '#prefix' => '<div class="term-data-autocomplete-add">',
- '#suffix' => '</div>',
- );
- }
-
- return $form;
-
-}
-
-/**
- * validates the form (only search button)
- **/
-function taxonomy_manager_form_validate($form, &$form_state) {
- if ($form_state['clicked_button']['#value'] == t('Search') && empty($form_state['values']['search']['field'])) {
- form_set_error('search', t('Search field is empty'));
- $form_state['rebuild'] = TRUE;
- }
-}
-
-/**
- * submits the taxonomy manager form (only search button)
- **/
-function taxonomy_manager_form_submit($form, &$form_state) {
- if ($form_state['values']['delete'] === TRUE) {
- return taxonomy_manager_term_confirm_delete_submit($form, $form_state);
- }
- if (isset($form_state['values']['vid2'])) {
- $url_prefix = 'admin/content/taxonomy_manager/double-tree/'. $form_state['values']['vid'] .'/'. $form_state['values']['vid2'];
- }
- else {
- $url_prefix = 'admin/content/taxonomy_manager/voc/'. $form_state['values']['vid'];
- }
-
- $search_string = $form_state['values']['search']['field'];
- $terms = array();
-
- $include_synonyms = FALSE;
- $selected_tids = array();
-
- if ($form_state['values']['search']['options']['synonyms']) {
- $include_synonyms = TRUE;
- }
- if ($form_state['values']['search']['options']['subtrees']) {
- $selected_tids = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
- }
- if ($form_state['values']['search']['options']['language']) {
- $language = $form_state['values']['taxonomy']['manager']['top']['language'];
- }
-
- $terms = taxonomy_manager_autocomplete_search_terms($search_string, $form_state['values']['vid'], $include_synonyms, $selected_tids, $language);
- if (count($terms) == 1) {
- $tid = $terms[0];
- drupal_set_message(t("Your search string matches exactly one term"));
- drupal_goto($url_prefix .'/'. $tid);
- }
- else if (count($terms) > 1) {
- $matched_text_list = array();
- foreach ($terms as $matched_tid) {
- $matched_term = taxonomy_get_term($matched_tid);
- $parents = array();
- foreach (taxonomy_get_parents($matched_tid) as $parent) {
- $parents[] = check_plain($parent->name);
- }
- $parent_text = count($parents) ? implode(' | ', $parents) ." › " : "";
- $term = taxonomy_get_term($t['tid']);
- $matched_text_list[] = $parent_text ."". l($matched_term->name, $url_prefix .'/'. $matched_term->tid, array('attributes' => array('title' => taxonomy_manager_tree_term_extra_info($matched_term)))) ." (". $matched_term->tid . (!empty($matched_term->language) ? '-'. check_plain($matched_term->language) : '') . ")";
- }
- drupal_set_message(t("Your search string matches !count terms:", array('!count' => count($terms))) ."". theme('item_list', $matched_text_list));
- $form_state['rebuild'] = TRUE;
- }
- else {
- drupal_set_message(t("No match found. Filtering root level terms starting with @search_string.", array('@search_string' => $search_string)));
- drupal_set_message(l(t("Show unfiltered tree"), $url_prefix));
- drupal_goto($url_prefix .'/0/'. $search_string);
- }
-}
-
-/**
- * validates taxonomy manager double tree
- **/
-function taxonomy_manager_double_tree_form_validate($form, &$form_state) {
- return taxonomy_manager_form_validate($form, $form_state);
-}
-
-/**
- * submits the taxonomy manager double tree
-**/
-function taxonomy_manager_double_tree_form_submit($form, &$form_state) {
- return taxonomy_manager_form_submit($form, $form_state);
-}
-
-/**
- * Submit handler for adding terms
- */
-function taxonomy_manager_form_add_submit($form, &$form_state) {
- $terms = array();
- $selected_tids = array();
- $selected_tids = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
- foreach ($form_state['values']['add']['term'] as $value) {
- if (!empty($value)) {
- $terms[] = $value;
- }
- }
- if ($form_state['values']['add']['mass']['mass_add']) {
- foreach (explode ("\n", str_replace("\r", '', $form_state['values']['add']['mass']['mass_add'])) as $term) {
- if ($term) {
- $terms[] = $term;
- }
- }
- }
- foreach ($terms as $name) {
- $term = array();
- $term['name'] = $name;
- $term['vid'] = $form_state['values']['vid'];
- $term['parent'] = $selected_tids;
- taxonomy_save_term($term);
- if (module_exists('i18ntaxonomy')) {
- if (i18ntaxonomy_vocabulary($form_state['values']['vid']) == I18N_TAXONOMY_TRANSLATE && $form_state['values']['taxonomy']['manager']['top']['language'] != "") {
- _i18ntaxonomy_term_set_lang($term['tid'], $form_state['values']['taxonomy']['manager']['top']['language']);
- $updated_lang = TRUE;
- }
- }
- }
- taxonomy_manager_update_voc($form_state['values']['vid'], $selected_tids);
-
- if (isset($updated_lang) && $updated_lang == TRUE) {
- drupal_set_message(t("Saving terms to language @lang", array('@lang' => locale_language_name($form_state['values']['taxonomy']['manager']['top']['language']))));
- }
- drupal_set_message(t("Terms added: %terms", array('%terms' => implode(', ', $terms))));
-}
-
-
-/**
- * Validation handler for deleting terms
- */
-function taxonomy_manager_form_delete_validate($form, &$form_state) {
- $selected_tids = array();
- $selected_tids = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
- if (count($selected_tids) < 1) {
- form_set_error('delete', t("No terms for deleting selected"));
- $form_state['rebuild'] = TRUE;
- }
-}
-
-
-
-/**
- * Submit handler for deleting terms
- */
-function taxonomy_manager_form_delete_submit($form, &$form_state) {
- $selected_tids = array();
- $selected_tids = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
- if ($form_state['values']['delete'] === TRUE) {
- return taxonomy_manager_term_confirm_delete_submit($form, $form_state);
- }
- // Rebuild the form to confirm term deletion.
- $form_state['rebuild'] = TRUE;
- $form_state['confirm_delete'] = TRUE;
-}
-
-
-/**
- * Form builder for the term delete form.
- *
- */
-function taxonomy_manager_term_confirm_delete(&$form_state, $vid, $vid2 = NULL) {
- if (isset($vid2)) {
- $form['vid2'] = array('#type' => 'value', '#value' => $vid2);
- $url = 'admin/content/taxonomy_manager/double-tree/'. $vid .'/'. $vid2;
- }
- else {
- $url = 'admin/content/taxonomy_manager/voc/'. $vid;
- }
- $selected = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
- $form['selected_terms'] = array('#prefix' => '<ul>', '#suffix' => '</ul>', '#tree' => TRUE);
- foreach ($selected as $tid) {
- $term = taxonomy_get_term($tid);
- $form['selected_terms'][$tid] = array('#type' => 'hidden', '#value' => $tid, '#prefix' => '<li>', '#suffix' => check_plain($term->name) ."</li>\n");
- }
-
- $form['delete'] = array('#type' => 'value', '#value' => TRUE);
- $form['vid'] = array('#type' => 'value', '#value' => $vid);
- $form['options'] = array('#type' => 'value', '#value' => $form_state['values']['delete']['options']);
- $msg = !empty($form_state['values']['delete']['options']['delete_orphans']) ? t('Deleting a term will delete all its children if there are any. ') : '';
- $msg .= t('This action cannot be undone.');
- return confirm_form($form,
- t('Are you sure you want to delete the following terms: '),
- $url,
- $msg,
- t('Delete'),
- t('Cancel'));
-}
-
-/**
- * Submit handler to delete a term after confirmation.
- *
- */
-function taxonomy_manager_term_confirm_delete_submit($form, &$form_state) {
- taxonomy_manager_delete_terms($form_state['values']['selected_terms'], $form_state['values']['options']);
- if (isset($form_state['values']['vid2'])) {
- $form_state['redirect'] = 'admin/content/taxonomy_manager/double-tree/'. $form_state['values']['vid'] .'/'. $form_state['values']['vid2'];
- }
- else {
- $form_state['redirect'] = 'admin/content/taxonomy_manager/voc/'. $form_state['values']['vid'];
- }
- drupal_set_message(t("Selected terms deleted"));
- return;
-}
-
-
-
-/**
- * Validation handler for moving terms
- */
-function taxonomy_manager_form_move_validate($form, &$form_state) {
- $selected_tids = array();
- $selected_tids = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
- $error_msg = "";
- if (count($selected_tids) < 1) {
- form_set_error('move', t("Please selected terms you want to move in the hierarchy"));
- $form_state['rebuild'] = TRUE;
- }
- else if (_taxonomy_manager_check_duplicates($form_state['values']['vid'], $form_state['values']['move']['parents'], $error_msg)) {
- form_set_error('move', t("Warning: Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name or the term id with 'term-id:[tid]'") ." (". $error_msg .").");
- $form_state['rebuild'] = TRUE;
- }
-
- $typed_parents = taxonomy_manager_autocomplete_tags_get_tids($form_state['values']['move']['parents'], $form_state['values']['vid'], FALSE);
-
- $parents = array();
- foreach ($typed_parents as $parent_info) {
- $parents[(int) $parent_info['tid']] = (int) $parent_info['tid'];
- }
-
- if (!taxonomy_manager_check_circular_hierarchy($selected_tids, $parents)) {
- form_set_error('move', t('Invalid selection. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself.'));
- $form_state['rebuild'] = TRUE;
- }
- else if (!taxonomy_manager_check_language($form_state['values']['vid'], $selected_tids, $typed_parents)) {
- form_set_error('move', t('Terms must be of the same language'));
- $form_state['rebuild'] = TRUE;
- }
-}
-
-
-/**
- * checks for circles in the hierarchy, e.g. 1 -> 2 -> 3 -> 1
- * a term can't contain itself as a parent
- *
- * returns TRUE if resulting hierarchy is valid, else FALSE
- */
-function taxonomy_manager_check_circular_hierarchy($tids, $new_parents_tids) {
- if (is_array($tids) && is_array($new_parents_tids)) {
- //directly same term
- foreach ($tids as $tid) {
- if (in_array($tid, $new_parents_tids)) {
- return FALSE;
- }
- }
-
- //same term over more hierarchy levels
- $all_parents = array();
- foreach ($new_parents_tids as $parent_tid) {
- $parents = taxonomy_get_parents_all($parent_tid);
- foreach ($parents as $parent) {
- $all_parents[$parent->tid] = $parent->tid;
- }
- }
- foreach ($tids as $tid) {
- if (in_array($tid, $all_parents)) {
- return FALSE;
- }
- }
- }
- return TRUE;
-}
-
-/**
- * checks if terms in move or merge operation are of the same language
- *
- * returns TRUE if operation allowed, else FALSE (different languages)
- */
-function taxonomy_manager_check_language($vid, $selected_tids, $parents) {
- if (module_exists('i18ntaxonomy')) {
- if (count($parents) && count($selected_tids)) {
- $term = array_pop($parents);
- $lang = _taxonomy_manager_term_get_lang($term['tid']);
- if (i18ntaxonomy_vocabulary($vid) == I18N_TAXONOMY_TRANSLATE) {
- foreach ($parents as $parent) {
- if (_taxonomy_manager_term_get_lang($parent['tid']) != $lang) {
- return FALSE;
- }
- }
- foreach ($selected_tids as $tid) {
- if (_taxonomy_manager_term_get_lang($tid) != $lang) {
- return FALSE;
- }
- }
- }
- }
- }
- return TRUE;
-}
-
-
-/**
- * Submit handler for moving terms
- */
-function taxonomy_manager_form_move_submit($form, $form_state) {
- $selected_tids = array();
- $selected_tids = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
- $typed_parents = taxonomy_manager_autocomplete_tags_get_tids($form_state['values']['move']['parents'], $form_state['values']['vid'], TRUE, $form_state['values']['taxonomy']['manager']['top']['language']);
-
- $parents = array();
- foreach ($typed_parents as $parent_info) {
- $parents[] = $parent_info['tid'];
- }
-
- if (count($parents) == 0) $parents[0] = 0; //if empty, delete all parents
-
- taxonomy_manager_move($parents, $selected_tids, $form_state['values']['move']['options']);
-
- if ($form_state['values']['move']['options']['keep_old_parents']) {
- $parents[] = 1; //++ parent count for hierarchy update (-> multi hierarchy)
- }
- taxonomy_manager_update_voc($form_state['values']['vid'], $parents);
-
- $term_names_array = array();
- foreach ($selected_tids as $selected_tid) {
- $term = taxonomy_get_term($selected_tid);
- $term_names_array[] = $term->name;
- }
- $term_names = implode(', ', $term_names_array);
- $parent_names = "";
- if (count($typed_parents) == 0) {
- $parent_names = t("root level");
- }
- else {
- $parent_names = $form_state['values']['move']['parents'];
- }
- drupal_set_message(t("Terms %term_names moved to %parent_names", array('%term_names' => $term_names, '%parent_names' => $parent_names)));
-}
-
-
-/**
- * Validation handler for validating terms
- */
-function taxonomy_manager_form_merge_validate($form, &$form_state) {
- $selected_tids = array();
- $selected_tids = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
-
- $main_terms = array();
- $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
- preg_match_all($regexp, $form_state['values']['merge']['main_term'], $matches);
- $main_terms = $matches[1];
- $error_msg = "";
- $typed_terms = taxonomy_manager_autocomplete_tags_get_tids($form_state['values']['merge']['main_term'], $form_state['values']['vid'], FALSE);
-
- if (!is_array($main_terms) || count($main_terms) == 0 || empty ($main_terms[0])) {
- form_set_error('merge][main_term', t('Please enter a name into "Resulting merged term"'));
- $form_state['rebuild'] = TRUE;
- }
- else if (count($main_terms) > 1) {
- form_set_error('merge][main_term', t('Please only enter single names into "Resulting merged term"'));
- $form_state['rebuild'] = TRUE;
- }
-
- if (count($selected_tids) < 1) {
- form_set_error('merge', t("Please selected terms you want to merge"));
- $form_state['rebuild'] = TRUE;
- }
- else if (count($selected_tids) > 50) {
- form_set_error('merge', t("Please select less than 50 terms to merge. Merging of too many terms in one step can cause timeouts and inconsistent database states"));
- $form_state['rebuild'] = TRUE;
- }
- else if (_taxonomy_manager_check_duplicates($form_state['values']['vid'], $form_state['values']['merge']['main_term'], $error_msg)) {
- form_set_error('merge', t("Warning: Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name or the term id with 'term-id:[tid]'") ." (". $error_msg .").");
- $form_state['rebuild'] = TRUE;
- }
- else if ($form_state['values']['merge']['options']['collect_parents']) {
- $main_terms = array();
- foreach ($typed_terms as $term_info) {
- $main_terms[$term_info['tid']] = $term_info['tid'];
- }
- if (count($main_terms) == 1) {
- if (!taxonomy_manager_check_circular_hierarchy($main_terms, $selected_tids)) {
- form_set_error('merge', t('Invalid selection. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself. Unselect "Collect all parents of selected terms an add it to the merged term" or specify a different resulting term.'));
- $form_state['rebuild'] = TRUE;
- }
- }
- }
- else if (!taxonomy_manager_check_language($form_state['values']['vid'], $selected_tids, $typed_terms)) {
- form_set_error('merge', t('Terms must be of the same language'));
- $form_state['rebuild'] = TRUE;
- }
-}
-
-/**
- * Submit handler for merging terms
- */
-function taxonomy_manager_form_merge_submit($form, $form_state) {
- $selected_tids = array();
- $selected_tids = $form_state['values']['taxonomy']['manager']['tree']['selected_terms'];
- $main_terms = taxonomy_manager_autocomplete_tags_get_tids($form_state['values']['merge']['main_term'], $form_state['values']['vid'], TRUE, $form_state['values']['taxonomy']['manager']['top']['language']);
- $main_term = array_shift($main_terms);
-
- $new_inserted = FALSE;
- if ($main_term['new']) {
- $new_inserted = TRUE;
- }
- $main_term_tid = $main_term['tid'];
- taxonomy_manager_merge($main_term_tid, $selected_tids, $form_state['values']['merge']['options'], $new_inserted);
-
- $term_names_array = array();
- foreach ($selected_tids as $selected_tid) {
- $term = taxonomy_get_term($selected_tid);
- $term_names_array[] = $term->name;
- }
- $term_names = implode($term_names_array, ', ');
-
- drupal_set_message(t("Terms %term_names merged into %main_term", array('%term_names' => $term_names, '%main_term' => $form_state['values']['merge']['main_term'])));
-}
-
-/**
- * returns TRUE if term with same name exists more often
- */
-function _taxonomy_manager_check_duplicates($vid, $autocomplete_value, &$msg) {
- $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
- preg_match_all($regexp, $autocomplete_value, $matches);
- foreach ($matches[1] as $match) {
- $terms = array();
- $terms = taxonomy_manager_autocomplete_tags_get_tids($match, $vid, FALSE);
- if (count($terms) > 1) {
- $tids = array();
- foreach ($terms as $t) {
- $term = taxonomy_get_term($t['tid']);
- $tids[] = $term->tid . (!empty($term->language) ? '-'. check_plain($term->language) : '');
- }
- $msg .= check_plain($match) .": ". implode(", ", $tids);
- return TRUE;
- }
- }
- return FALSE;
-}
-
-function taxonomy_manager_form_double_tree_submit($form, $form_state) {
- $voc1 = $form_state['values']['vid'];
- $voc2 = $form_state['values']['double_tree']['voc2'];
- drupal_goto('admin/content/taxonomy_manager/double-tree/'. $voc1 .'/'. $voc2);
-}
-
-function taxonomy_manager_form_double_tree_disable_submit($form, $form_state) {
- drupal_goto('admin/content/taxonomy_manager/voc/'. $form_state['values']['vid']);
-}
-
-/**
- * Defines a settings form.
- */
-function taxonomy_manager_settings() {
- $form['taxonomy_manager_disable_mouseover'] = array(
- '#type' => 'checkbox',
- '#title' => t('Disable mouse-over effect for terms (weights and direct link)'),
- '#default_value' => variable_get('taxonomy_manager_disable_mouseover', 0),
- '#description' => t('Disabeling this feature speeds up the Taxonomy Manager'),
- );
- $form['taxonomy_manager_disable_merge_redirect'] = array(
- '#type' => 'checkbox',
- '#title' => t('Disable redirect of the taxonomy term page to merged terms '),
- '#default_value' => variable_get('taxonomy_manager_disable_merge_redirect', TRUE),
- '#description' => t('When using the merging feature, the selected terms get merged into one term. All selected terms will be deleted afterwards. Normally the Taxonomy Manager redirects calls to taxonomy/term/$tid of the deleted terms (through merging) to the resulting merged term. This feature might conflict with other modules (e.g. Taxonomy Breadcrumb, Panels), which implement hook_menu_alter to change the taxonomy_manager_term_page callback. Disable this feature if it conflicts with other modules or if you do not need it. Changing this setting requires a (menu) cache flush to become active.'),
- );
- $form['taxonomy_manager_pager_tree_page_size'] = array(
- '#type' => 'select',
- '#title' => t('Pager count'),
- '#options' => array(25 => 25, 50 => 50, 75 => 75, 100 => 100, 150 => 150, 200 => 200, 250 => 250, 300 => 300, 400 => 400, 500 => 500),
- '#default_value' => variable_get('taxonomy_manager_pager_tree_page_size', 50),
- '#description' => t('Select how many terms should be listed on one page. Huge page counts can slow down the Taxonomy Manager'),
- );
- return system_settings_form($form);
-}
-
-/**
- * callback handler for updating term data
- *
- * @param $vid
- */
-function taxonomy_manager_term_data_edit() {
- $param = $_POST;
-
- $msg = t("Changes successfully saved");
- $is_error_msg = FALSE;
-
- $tid = $param['tid'];
- if (!$tid) {
- $tid = $param['term_data']['tid'];
- }
- $vid = $param['vid'];
- if (!$vid) {
- $vid = $param['term_data']['vid'];
- }
- $values = $param['value'];
- $attr_type = $param['attr_type'];
- $op = $param['op'];
-
- if ($op == t("Save changes")) {
- db_query("UPDATE {term_data} SET name = '%s' WHERE tid = %d", $param['term_data']['name'], $tid);
- db_query("UPDATE {term_data} SET description = '%s' WHERE tid = %d", $param['term_data']['description'], $tid);
- }
- if ($op == 'add') {
- $typed_terms = taxonomy_manager_autocomplete_tags_get_tids($values, $vid, FALSE);
- }
-
- if ($op == 'add' && ($attr_type == 'parent' || $attr_type == 'related')) {
- //check for unique names
- $error_msg = "";
- if (_taxonomy_manager_check_duplicates($vid, $values, $error_msg)) {
- $msg = t("Warning: Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name or the term id with 'term-id:[tid]'") ." (". $error_msg .").";
- $is_error_msg = TRUE;
- }
- if(!taxonomy_manager_check_language($vid, array($tid), $typed_terms)) {
- $msg = t("Terms must be of the same language");
- $is_error_msg = TRUE;
- }
- if ($attr_type == 'parent') {
- //validation for consistent hierarchy
- $parents = array();
- foreach ($typed_terms as $parent_info) {
- $parents[$parent_info['tid']] = $parent_info['tid'];
- }
- $tids = array();
- $tids[$tid] = $tid;
- if (!taxonomy_manager_check_circular_hierarchy($tids, $parents)) {
- $msg = t('Invalid parent. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself.');
- $is_error_msg = TRUE;
- }
- }
- }
- else if ($op == 'add' && $attr_type == 'translation') {
- $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
- preg_match_all($regexp, $values, $matches);
- $translation_terms = array_unique($matches[1]);
- if (count($translation_terms) > 1) {
- $msg = t('Please provide only one term for translation');
- $is_error_msg = TRUE;
- }
- else if ($param['edit-term-data-translations-op-lang'] == $param['edit-term-data-language']) {
- $msg = t('Invalid language selection');
- $is_error_msg = TRUE;
- }
- else if (empty($param['edit-term-data-translations-op-lang'])) {
- $msg = t('Missing language for new term');
- $is_error_msg = TRUE;
- }
- else {
- $translations = i18ntaxonomy_term_get_translations(array('tid' => $tid), FALSE);
- foreach ($translations as $translation) {
- if ($translation->language == $param['edit-term-data-translations-op-lang']) {
- $msg = t('Invalid language selection. Translation already exists');
- $is_error_msg = TRUE;
- break;
- }
- }
- }
- }
- else if ($attr_type == "language") {
- $translations = i18ntaxonomy_term_get_translations(array('tid' => $tid), FALSE);
- foreach ($translations as $translation) {
- if ($translation->language == $values) {
- $msg = t('Invalid language selection.');
- $is_error_msg = TRUE;
- break;
- }
- }
- }
-
- if (!$is_error_msg) {
- if ($op == 'add') {
- if ($attr_type == 'synonym') {
- $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
- preg_match_all($regexp, $values, $matches);
- $synonyms = array_unique($matches[1]);
- $values = array();
- foreach ($synonyms as $syn) {
- $values[] = trim($syn);
- }
- }
- else {
- $typed_term_tids = array();
- if ($attr_type == "translation") {
- $typed_term_tids = taxonomy_manager_autocomplete_tags_get_tids($values, $vid, TRUE, $param['edit-term-data-translations-op-lang']);
- }
- else {
- $typed_term_tids = taxonomy_manager_autocomplete_tags_get_tids($values, $vid, TRUE, $param['edit-term-data-language']);
- }
- $values = array();
- foreach ($typed_term_tids as $term_info) {
- $values[] = $term_info['tid'];
- }
- }
- }
-
- switch ($attr_type) {
- case 'parent':
- if (!is_array($values)) $values = array($values);
- foreach ($values as $value) {
- db_query("DELETE FROM {term_hierarchy} WHERE parent = %d AND tid = %d", $value, $tid);
- if ($op == 'add') {
- db_query("INSERT INTO {term_hierarchy} (parent, tid) VALUES (%d, %d)", $value, $tid);
- }
- }
- if ($op == 'delete') {
- $parents = taxonomy_get_parents($tid);
- if (count($parents) == 0) {
- //ensure that a term has a least parent 0
- db_query("DELETE FROM {term_hierarchy} WHERE parent = 0 AND tid = %d", $tid);
- db_query("INSERT INTO {term_hierarchy} (parent, tid) VALUES (0, %d)", $tid);
- }
- }
- else if ($op == 'add') {
- db_query("DELETE FROM {term_hierarchy} WHERE parent = 0 AND tid = %d", $tid);
- }
- taxonomy_manager_update_voc($vid, taxonomy_get_parents($tid));
- $msg = t("Successfully updated parents");
- break;
-
- case 'related':
- if (!is_array($values)) $values = array($values);
- foreach ($values as $value) {
- if ($value != 0) {
- db_query("DELETE FROM {term_relation} WHERE tid1 = %d AND tid2 = %d", $tid, $value);
- // db_query("DELETE FROM {term_relation} WHERE tid2 = %d AND tid1 = %d", $tid, $value);
- if ($op == 'add') {
- db_query('INSERT INTO {term_relation} (tid1, tid2) VALUES (%d, %d)', $tid, $value);
- }
- }
- }
- $msg = t("Successfully updated related terms");
- break;
-
- case 'synonym':
- if (!is_array($values)) $values = array($values);
- foreach ($values as $value) {
- db_query("DELETE FROM {term_synonym} WHERE tid = %d AND name = '%s'", $tid, $value);
- if ($op == 'add') {
- db_query("INSERT INTO {term_synonym} (tid, name) VALUES (%d, '%s')", $tid, $value);
- }
- }
- $msg = t("Successfully updated synonyms");
- break;
-
- case 'weight':
- if (is_numeric($values)) {
- db_query("UPDATE {term_data} SET weight = %d WHERE tid = %d", $values, $tid);
- $msg = t("Successfully updated weight to !weight", array('!weight' => $values));
- }
- break;
-
- case 'language':
- if (module_exists('i18ntaxonomy')) {
- _i18ntaxonomy_term_set_lang($tid, $values);
- $msg = t("Successfully updated language");
- }
- else {
- $is_error_msg = TRUE;
- $msg = t("Module i18ntaxonomy not enabled");
- }
- break;
-
- case 'translation':
- if (module_exists('i18ntaxonomy')) {
- if ($op == "add") {
- taxonomy_manager_add_translation($tid, $values[0]);
- $msg = t("Successfully added translation");
- }
- else if ($op == "delete") {
- db_query('UPDATE {term_data} SET trid = 0 WHERE tid = %d', $values);
- if (count(i18ntaxonomy_term_get_translations(array('tid' => $tid), FALSE)) == 0) {
- db_query('UPDATE {term_data} SET trid = 0 WHERE tid = %d', $tid);
- }
- $msg = t("Successfully removed translation");
- }
- }
- else {
- $is_error_msg = TRUE;
- $msg = t("Module i18ntaxonomy not enabled");
- }
- break;
-
- }
- $term = (array) taxonomy_get_term($tid);
- $term['fields'] = $param['term_data']['fields'];
- module_invoke_all('taxonomy', 'update', 'term', $term);
- module_invoke_all('taxonomy_manager_term_data_submit', $param, $values);
- }
-
- drupal_json(array('data' => taxonomy_manager_update_term_data_form($vid, $tid, TRUE, FALSE, $msg, $is_error_msg)));
- //taxonomy_manager_update_term_data_form($vid, $tid, TRUE);
- exit;
-}
-
-/**
- * AJAX Callback for Double Tree operations
- */
-function taxonomy_manager_double_tree_edit() {
- $params = $_POST;
- $op = $params['op'];
-
- $msg = "";
- $is_error_msg = FALSE;
-
- if ($op == "move") {
- taxonomy_manager_double_tree_edit_move($params, $msg, $is_error_msg);
- }
- else if ($op == "translation") {
- taxonomy_manager_doube_tree_edit_translate($params, $msg, $is_error_msg);
- }
- else if ($op == "switch") {
- taxonomy_manager_double_tree_edit_switch($params, $msg, $is_error_msg);
- }
-
- if ($msg == "") {
- $msg = t("Invalid operation.");
- $is_error_msg = TRUE;
- }
- $msg_type = ($is_error_msg) ? "error" : "status";
-
- drupal_json(array('data' => $msg, 'type' => $msg_type));
-}
-
-function taxonomy_manager_double_tree_edit_move($params, &$msg, &$is_error_msg) {
- $selected_terms = $params['selected_terms'];
- $selected_parents = $params['selected_parents'];
-
- if (!is_array($selected_terms) || !count($selected_terms)) {
- $msg = t("No terms selected.");
- $is_error_msg = TRUE;
- return;
- }
-
- $selected_terms_names = array();
- foreach ($selected_terms as $tid) {
- $term = taxonomy_get_term($tid);
- $vid = $term->vid;
- $selected_terms_names[] = $term->name;
- }
-
- if (is_array($selected_parents) && count($selected_parents)) {
- $p_array = array();
- foreach ($selected_parents as $parent) {
- $p_array[$parent]['tid'] = $parent;
- }
- if(!taxonomy_manager_check_language($vid, $selected_terms, $p_array)) {
- $msg = t("Terms must be of the same language.");
- $is_error_msg = TRUE;
- return;
- }
- else if (!taxonomy_manager_check_circular_hierarchy($selected_terms, $selected_parents)) {
- $msg = t('Invalid parent. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself.');
- $is_error_msg = TRUE;
- return;
- }
- }
- foreach ($selected_terms as $tid) {
- //reset all parents, except the direct parent in the tree
- $term_parents = taxonomy_get_parents($tid);
- $term_parents_array = array();
- $direct_parent = is_numeric($params['selected_terms_parent'][$tid]) ? $params['selected_terms_parent'][$tid] : 0;
- foreach ($term_parents as $term_parent) {
- if ($direct_parent != $term_parent->tid) {
- $term_parents_array[$term_parent->tid] = $term_parent->tid;
- }
- }
- $selected_parent_names = array();
- if (count($selected_parents)) {
- foreach ($selected_parents as $parent) {
- $term = taxonomy_get_term($parent);
- $selected_parent_names[] = $term->name;
- $term_parents_array[$term->tid] = $term->tid;
- }
- }
- if (count($term_parents_array) == 0) {
- $term_parents_array[0] = 0;
- }
- taxonomy_manager_move($term_parents_array, array($tid), array('keep_old_parents' => FALSE));
- taxonomy_manager_update_voc($vid, $term_parents_array);
- }
-
- $term_names = implode(', ', $selected_terms_names);
- if (count($selected_parents) == 0) {
- $msg = t("Removed current parent form terms %terms.", array('%terms' => $term_names));
- }
- else {
- $msg = t("Terms %terms moved to parents %parents.", array('%terms' => $term_names, '%parents' => implode(', ', $selected_parent_names)));
- }
- $is_error_msg = FALSE;
-}
-
-
-function taxonomy_manager_doube_tree_edit_translate($params, &$msg, &$is_error_msg) {
- $term1 = taxonomy_get_term(array_pop($params['selected_terms']));
- $term2 = taxonomy_get_term(array_pop($params['selected_parents']));
- $vid = $term1->vid;
-
- if (module_exists('i18ntaxonomy')) {
- if (i18ntaxonomy_vocabulary($vid) == I18N_TAXONOMY_TRANSLATE) {
- if ($term1->language == $term2->language) {
- $msg = t("Selected terms are of the same language.");
- $is_error_msg = TRUE;
- }
- else {
- $translations = i18ntaxonomy_term_get_translations(array('tid' => $term1->tid), FALSE);
- foreach ($translations as $translation) {
- if ($translation->language == $term2->language) {
- $msg = t('Translation for this language already exists.');
- $is_error_msg = TRUE;
- break;
- }
- }
- $translations = i18ntaxonomy_term_get_translations(array('tid' => $term2->tid), FALSE);
- foreach ($translations as $translation) {
- if ($translation->language == $term1->language) {
- $msg = t('Translation for this language already exists.');
- $is_error_msg = TRUE;
- break;
- }
- }
- }
- }
- else {
- $msg = t("This is not a multilingual vocabulary.");
- $is_error_msg = TRUE;
- }
- }
- else {
- $msg = t("Module i18ntaxonomy not enabled.");
- $is_error_msg = TRUE;
- }
-
- if (!$is_error_msg) {
- taxonomy_manager_add_translation($term1->tid, $term2->tid);
- $msg = t("Translation for %term2 - %term1 added.", array('%term2' => $term2->name, '%term1' => $term1->name));
- }
-}
-
-function taxonomy_manager_double_tree_edit_switch($params, &$msg, &$is_error_msg) {
- $selected_terms = $params['selected_terms'];
- $selected_parents = $params['selected_parents'];
- $voc1 = taxonomy_vocabulary_load($params['voc1']);
- $voc2 = taxonomy_vocabulary_load($params['voc2']);
-
- taxonomy_manager_switch($selected_terms, $voc1->vid, $voc2->vid, $selected_parents);
-
- $selected_terms_names = array();
- foreach ($selected_terms as $tid) {
- $term = taxonomy_get_term($tid);
- $selected_terms_names[] = $term->name;
- }
- $selected_parent_names = array();
- if (count($selected_parents)) {
- foreach ($selected_parents as $parent) {
- $term = taxonomy_get_term($parent);
- $selected_parent_names[] = $term->name;
- $term_parents_array[$term->tid] = $term->tid;
- }
- }
- $term_names = implode(', ', $selected_terms_names);
- if (count($selected_parents) == 0) {
- $msg = t("Terms %terms moved to vocabulary %voc.", array('%terms' => $term_names, '%voc' => $voc2->name));
- }
- else {
- $msg = t("Terms %terms moved to vocabulary %voc under parents %parents.", array('%terms' => $term_names, '%voc' => $voc2->name, '%parents' => implode(', ', $selected_parent_names)));
- }
- $is_error_msg = FALSE;
-}
-
-/**
- * adds translation between two terms
- */
-function taxonomy_manager_add_translation($tid1, $tid2) {
- $trid1 = db_result(db_query("SELECT trid FROM {term_data} WHERE tid = %d", $tid1));
- $trid2 = db_result(db_query("SELECT trid FROM {term_data} WHERE tid = %d", $tid2));
- if ($trid1 == 0 && $trid2 == 0) {
- $trid = ((int)db_result(db_query('SELECT max(trid) FROM {term_data}'))) + 1;
- db_query('UPDATE {term_data} SET trid = %d WHERE tid = %d OR tid = %d', $trid, $tid1, $tid2);
- }
- else if ($trid1 != 0 && $trid2 == 0) {
- db_query('UPDATE {term_data} SET trid = %d WHERE tid = %d', $trid1, $tid2);
- }
- else if ($trid2 != 0 && $trid1 == 0) {
- db_query('UPDATE {term_data} SET trid = %d WHERE tid = %d', $trid2, $tid1);
- }
- else {
- $trid = max($trid1, $trid2);
- db_query('UPDATE {term_data} SET trid = %d WHERE trid = %d OR trid = %d', $trid, $trid1, $trid2);
- }
-}
-
-/**
- * Changes vocabulary of given terms and its children
- * conflicts might be possible with multi-parent terms!
- */
-function taxonomy_manager_switch($tids, $from_voc, $to_voc, $parents = array()) {
- foreach ($tids as $tid) {
- //hook to inform modules about the changes
- module_invoke_all('taxonomy_manager_term', 'switch', $tid, $from_voc, $to_voc);
-
- $children = taxonomy_get_tree($from_voc, $tid);
- $place_holder = array();
- $terms_to_switch = array();
- foreach ($children as $child) {
- $placeholder[] = '%d';
- $terms_to_switch[] = $child->tid;
- }
- $placeholder[] = '%d';
- $terms_to_switch[] = $tid;
- db_query("UPDATE {term_data} SET vid = %d WHERE tid IN (". implode(', ', $placeholder) .")", array_merge(array($to_voc), $terms_to_switch));
-
- //delete references to parents from the old voc
- foreach ($children as $child) {
- $term_parents = taxonomy_get_parents($child->tid);
- foreach ($term_parents as $term_parent) {
- if ($term_parent->vid != $to_voc) {
- db_query("DELETE FROM {term_hierarchy} WHERE tid = %d AND parent = %d", $child->tid, $term_parent->tid);
- }
- }
- }
-
- //set parent of the selected term
- if (!count($parents)) {
- $parents[0] = 0;
- }
- taxonomy_manager_move($parents, array($tid));
- taxonomy_manager_update_voc($to_voc, $parents);
- }
-}
-/**
- * checks if voc has terms
- *
- * @param $vid voc id
- * @return true, if terms already exists, else false
- */
-function _taxonomy_manager_voc_is_empty($vid) {
- $count = db_result(db_query_range("SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE vid = %d AND h.parent = 0", $vid, 0, 1));
- if ($count == 0) {
- return TRUE;
- }
- return FALSE;
-}
-
-
-/**
- * deletes terms from the database
- * optional orphans (terms where parent get deleted) can be deleted as well
- *
- * (difference to taxonomy_del_term: deletion of orphans optional)
- *
- * @param $tids array of term id to delete
- * @param $options associative array with options
- * if $options['delete_orphans'] is true, orphans get deleted
- */
-function taxonomy_manager_delete_terms($tids, $options = array()) {
- if (!is_array($tids)) array($tids);
- while (count($tids) > 0) {
- $orphans = array();
- foreach ($tids as $tid) {
- if ($children = taxonomy_get_children($tid)) {
- foreach ($children as $child) {
- $parents = taxonomy_get_parents($child->tid);
- if ($options['delete_orphans']) {
- if (count($parents) == 1) {
- $orphans[] = $child->tid;
- }
- }
- else {
- db_query("DELETE FROM {term_hierarchy} WHERE tid = %d AND parent = %d", $child->tid, $tid);
- if (count($parents) == 1) {
- if (!db_result(db_query("SELECT COUNT(*) FROM {term_hierarchy} WHERE tid = %d AND parent = 0", $child->tid))) {
- db_query("INSERT INTO {term_hierarchy} (parent, tid) VALUES(0, %d)", $child->tid);
- }
- }
- }
- }
- }
- $term = (array) taxonomy_get_term($tid);
- db_query('DELETE FROM {term_data} WHERE tid = %d', $tid);
- db_query('DELETE FROM {term_hierarchy} WHERE tid = %d', $tid);
- db_query('DELETE FROM {term_relation} WHERE tid1 = %d OR tid2 = %d', $tid, $tid);
- db_query('DELETE FROM {term_synonym} WHERE tid = %d', $tid);
- db_query('DELETE FROM {term_node} WHERE tid = %d', $tid);
-
- module_invoke_all('taxonomy', 'delete', 'term', $term);
- $tids = $orphans;
- }
- }
-}
-
-
-/**
- * moves terms in hierarchies to other parents
- *
- * @param $parents
- * array of parent term ids to where children can be moved
- * array should only contain more parents if multi hiearchy enabled
- * if array contains 0, terms get placed to first (root) level
- * @param $children
- * array of term ids to move
- * @param $options
- * array of additional options for moving
- * 'keep_old_parents': if true, exisiting parents doesn't get deleted (only possible with multi hierarchies)
- */
-function taxonomy_manager_move($parents, $children, $options = array()) {
- if (!is_array($parents)) array($parents);
-
- foreach ($children as $child) {
- if (!$options['keep_old_parents']) {
- db_query("DELETE FROM {term_hierarchy} WHERE tid = %d", $child);
- }
- foreach ($parents as $parent) {
- db_query("DELETE FROM {term_hierarchy} WHERE parent = %d AND tid = %d", $parent, $child); //prevent duplicated sql errors
- db_query("INSERT INTO {term_hierarchy} (parent, tid) VALUES (%d, %d)", $parent, $child);
- }
- }
-}
-
-/**
- * merges terms into another term (main term), all merged term get added
- * to the main term as synonyms.
- * term_node relations are updated automatically (node with one of merging terms gets main term assigned)
- * after all opterions are done (adding of hierarchies, relations is optional) merging
- * terms get deleted
- *
- * @param $main_term
- * id of term where other terms get merged into
- * @param $merging_terms
- * array of term ids, which get merged into main term and afterwards deleted
- * @param $options
- * array with additional options, possible values:
- * 'collect_parents': if true, all parents of merging terms get added to main term (only possible with multi hierarchies)
- * 'collect_children': if true, all children of merging terms get added to main term
- * 'collect_relations': if true, all relations of merging terms are transfered to main term
- */
-function taxonomy_manager_merge($main_term, $merging_terms, $options = array(), $new_inserted = TRUE) {
- $vid = db_result(db_query("SELECT vid FROM {term_data} WHERE tid = %d", $main_term));
- $voc = taxonomy_vocabulary_load($vid);
- $merging_terms_parents = array();
-
- foreach ($merging_terms as $merge_term) {
- if ($merge_term != $main_term) {
-
- //hook, to inform other modules about the changes
- module_invoke_all('taxonomy_manager_term', 'merge', $main_term, $merge_term);
-
- //update node-relations
- $sql = db_query("SELECT * FROM {term_node} WHERE tid = %d", $merge_term);
- while ($obj = db_fetch_object($sql)) {
- db_query("DELETE FROM {term_node} WHERE tid = %d AND vid = %d", $obj->tid, $obj->vid);
- if (!db_result(db_query("SELECT COUNT(*) FROM {term_node} WHERE tid = %d AND vid = %d", $main_term, $obj->vid))) {
- $obj->tid = $main_term;
- drupal_write_record('term_node', $obj);
- }
- }
-
- if ($options['collect_parents']) {
- $parents = taxonomy_get_parents($merge_term);
- foreach ($parents as $parent_tid => $parent_term) {
- $merging_terms_parents[$parent_tid] = $parent_tid;
- if (!db_result(db_query("SELECT COUNT(*) FROM {term_hierarchy} WHERE tid = %d AND parent = %d", $main_term, $parent_tid))) {
- db_query("INSERT INTO {term_hierarchy} (tid, parent) VALUES (%d, %d)", $main_term, $parent_tid);
- }
- }
- }
-
- if ($options['collect_children']) {
- $children = taxonomy_get_children($merge_term);
- foreach ($children as $child_tid => $child_term) {
- if (!db_result(db_query("SELECT COUNT(*) FROM {term_hierarchy} WHERE tid = %d AND parent = %d", $child_tid, $main_term))) {
- db_query("INSERT INTO {term_hierarchy} (tid, parent) VALUES (%d, %d)", $child_tid, $main_term);
- }
- }
- }
-
- if ($options['collect_relations']) {
- $relations = taxonomy_get_related($merge_term);
- foreach ($relations as $related_tid => $relation) {
- if ($relation->tid1 == $merge_term) {
- if (!db_result(db_query("SELECT COUNT(*) FROM {term_relation} WHERE tid1 = %d AND tid2 = %d", $main_term, $related_tid))) {
- db_query("INSERT INTO {term_relation} (tid1, tid2) VALUES (%d, %d)", $main_term, $related_tid);
- }
- }
- else if ($relation->tid2 == $merge_term) {
- if (!db_result(db_query("SELECT COUNT(*) FROM {term_relation} WHERE tid2 = %d AND tid1 = %d", $main_term, $related_tid))) {
- db_query("INSERT INTO {term_relation} (tid2, tid1) VALUES (%d, %d)", $main_term, $related_tid);
- }
- }
- }
- }
-
- //save merged term (and synonomys of merged term) as synonym
- $term = taxonomy_get_term($merge_term);
- $merge_term_synonyms = taxonomy_get_synonyms($merge_term);
- $merge_term_synonyms[] = $term->name;
- foreach ($merge_term_synonyms as $syn) {
- if (!db_result(db_query("SELECT COUNT(*) FROM {term_synonym} WHERE tid = %d AND name = '%s'", $main_term, $syn))) {
- db_query("INSERT INTO {term_synonym} (tid, name) VALUES (%d, '%s')", $main_term, $syn);
- }
- }
-
- taxonomy_manager_delete_terms(array($merge_term));
- }
- }
- taxonomy_manager_update_voc($vid, $merging_terms_parents);
- if ($options['collect_parents'] && (db_result(db_query("SELECT COUNT(*) FROM {term_hierarchy} WHERE tid = %d", $main_term)) > 1)) {
- db_query("DELETE FROM {term_hierarchy} WHERE parent = 0 AND tid = %d", $main_term);
- }
- taxonomy_manager_merge_history_update($main_term, $merging_terms);
-}
-
-/**
- * inserts merging information (main_tid - merged_tid ) into taxonomy_manager_merge
- * and updates cache, which is used to reconstructs taxonomy/term pages
- *
- * @param $main_tid term if of main term
- * @param $merged_tids array of merged term ids
- */
-function taxonomy_manager_merge_history_update($main_tid, $merged_tids) {
- if (!is_array($merged_tids)) (array) $merged_tids;
-
- foreach ($merged_tids as $merged_tid) {
- if ($merged_tid != $main_tid) {
- //check if merged term has been a main term once before
- $check_merged = db_result(db_query("SELECT COUNT(*) FROM {taxonomy_manager_merge} WHERE main_tid = %d", $merged_tid));
-
- if ($check_merged) {
- db_query("UPDATE {taxonomy_manager_merge} SET main_tid = %d WHERE main_tid = %d", $main_tid, $merged_tid);
- }
- //insert into merging history
- db_query("INSERT INTO {taxonomy_manager_merge} (main_tid, merged_tid) VALUES (%d, %d)", $main_tid, $merged_tid);
- }
- }
- taxonomy_manager_merge_history_update_cache();
-}
-
-
-/**
- * helper function for getting out of term ids from autocomplete fields
- * non-exsiting terms get inserted autmatically
- * the input gets parsed for term names, optional a term id can be directly passed with prefixing the input with 'term-id:'
- *
- * @param $typed_input input string of form field
- * @param $vid vocabulary id
- * @param $insert_new TRUE if non-existing terms should be inserted
- * @param $lang define the language (optional)
- * @return array of term ids
- */
-function taxonomy_manager_autocomplete_tags_get_tids($typed_input, $vid, $insert_new = TRUE, $lang = NULL) {
- $tids = array();
-
- $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
- preg_match_all($regexp, $typed_input, $matches);
- $typed_terms = array_unique($matches[1]);
-
- foreach ($typed_terms as $typed_term) {
- $typed_term = str_replace('""', '"', preg_replace('/^"(.*)"$/', '\1', $typed_term));
- $typed_term = trim($typed_term);
- if ($typed_term != "") {
- if (substr($typed_term, 0, 8) == "term-id:") {
- $id = substr($typed_term, 8);
- $term = taxonomy_get_term($id);
- if ($term->vid == $vid) {
- $tids[$term->tid]['tid'] = $term->tid;
- }
- }
- else {
- $possibilities = taxonomy_get_term_by_name($typed_term);
- $typed_term_tid = NULL; // tid match if any.
- foreach ($possibilities as $possibility) {
- if ($possibility->vid == $vid && !($lang && $lang != $possibility->language)) {
- $typed_term_tid = $possibility->tid;
- $tids[$typed_term_tid]['tid'] = $typed_term_tid;
- }
- }
-
- if (!$typed_term_tid && $insert_new) {
- $edit = array('vid' => $vid, 'name' => $typed_term);
- $status = taxonomy_save_term($edit);
- if (module_exists('i18ntaxonomy') && $lang != "") {
- _i18ntaxonomy_term_set_lang($edit['tid'], $lang);
- }
- $typed_term_tid = $edit['tid'];
- $tids[$typed_term_tid]['tid'] = $typed_term_tid;
- $tids[$typed_term_tid]['new'] = TRUE;
- }
- }
- }
- }
- return $tids;
-}
-
-/**
- * similar to taxonomy_manager_autocomplete_tags_get_tids, but used for searching terms
- * takes synonyms and selected subtrees into account
- *
- * @param $typed_input input string of form field
- * @param $vid vocabulary id
- * @param $include_synonyms TRUE if search should include synonyms
- * @param $parents array of parents
- * @return array of term ids
- */
-function taxonomy_manager_autocomplete_search_terms($typed_input, $vid, $include_synonyms = FALSE, $parents = array(), $language = NULL) {
- $tids = array();
-
- if ($language != NULL && $language == "no language") {
- $language = "";
- }
-
- $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
- preg_match_all($regexp, $typed_input, $matches);
- $typed_terms = array_unique($matches[1]);
-
- foreach ($typed_terms as $typed_term) {
- $typed_term = str_replace('""', '"', preg_replace('/^"(.*)"$/', '\1', $typed_term));
- $typed_term = trim($typed_term);
- if ($typed_term == "") {
- continue;
- }
- if ($include_synonyms) {
- if ($language != NULL) {
- $search_sql = db_query("SELECT td.tid FROM {term_data} td LEFT JOIN {term_synonym} ts ON td.tid = ts.tid WHERE td.vid = %d AND (td.name = '%s' OR ts.name = '%s') AND td.language = '%s'", $vid, $typed_term, $typed_term, $language);
- }
- else {
- $search_sql = db_query("SELECT td.tid FROM {term_data} td LEFT JOIN {term_synonym} ts ON td.tid = ts.tid WHERE td.vid = %d AND (td.name = '%s' OR ts.name = '%s')", $vid, $typed_term, $typed_term);
- }
-
- }
- else {
- if ($language != NULL) {
- $search_sql = db_query("SELECT td.tid FROM {term_data} td WHERE td.vid = %d AND td.name = '%s' AND td.language = '%s'", $vid, $typed_term, $language);
- }
- else {
- $search_sql = db_query("SELECT td.tid FROM {term_data} td WHERE td.vid = %d AND td.name = '%s'", $vid, $typed_term);
- }
- }
- while ($obj = db_fetch_object($search_sql)) {
- $tids[] = $obj->tid;
- }
-
- if (count($parents)) {
- $filtered_tids = array();
- foreach ($tids as $tid) {
- $parents_all = taxonomy_get_parents_all($tid);
- foreach ($parents_all as $key => $parent) {
- if (in_array($parent->tid, $parents)) {
- $filtered_tids[] = $tid;
- break;
- }
- }
- }
- $tids = $filtered_tids;
- }
-
- }
- return $tids;
-}
-
-
-/**
- * callback for updating weights
- * data send through AJAX, $_POST
- * $_POST[$tid] => $weight
- *
- */
-function taxonomy_manager_update_weights() {
- $weights = $_POST;
- if (is_array($weights)) {
- foreach ($weights as $tid => $weight) {
- if (is_numeric($tid) && is_numeric($weight)) {
- db_query("UPDATE {term_data} SET weight = %d WHERE tid = %d", $weight, $tid);
- }
- }
- }
- exit();
-}
-
-/**
- * AJAX Callback that returns the CSV Output
- */
-function taxonomy_manager_export() {
- $edit = $_POST;
- $depth = empty($edit['depth']) ? NULL : $edit['depth'];
- $output = taxonomy_manager_export_csv($edit['delimiter'], $edit['vid'], $edit['tid'], $depth, array($edit['option'] => TRUE));
- print $output;
- exit();
-}
-
-/**
- * Generates the CVS Ouput
- */
-function taxonomy_manager_export_csv($delimiter = ";", $vid, $selected_tid = 0, $depth = NULL, $options = array()) {
- $tree = taxonomy_manager_export_get_tree($vid, $selected_tid, $depth, $options);
- foreach ($tree as $term) {
- $array = array();
- $array[] = '"'. $term->vid .'"';
- $array[] = '"'. $term->tid .'"';
- $array[] = '"'. $term->name .'"';
- $array[] = '"'. $term->description .'"';
- foreach ($term->parents as $parent) {
- $array[] = '"'. $parent .'"';
- }
- $output .= implode($delimiter, $array) ."\n";
- }
- return $output;
-}
-
-/**
- * Helper for cvs export to get taxonomy tree
- */
-function taxonomy_manager_export_get_tree($vid, $selected_tid, $depth, $options) {
- $tree = array();
-
- if ($options['whole_voc']) {
- $tree = taxonomy_get_tree($vid, 0, -1, $depth);
- }
- else if ($options['children'] && $selected_tid) {
- $tree = taxonomy_get_tree($vid, $selected_tid, -1, $depth);
- }
- else if ($options['root_terms']) {
- $tree = taxonomy_get_tree($vid, 0, -1, 1);
- }
-
- return $tree;
-}
-
-/**
- * Helper function that updates the hierarchy settings of a voc
- */
-function taxonomy_manager_update_voc($vid, $parents = array()) {
- $voc = (array) taxonomy_vocabulary_load($vid);
- if ($voc->vid == $vid) {
- $current_hierarchy = count($parents);
- if ($current_hierarchy > 2) {
- $current_hierarchy = 2;
- }
- if ($current_hierarchy > $voc['hierarchy']) {
- $voc['hierarchy'] = $current_hierarchy;
- taxonomy_save_vocabulary($voc);
- }
- }
-}
-
-/**
- * Retrieve a pipe delimited string of autocomplete suggestions (+synonyms)
- */
-function taxonomy_manager_autocomplete_load($vid, $string = '') {
- // The user enters a comma-separated list of tags. We only autocomplete the last tag.
- $array = drupal_explode_tags($string);
-
- // Fetch last tag
- $last_string = trim(array_pop($array));
- $matches = array();
- if ($last_string != '') {
- $result = db_query_range("SELECT t.name FROM {term_data} t
- LEFT JOIN {term_synonym} s ON t.tid = s.tid
- WHERE t.vid = %d
- AND (LOWER(t.name) LIKE LOWER('%%%s%%') OR LOWER(s.name) LIKE LOWER('%%%s%%'))",
- $vid, $last_string, $last_string, 0, 30);
-
- $prefix = count($array) ? '"'. implode('", "', $array) .'", ' : '';
-
- while ($tag = db_fetch_object($result)) {
- $n = $tag->name;
- // Commas and quotes in terms are special cases, so encode 'em.
- if (strpos($tag->name, ',') !== FALSE || strpos($tag->name, '"') !== FALSE) {
- $n = '"'. str_replace('"', '""', $tag->name) .'"';
- }
- $matches[$prefix . $n] = check_plain($tag->name);
- }
- }
-
- drupal_json($matches);
-}
-
-/**
- * theme function for taxonomy manager form
- */
-function theme_taxonomy_manager_form($form) {
- $pager = theme('pager', NULL, TAXONOMY_MANAGER_TREE_PAGE_SIZE, 0);
- $tree = drupal_render($form['taxonomy']);
- $term_data = drupal_render($form['term_data']);
- $top = drupal_render($form);
- $output = $top . $pager;
- $output .= '<div id="taxonomy-manager" class="admin clear-block">';
- $output .= '<div id="taxonomy-manager-tree-outer-div" class="left clear-block">';
- $output .= $tree;
- $output .= '</div>';
- $output .= '<div id="taxonomy-term-data" class="right clear-block">';
- $output .= is_array($form['term_data']['tid']) ? $term_data : '';
- $output .= '</div>';
- $output .= '</div>';
-
- return $output;
-}
-
-/**
- * theme function for taxonomy manager form
- */
-function theme_taxonomy_manager_double_tree_form($form) {
- $pager = theme('pager', NULL, TAXONOMY_MANAGER_TREE_PAGE_SIZE, 0);
- $tree1 = drupal_render($form['taxonomy']);
- $tree2 = drupal_render($form['taxonomy2']);
- $operations = drupal_render($form['double-tree']);
- $term_data = drupal_render($form['term_data']);
- $top = drupal_render($form);
- $output = $top . $pager;
- $output .= '<div id="taxonomy-manager" class="admin clear-block">';
- $output .= '<div id="taxonomy-manager-tree-outer-div" class="left clear-block">';
- $output .= $tree1;
- $output .= '</div>';
-
- $output .= '<div id="taxonomy-manager-double-tree-operations">';
- $output .= $operations;
- $output .= '</div>';
-
- $output .= '<div id="taxonomy2-manager-tree-outer-div" class="left clear-block">';
- $output .= $tree2;
- $output .= '</div>';
- $output .= '<div id="taxonomy-term-data" class="term-data-overlay">';
- $output .= is_array($form['term_data']['tid']) ? $term_data : '';
- $output .= '</div>';
- $output .= '</div>';
-
- return $output;
-}
-
-/**
- * themes a real button form type (no form submit)
- */
-function theme_no_submit_button($element) {
- // Make sure not to overwrite classes.
- if (isset($element['#attributes']['class'])) {
- $element['#attributes']['class'] = 'form-'. $element['#button_type'] .' '. $element['#attributes']['class'];
- }
- else {
- $element['#attributes']['class'] = 'form-'. $element['#button_type'];
- }
-
- return '<input type="button" '. (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ') .'id="'. $element['#id'] .'" value="'. check_plain($element['#value']) .'" '. drupal_attributes($element['#attributes']) ." />\n";
-}
-
-/**
- * themes a image type button
- */
-function theme_taxonomy_manager_image_button($element) {
-
- //Make sure not to overwrite classes
- if (isset($element['#attributes']['class'])) {
- $element['#attributes']['class'] = 'form-'. $element['#button_type'] .' '. $element['#attributes']['class'];
- }
- else {
- $element['#attributes']['class'] = 'form-'. $element['#button_type'];
- }
-
- // here the novelty begins: check if #button_type is normal submit button or image button
- $return_string = '<input ';
- if ($element['#button_type'] == 'image') {
- $return_string .= 'type="image" ';
- }
- else {
- $return_string .= 'type="submit" ';
- }
- $return_string .= (empty($element['#id']) ? '' : 'id="'. $element['#id'] .'" ');
- $return_string .= (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ');
- $return_string .= 'value="'. check_plain($element['#value']) .'" ';
- $return_string .= drupal_attributes($element['#attributes']) ." />\n";
-
- return $return_string;
-
-}
-
-function theme_taxonomy_manager_term_data_extra($element) {
- $rows = array();
- $headers = array();
- foreach (element_children($element['headers']) as $key) {
- if (is_array($element['headers'][$key])) {
- $headers[] = drupal_render($element['headers'][$key]);
- }
- }
- foreach ($element['data'] as $tid => $entries) {
- $row = array();
- foreach (element_children($element['data'][$tid]) as $key) {
- if (is_array($element['data'][$tid][$key])) {
- $row[] = array(
- 'data' => drupal_render($element['data'][$tid][$key]),
- 'class' => $element['data'][$tid][$key]['#row-class'],
- 'id' => $element['data'][$tid][$key]['#row-id'],
- );
- }
- }
- $rows[] = $row;
- }
- $row = array();
- foreach (element_children($element['op']) as $key) {
- if (is_array($element['op'][$key])) {
- $row[] = drupal_render($element['op'][$key]);
- }
- }
- $rows[] = $row;
- return theme('table', $headers, $rows);
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.info b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.info
deleted file mode 100644
index 95fdcc8..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.info
+++ /dev/null
@@ -1,12 +0,0 @@
-; $Id$
-name = Taxonomy Manager
-description = Tool for administrating taxonomy terms.
-core = "6.x"
-dependencies[] = taxonomy
-
-; Information added by drupal.org packaging script on 2010-02-05
-version = "6.x-2.2"
-core = "6.x"
-project = "taxonomy_manager"
-datestamp = "1265405707"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.install b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.install
deleted file mode 100644
index 8d5db11..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.install
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-// $Id: $
-
-/**
- * @file defines necessary schema the Taxonomy Manager
- */
-
-/**
- * Implementation of hook_install
- */
-function taxonomy_manager_install() {
- drupal_install_schema('taxonomy_manager');
-}
-
-/**
- * Implementation of hook_uninstall
- */
-function taxonomy_manager_uninstall() {
- drupal_uninstall_schema('taxonomy_manager');
-}
-
-/**
- * Implementation of hook_schema()
- */
-function taxonomy_manager_schema() {
- $schema['taxonomy_manager_merge'] = array(
- 'fields' => array(
- 'main_tid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
- 'merged_tid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
- ),
- 'primary key' => array('merged_tid'),
- );
- return $schema;
-}
-
-/**
- * Implementation of hook_update_N().
- *
- * just run through the update process so that the menu and theme registry cache gets cleared
- */
-function taxonomy_manager_update_6001() {
- return array();
-}
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.module b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.module
deleted file mode 100755
index a8bd67d..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/taxonomy_manager.module
+++ /dev/null
@@ -1,1136 +0,0 @@
-<?php
-
-// $Id: taxonomy_manager.module,v 1.5.2.17.2.14.2.16 2010/01/30 15:52:57 mh86 Exp $
-
-/**
- *
- * @file
- * Taxonomy Manager
- *
- * Administration interface for managing taxonomy vocabularies
- *
- */
-
-
-/**
- * Implementation of hook_menu
- */
-function taxonomy_manager_menu() {
-
- $items['admin/content/taxonomy_manager'] = array(
- 'title' => 'Taxonomy Manager',
- 'description' => 'Administer vocabularies with the Taxonomy Manager',
- 'page callback' => 'taxonomy_manager_voc_list',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_NORMAL_ITEM,
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['admin/content/taxonomy_manager/childform'] = array(
- 'page callback' => 'taxonomy_manager_tree_build_child_form',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- );
-
- $items['admin/content/taxonomy_manager/weight'] = array(
- 'page callback' => 'taxonomy_manager_update_weights',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['admin/content/taxonomy_manager/termdata'] = array(
- 'page callback' => 'taxonomy_manager_update_term_data_form',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['admin/content/taxonomy_manager/siblingsform'] = array(
- 'page callback' => 'taxonomy_manager_tree_build_siblings_form',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- );
-
- $items['admin/content/taxonomy_manager/termdata/edit'] = array(
- 'page callback' => 'taxonomy_manager_term_data_edit',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['admin/content/taxonomy_manager/export'] = array(
- 'page callback' => 'taxonomy_manager_export',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['admin/content/taxonomy_manager/double-tree/edit'] = array(
- 'page callback' => 'taxonomy_manager_double_tree_edit',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['admin/content/taxonomy_manager/voc'] = array(
- 'title' => 'Taxonomy Manager',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('taxonomy_manager_form'),
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
- $items['admin/content/taxonomy_manager/double-tree'] = array(
- 'title' => 'Taxonomy Manager',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('taxonomy_manager_double_tree_form'),
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['admin/settings/taxonomy_manager'] = array(
- 'title' => 'Taxonomy Manager',
- 'description' => 'Advanced settings for the Taxonomy Manager',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('taxonomy_manager_settings'),
- 'access arguments' => array('administer site configuration'),
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['admin/content/taxonomy_manager/toolbar/form'] = array(
- 'page callback' => 'taxonomy_manager_toolbar_forms',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
-
- $items['taxonomy_manager/autocomplete'] = array(
- 'title' => 'Taxonomy Manager Autocomplete',
- 'page callback' => 'taxonomy_manager_autocomplete_load',
- 'access arguments' => array('administer taxonomy'),
- 'type' => MENU_CALLBACK,
- 'file' => 'taxonomy_manager.admin.inc',
- );
- return $items;
-}
-
-/**
- * Implementation of hook_menu_alter
- */
-function taxonomy_manager_menu_alter(&$callbacks) {
- if (!variable_get('taxonomy_manager_disable_merge_redirect', TRUE)) {
- $callbacks['taxonomy/term/%']['page callback'] = 'taxonomy_manager_term_page';
- }
-}
-
-/**
- * Implementation of hook_theme
- */
-function taxonomy_manager_theme() {
- return array(
- 'taxonomy_manager_form' => array(
- 'arguments' => array('form'),
- ),
- 'taxonomy_manager_double_tree_form' => array(
- 'arguments' => array('form'),
- ),
- 'no_submit_button' => array(
- 'arguments' => array('element'),
- ),
- 'taxonomy_manager_image_button' => array(
- 'arguemnts' => array('element'),
- ),
- 'taxonomy_manager_tree' => array(
- 'arguments' => array('element'),
- ),
- 'taxonomy_manager_tree_elements' => array(
- 'arguments' => array('element'),
- ),
- 'taxonomy_manager_tree_checkbox' => array(
- 'arguments' => array('element'),
- ),
- 'taxonomy_manager_tree_radio' => array(
- 'arguments' => array('element'),
- ),
- 'taxonomy_manager_term_data_extra' => array(
- 'arguments' => array('element'),
- ),
- );
-}
-
-/**
- * Implementation of hook_help().
- */
-function taxonomy_manager_help($path, $arg) {
- switch ($path) {
- case 'admin/help#taxonomy_manager':
- $output = t('The Taxonomy Manager provides an additional interface for managing vocabularies of the taxonomy module. It\'s especially very useful for long sets of terms.
- The vocabulary is represented in a dynamic tree view.
- It supports operation like mass adding and deleting of terms, fast weight editing, moving of terms in hierarchies, merging of terms and fast term data editing.
- For more information on how to use please read the readme file included in the taxonomy_manager directory.');
- return $output;
- }
-}
-
-/**
- * function gets called by the taxonomy_manager_tree form type ('taxonomy_manager_'. form_id .'_operations')
- * return an form array with values to show next to every term value
- */
-function taxonomy_manager_taxonomy_manager_tree_operations($term) {
- $form = array();
- if (!variable_get('taxonomy_manager_disable_mouseover', 0)) {
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
- if (_taxonomy_manager_tree_term_children_count($term->tid) > 0) {
- $form['select_all'] = array('#weight' => -1, '#value' => '<span class="select-all-children" title="'. t("Select all children") .'"> </span>');
- }
- $form['up'] = array('#value' => theme("image", $module_path ."images/go-up-small.png", "go up", t("Move up"), array('class' => 'term-up')));
- $form['down'] = array('#value' => theme("image", $module_path ."images/go-down-small.png", "go down", t("Move down"), array('class' => 'term-down')));
- $link_img = theme("image", $module_path ."images/link-small.png", "link to term page");
- $link = l(' '. $link_img, taxonomy_term_path($term), array('attributes' => array('rel' => 'tag', 'title' => t("Go to term page"), 'target' => '_blank'), 'html' => TRUE));
- $form['link'] = array('#value' => $link, '#weight' => 10);
- }
- return $form;
-}
-
-/**
- * function gets called by taxonomy_manager_tree form type ('taxonomy_manager_'. form_id .'_link')
- * and returns an link, where to go, when a term gets clicked
- *
- * @param $vid vocabulary id
- */
-function taxonomy_manager_taxonomy_manager_tree_link($term) {
- return "admin/content/taxonomy_manager/termdata/". $term->vid ."/". $term->tid;
-}
-
-function taxonomy_manager_taxonomy2_manager_tree_operations($term) {
- return taxonomy_manager_taxonomy_manager_tree_operations($term);
-}
-function taxonomy_manager_taxonomy2_manager_tree_link($term) {
- return taxonomy_manager_taxonomy_manager_tree_link($term);
-}
-
-/**
- * sets / updates cache for merging history
- */
-function taxonomy_manager_merge_history_update_cache() {
- $merged_terms = array();
-
- $result = db_query("SELECT * FROM {taxonomy_manager_merge}");
- while ($data = db_fetch_object($result)) {
- $merged_terms[$data->merged_tid] = $data->main_tid;
- }
- cache_set('taxonomy_manager_merge', $merged_terms, 'cache');
-}
-
-/**
- * helper function for getting out the main term of former merged term (which no
- * long exists)
- *
- * @param $tid of which the main term has to be evaluated
- * @return term id of main term, if exists, else 0
- */
-function taxonomy_manager_merge_get_main_term($tid) {
- $merged_terms = array();
- $cache = cache_get('taxonomy_manager_merge', 'cache');
- if (!$cache) {
- taxonomy_manager_merge_history_update_cache();
- }
- $merged_terms = $cache->data;
- return $merged_terms[$tid];
-}
-
-/**
- * menu callback
- *
- * replaces taxonomy_mangager_term_page, because we have to consider that the
- * url may contain former merged terms, which no longer exists
- * every given tid gets checked, if it has been merged. if yes, the tid gets replaced
- * with tid of main term and afterwards passed to default taxonomy_manager_term_page
- *
- * @param $str_tids
- * @param $depth
- * @param $op
- */
-function taxonomy_manager_term_page($str_tids = '', $depth = 0, $op = 'page') {
- $tids = taxonomy_terms_parse_string($str_tids);
- if ($tids['operator'] == 'and' || $tids['operator'] == 'or') {
- $new_tids = array();
- foreach ($tids['tids'] as $tid) {
- //get cached main term, if not merged, returns 0
- $main_term = taxonomy_manager_merge_get_main_term($tid);
- $new_tids[] = ($main_term) ? $main_term : $tid;
- }
- if ($tids['operator'] == 'and') {
- $operator = ',';
- }
- else if ($tids['operator'] == 'or') {
- $operator = '+';
- }
- $new_tids_str = implode($operator, $new_tids);
- if (!function_exists('taxonomy_term_page')) {
- /**
- * including the taxonomy.pages.inc file shouldn't be necessary, because
- * TaxMan is correctly using hook_menu_alter to change the callback.
- * but in some combinations with other modules, which overwrite the menu
- * entry in hook_menu, calling taxonomy_term_page is causing an error.
- * the following lines are going to prevent the fatal error
- */
- $taxonomy_module_path = drupal_get_path('module', 'taxonomy');
- include_once($taxonomy_module_path .'/taxonomy.pages.inc');
- }
- return taxonomy_term_page($new_tids_str, $depth, $op);
- }
- else {
- drupal_not_found();
- }
-}
-
-
-
-/******************************************
- * TAXONOMY TREE FORM ELEMENT DEFINITION
- *
- * how to use:
- * $form['name'] = array(
- * '#type' => 'taxonomy_manager_tree',
- * '#vid' => $vid,
- * );
- *
- * additional parameter:
- * #pager: TRUE / FALSE,
- * whether to use pagers (drupal pager, load of nested children, load of siblings)
- * or to load the whole tree on page generation
- * #parent: only children on this parent will be loaded
- * #term_to_expand: loads and opens the first path to a given term id
- * #siblings_page: current page for loading pf next siblings, internal use
- * #default_value: an array of term ids, which get selected by default
- * #render_whole_tree: set this option to TRUE, if you have defined a parent for the tree and you want
- * the the tree is fully rendered
- * #add_term_info: if TRUE, hidden form values with the term id and weight are going to be added
- * #expand_all: if TRUE, all elements are going to be expanded by default
- * #multiple: if TRUE the tree will contain checkboxes, otherwise radio buttons
- * #tree_is_required: use #tree_is_required instead of #required if you are using the tree within an other
- * element and don't want that both are internally required, because it might cause that
- * error messages are shown twice (see content_taxonomy_tree)
- * #language lang code if i18n is enabled and multilingual vocabulary
- *
- * defining term operations:
- * to add values (operations,..) to each term, add a function, which return a form array
- * 'taxonomy_manager_'. $tree_form_id .'_operations'
- *
- * how to retrieve selected values:
- * selected terms ids are available in validate / submit function in
- * $form_values['name']['selected_terms'];
- *
- ******************************************/
-
-/**
- * Implementation of hook_elements
- */
-function taxonomy_manager_elements() {
- $type['taxonomy_manager_tree'] = array(
- '#input' => TRUE,
- '#process' => array('taxonomy_manager_tree_process_elements'),
- '#tree' => TRUE,
- );
-
- return $type;
-}
-
-/**
- * Processes the tree form element
- *
- * @param $element
- * @return the tree element
- */
-function taxonomy_manager_tree_process_elements($element) {
- global $_taxonomy_manager_existing_ids; //TEMP: seems like this functions gets called twice in preview and cause problem because of adding the settings to js twice
- $_taxonomy_manager_existing_ids = is_array($_taxonomy_manager_existing_ids) ? $_taxonomy_manager_existing_ids : array();
-
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
- $id = form_clean_id(implode('-', $element['#parents']));
- $vid = $element['#vid'];
-
- if (!$element['#siblings_page'] && !in_array($id, $_taxonomy_manager_existing_ids)) {
- $_taxonomy_manager_existing_ids[$id] = $id;
- drupal_add_css($module_path .'css/taxonomy_manager.css');
- drupal_add_js($module_path .'js/tree.js');
-
- drupal_add_js(array('siblingsForm' => array('url' => url('admin/content/taxonomy_manager/siblingsform'), 'modulePath' => $module_path)), 'setting');
- drupal_add_js(array('childForm' => array('url' => url('admin/content/taxonomy_manager/childform'), 'modulePath' => $module_path)), 'setting');
- drupal_add_js(array('taxonomytree' => array('id' => $id, 'vid' => $vid)), 'setting');
- }
-
- if (!is_array($element['#operations'])) {
- $opertions_callback = 'taxonomy_manager_'. implode('_', $element['#parents']) .'_operations';
- if (function_exists($opertions_callback)) {
- $element['#operations_callback'] = $opertions_callback;
- }
- }
- if (!isset($element['#link'])) {
- $link_callback = 'taxonomy_manager_'. implode('_', $element['#parents']) .'_link';
- if (function_exists($link_callback)) {
- $element['#link_callback'] = $link_callback;
- }
- }
-
-
- $tree = _taxonomy_manager_tree_get_item($element['#vid'], $element['#parent'], $element['#pager'], $element['#siblings_page'], $element['#search_string'], $element['#language']);
-
- if ($element['#pager'] && !($element['#parent'] || $element['#siblings_page'])) {
- $element['pager'] = array('#value' => theme('pager', NULL, variable_get('taxonomy_manager_pager_tree_page_size', 50)));
- }
-
- $element['#default_value'] = is_array($element['#default_value']) ? $element['#default_value'] : array();
- $element['#multiple'] = isset($element['#multiple']) ? $element['#multiple'] : TRUE;
- $element['#add_term_info'] = isset($element['#add_term_info']) ? $element['#add_term_info'] : TRUE;
- $element['#tree'] = TRUE;
- $element['#id'] = $id;
- $element['#element_validate'] = array('taxonomy_manager_tree_validate');
- $element['#required'] = isset($element['#tree_is_required']) ? $element['#tree_is_required'] : FALSE;
-
- $terms_to_expand = array();
- if ($element['#term_to_expand']) {
- _taxonomy_manager_tree_get_first_path($element['#term_to_expand'], $tree, $terms_to_expand);
- $terms_to_expand = taxonomy_manager_tree_get_terms_to_expand($tree, array($element['#term_to_expand']), TRUE);
- }
-
- if (count($element['#default_value']) && !$element['#expand_all']) {
- $terms_to_expand = taxonomy_manager_tree_get_terms_to_expand($tree, $element['#default_value'], $element['#multiple']);
- }
-
- if (!empty($element['#language'])) {
- $element['#elements']['language'] = array('#type' => 'hidden', '#value' => $element['#language'], '#attributes' => array('class' => 'tree-lang'));
- _taxonomy_manager_tree_element_set_params($element['#parents'], $element['#elements']);
- }
-
- taxonomy_manager_tree_build_form($index = 0, $tree, $element['#elements'], $element, $element['#parents'], $element['#siblings_page'], $element['#default_value'], $element['#multiple'], $terms_to_expand);
-
- return $element;
-}
-
-/**
- * loads tree with terms (depending on various settings)
- *
- * @param $vid
- * @param $parent
- * @param $pager
- * @param $siblings_page
- * @return array with term elements
- */
-function _taxonomy_manager_tree_get_item($vid, $parent = 0, $pager = FALSE, $siblings_page = 0, $search_string = NULL, $language_code = NULL) {
- $tree = array();
- if (module_exists('i18ntaxonomy') && $language_code != "") {
- return _taxonomy_manager_tree_get_translated_item($vid, $parent, $pager, $siblings_page, $search_string, $language_code);
- }
- if ($pager) {
- if ($parent || $siblings_page) {
- $start = ($siblings_page-1) * variable_get('taxonomy_manager_pager_tree_page_size', 50);
- $result = db_query_range("SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE vid = %d AND h.parent = %d ORDER BY weight, name", $vid, $parent, $start, variable_get('taxonomy_manager_pager_tree_page_size', 50));
- }
- else {
- if ($search_string) {
- $result = pager_query("SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE vid = %d AND h.parent = 0 AND name LIKE ('%%%s%%') ORDER BY weight, name", variable_get('taxonomy_manager_pager_tree_page_size', 50), 0, NULL, array($vid, $search_string));
- }
- else {
- $result = pager_query("SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE vid = %d AND h.parent = 0 ORDER BY weight, name", variable_get('taxonomy_manager_pager_tree_page_size', 50), 0, NULL, array($vid));
- }
- }
-
- while ($term = db_fetch_object($result)) {
- $term->depth = 0;
- $tree[] = $term;
- }
- }
- else {
- $tree = taxonomy_get_tree($vid, $parent);
- }
- return $tree;
-}
-
-/**
- * loads translated tree with terms (depending on various settings)
- *
- * @param $vid
- * @param $parent
- * @param $pager
- * @param $siblings_page
- * @return array with term elements
- */
-function _taxonomy_manager_tree_get_translated_item($vid, $parent = 0, $pager = FALSE, $siblings_page = 0, $search_string = NULL, $language_code = NULL) {
- $tree = array();
- if ($language_code == "no language") {
- $language_code = ""; //get terms where no language is specified
- }
- if ($pager) {
- if ($parent || $siblings_page) {
- $start = ($siblings_page-1) * variable_get('taxonomy_manager_pager_tree_page_size', 50);
- $result = db_query_range("SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE vid = %d AND h.parent = %d AND t.language = '%s' ORDER BY weight, name", $vid, $parent, $language_code, $start, variable_get('taxonomy_manager_pager_tree_page_size', 50));
- }
- else {
- if ($search_string) {
- $result = pager_query("SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE vid = %d AND h.parent = 0 AND name LIKE ('%%%s%%') AND t.language = '%s' ORDER BY weight, name", variable_get('taxonomy_manager_pager_tree_page_size', 50), 0, NULL, array($vid, $search_string, $language_code));
- }
- else {
- $result = pager_query("SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE vid = %d AND h.parent = 0 AND t.language = '%s' ORDER BY weight, name", variable_get('taxonomy_manager_pager_tree_page_size', 50), 0, NULL, array($vid, $language_code));
- }
- }
-
- while ($term = db_fetch_object($result)) {
- $term->depth = 0;
- $tree[] = $term;
- }
- }
- else {
- $tree = i18ntaxonomy_get_tree($vid, $language_code, $parent);
- }
- return $tree;
-}
-
-/**
- * marks parent terms to expand if a child terms is selected by default
- */
-function taxonomy_manager_tree_get_terms_to_expand($tree, $default_values, $multiple) {
- $terms = array();
- foreach (array_reverse($tree) as $term) {
- if (in_array($term->tid, array_values($default_values)) || in_array($term->tid, $terms)) {
- if (is_array($term->parents)) {
- foreach ($term->parents as $parent) {
- if ($parent) {
- $terms[$parent] = $parent;
- }
- if (!$multiple) {
- break;
- }
- }
- }
- }
- }
-
- return $terms;
-}
-
-/**
- * calculates a path to a certain term and merges it into the tree
- */
-function _taxonomy_manager_tree_get_first_path($tid, &$tree, &$terms_to_expand) {
- $path = array();
- $next_tid = $tid;
-
- $i = 0;
- while ($i < 100) { //prevent infinite loop if inconsistent hierarchy
- $parents = taxonomy_get_parents($next_tid);
- if (count($parents)) {
- //takes first parent
- $parent = array_pop($parents);
- $path[] = $parent;
- $next_tid = $parent->tid;
- if (taxonomy_manager_term_is_root($next_tid)) {
- break;
- }
- }
- else {
- break;
- }
- $i++;
- }
- $path = array_reverse($path);
- $path[] = taxonomy_get_term($tid);
- $root_term = $path[0];
- $root_term_index;
- if (count($path) > 1) {
- foreach ($tree as $index => $term) {
- if ($term->tid == $root_term->tid) {
- $root_term_index = $index;
- break;
- }
- }
- }
- if (isset($root_term_index)) {
- $path_tree = taxonomy_manager_get_partial_tree($path);
- $first_part = array_slice($tree, 0, $root_term_index+1);
- $last_part = array_slice($tree, $root_term_index+1, count($tree));
- $tree = array_merge($first_part, $path_tree, $last_part);
- }
-}
-
-/**
- * helper function to check whether a given term is a root term
- */
-function taxonomy_manager_term_is_root($tid) {
- if (db_affected_rows(db_query("SELECT tid FROM {term_hierarchy} WHERE tid = %d AND parent = 0", $tid)) == 1) {
- return TRUE;
- }
- return FALSE;
-}
-
-/**
- * returns partial tree for a given path
- */
-function taxonomy_manager_get_partial_tree($path, $depth = 0) {
- $tree = array();
- $root_term = $path[$depth];
- $children = taxonomy_get_children($root_term->tid);
- if (isset($path[++$depth])) {
- $next_term = $path[$depth];
- }
- foreach ($children as $key => $child) {
- $child->depth = $depth;
- $child->parents = array(0 => $root_term->tid);
- $tree[] = $child;
- if ($child->tid == $next_term->tid) {
- $tree = array_merge($tree, taxonomy_manager_get_partial_tree($path, $depth));
- }
- }
- return $tree;
-}
-
-/**
- * recursive function for building nested form array
- * with checkboxes and weight forms for each term
- *
- * nested form array are allways appended to parent-form['children']
- *
- * @param $index current index in tree, start with 0
- * @param $tree of terms (generated by taxonomy_get_tree)
- * @return a form array
- */
-function taxonomy_manager_tree_build_form(&$index, $tree, &$form, $root_form, $parents = array(), $page = 0, $default_value = array(), $multiple = TRUE, $terms_to_expand = array()) {
-
- $current_depth = $tree[$index]->depth;
- while ($index < count($tree) && $tree[$index]->depth >= $current_depth) {
- $term = $tree[$index];
-
- $attributes = array();
-
- $this_parents = $parents;
- $this_parents[] = $term->tid;
-
- $value = in_array($term->tid, $default_value) ? 1 : 0;
- if ($value && !$multiple) {
- // Find our direct parent
- $newindex = $index;
- while ($newindex >= 0 && $tree[$newindex]->depth >= $current_depth) {
- $newindex--;
- }
- if ($newindex >= 0) {
- $value = in_array($tree[$newindex]->tid, $terms_to_expand) ? 1 : 0;
- }
- }
- $form[$term->tid]['checkbox'] = array(
- '#type' => ($multiple) ? 'checkbox' : 'radio',
- '#title' => $term->name,
- '#value' => $value,
- '#return_value' => $term->tid,
- '#theme' => ($multiple) ? 'taxonomy_manager_tree_checkbox' : 'taxonomy_manager_tree_radio',
- );
- if (!empty($root_form['#link_callback'])) {
- $link_callback = $root_form['#link_callback'];
- if (function_exists($link_callback)) {
- $form[$term->tid]['checkbox']['#link'] = $link_callback($term);
- }
- }
-
- if ($root_form['#add_term_info']) {
- $form[$term->tid]['weight'] = array('#type' => 'hidden', '#value' => $term->weight, '#attributes' => array('class' => 'weight-form'));
- $form[$term->tid]['tid'] = array('#type' => 'hidden', '#value' => $term->tid, '#attributes' => array('class' => 'term-id'));
- $form[$term->tid]['checkbox']['#extra_info'] = taxonomy_manager_tree_term_extra_info($term);
- }
-
- if (!empty($root_form['#operations_callback'])) {
- $opertions_callback = $root_form['#operations_callback'];
- if (function_exists($opertions_callback)) {
- $form[$term->tid]['operations'] = $opertions_callback($term);
- }
- }
-
- if ($page) {
- if ($index == (variable_get('taxonomy_manager_pager_tree_page_size', 50) - 1) && !isset($tree[$index+1])) {
- $module_path = drupal_get_path('module', 'taxonomy_manager') .'/';
- $form[$term->tid]['has-more-siblings'] = array(
- '#type' => 'markup',
- '#value' => theme("image", $module_path ."images/2downarrow.png", "more", NULL, array('class' => 'load-siblings')),
- );
- $form[$term->tid]['page'] = array(
- '#type' => 'hidden',
- '#value' => $page,
- '#attributes' => array('class' => 'page'),
- );
- $next_count = _taxonomy_manager_tree_get_next_siblings_count($term->vid, $page, $root_form['#parent']);
- $form[$term->tid]['next_count'] = array('#value' => $next_count);
- $form[$term->tid]['#attributes']['class'] .= 'has-more-siblings ';
- }
- }
-
- _taxonomy_manager_tree_element_set_params($this_parents, $form[$term->tid]);
-
- $class = _taxonomy_manager_tree_term_get_class($index, $tree, ($root_form['#expand_all'] || in_array($term->tid, $terms_to_expand)));
- if (!empty($class)) {
- $form[$term->tid]['#attributes']['class'] .= $class;
- }
-
- $index++;
-
- if ($tree[$index]->depth > $current_depth) {
- taxonomy_manager_tree_build_form($index, $tree, $form[$term->tid]['children'], $root_form, array_merge($this_parents, array('children')), $page, $default_value, $multiple, $terms_to_expand);
- }
- }
-}
-
-/**
- * adds #id and #name to all form elements
- *
- * @param $parents
- * @param $form
- */
-function _taxonomy_manager_tree_element_set_params($parents, &$form) {
- foreach (element_children($form) as $field_name) {
- $field_parents = array_merge($parents, array($field_name));
- $form[$field_name]['#tree'] = TRUE;
- $form[$field_name]['#post'] = array();
- $form[$field_name]['#parents'] = $field_parents;
- $form[$field_name]['#id'] = form_clean_id('edit-'. implode('-', $field_parents));
- $form[$field_name]['#name'] = array_shift($field_parents) .'['. implode('][', $field_parents) .']';
- }
-}
-
-/**
- * calculates class type (expandable, lastExpandable) for current element
- *
- * @param $current_index in tree array
- * @param $tree array with terms
- * @return expandable or lastExpandable
- */
-function _taxonomy_manager_tree_term_get_class($current_index, $tree, $expand) {
- $term = $tree[$current_index];
- $next = $tree[++$current_index];
-
- $children = FALSE;
- while ($next->depth > $term->depth) {
- $children = TRUE;
- $next = $tree[++$current_index];
- }
-
- if ($children) {
- if (isset($next->depth) && $next->depth == $term->depth) {
- $class .= ($expand) ? 'collapsable' : 'expandable';
- }
- else {
- $class .= ($expand) ? 'lastCollapsable' : 'lastExpandable';
- }
- }
- else if (_taxonomy_manager_tree_term_children_count($term->tid) > 0) {
- $class .= 'has-children ';
- if ($current_index == count($tree)) {
- $class .= 'lastExpandable';
- }
- else {
- $class .= 'expandable';
- }
- }
- else if ((count($tree) == $current_index) || ($term->depth > $next->depth)) {
- $class = 'last';
- }
-
- return $class;
-}
-
-/**
- * @param $tid
- * @return children count
- */
-function _taxonomy_manager_tree_term_children_count($tid) {
- static $tids = array();
-
- if (!isset($tids[$tid])) {
- $tids[$tid] = db_result(db_query("SELECT COUNT(tid) FROM {term_hierarchy} WHERE parent = %d", $tid));
- }
-
- return $tids[$tid];
-}
-
-/**
-* returns some additional information about the term which gets added to the link title
-*/
-function taxonomy_manager_tree_term_extra_info($term) {
- $extra_info = "";
- $term_children_count = _taxonomy_manager_tree_term_children_count($term->tid);
- $term_parents = taxonomy_get_parents($term->tid);
-
- if ($term_children_count > 0) {
- $extra_info = t('Children Count: ') . $term_children_count;
- }
-
- if (count($term_parents) >= 1) {
- $extra_info .= !empty($extra_info) ? ' | ' : '';
- $extra_info .= t('Direct Parents: ');
- $p_names = array();
- foreach ($term_parents as $p) {
- if ($p->tid != $term->tid) {
- $p_names[] = $p->name;
- }
- }
- $extra_info .= implode(', ', $p_names);
- }
- return $extra_info;
-}
-
-/**
- * calculates number of next siblings if using paging
- *
- * @param $vid
- * @param $page
- * @param $parent
- * @return next page size
- */
-function _taxonomy_manager_tree_get_next_siblings_count($vid, $page, $parent = 0) {
- $count = db_result(db_query("SELECT COUNT(t.tid) FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE vid = %d AND h.parent = %d", $vid, $parent));
- $current_count = variable_get('taxonomy_manager_pager_tree_page_size', 50) * $page;
- $diff = $count - $current_count;
-
- if ($diff > variable_get('taxonomy_manager_pager_tree_page_size', 50)) {
- $diff = variable_get('taxonomy_manager_pager_tree_page_size', 50);
- }
-
- return $diff;
-}
-
-/**
- * callback for generating and rendering nested child forms (AHAH)
- *
- * @param $tree_id
- * @param $parent term id of parent, that is expanded and of which children have to be loaded
- */
-function taxonomy_manager_tree_build_child_form($tree_id, $vid, $parent, $tid = 0) {
- $params = $_GET;
-
- $GLOBALS['devel_shutdown'] = FALSE;
-
- $form_state = array('submitted' => FALSE);
-
- if (isset($tid) && $tid != 0) {
- $language = _taxonomy_manager_term_get_lang($tid);
- }
- else {
- $language = $params['language'];
- }
-
- $child_form = array(
- '#type' => 'taxonomy_manager_tree',
- '#vid' => $vid,
- '#parent' => $parent,
- '#pager' => TRUE,
- '#language' => $language,
- '#term_to_expand' => $tid,
- );
- if (!$root_level) { //TODO ?
- $child_form['#siblings_page'] = 1;
- }
-
- $opertions_callback = 'taxonomy_manager_'. str_replace('-', '_', $tree_id) .'_operations';
- if (function_exists($opertions_callback)) {
- $child_form['#operations_callback'] = $opertions_callback;
- }
-
- $link_callback = 'taxonomy_manager_'. str_replace('-', '_', $tree_id) .'_link';
- if (function_exists($link_callback)) {
- $child_form['#link_callback'] = $link_callback;
- }
-
- _taxonomy_manager_tree_sub_forms_set_parents($tree_id, $parent, $child_form);
-
- //TODO use caching functions
- //$form = form_get_cache($param['form_build_id'], $form_state);
- //form_set_cache($param['form_build_id'], $form, $form_state);
-
- $child_form = form_builder($param['form_id'], $child_form, $form_state);
-
- print drupal_render($child_form);
-
- exit();
-}
-
-/**
- * callback for generating and rendering next siblings terms form (AHAH)
- *
- * @param $tree_id
- * @param $page current page
- * @param $prev_tid last sibling, that appears
- * @param $parent if in hierarchies, parent id
- */
-function taxonomy_manager_tree_build_siblings_form($tree_id, $page, $prev_tid, $parent = 0) {
- $params = $_GET;
- $GLOBALS['devel_shutdown'] = FALSE; //prevent devel queries footprint
- $form_state = array('submitted' => FALSE);
-
- $vid = db_result(db_query("SELECT vid FROM {term_data} WHERE tid = %d", $prev_tid));
-
- $siblings_form = array(
- '#type' => 'taxonomy_manager_tree',
- '#vid' => $vid,
- '#parent' => $parent,
- '#pager' => TRUE,
- '#siblings_page' => $page+1,
- '#language' => $params['language'],
- );
-
- $opertions_callback = 'taxonomy_manager_'. str_replace('-', '_', $tree_id) .'_operations';
- if (function_exists($opertions_callback)) {
- $siblings_form['#operations_callback'] = $opertions_callback;
- }
-
- $link_callback = 'taxonomy_manager_'. str_replace('-', '_', $tree_id) .'_link';
- if (function_exists($link_callback)) {
- $siblings_form['#link_callback'] = $link_callback;
- }
-
- _taxonomy_manager_tree_sub_forms_set_parents($tree_id, $parent, $siblings_form);
-
- $siblings_form = form_builder('taxonomy_manager_form', $siblings_form, $form_state);
-
- $output = drupal_render($siblings_form);
-
- //cutting of <ul> and ending </ul> ... can this be done cleaner?
- $output = drupal_substr($output, 21, -5);
-
- print $output;
- exit();
-}
-
-/**
- * sets parents depending on form_id and hierarchical parents
- *
- * @param $tree_id
- * @param $parent term id
- * @param $form
- */
-function _taxonomy_manager_tree_sub_forms_set_parents($tree_id, $parent, &$form) {
- $tree_ids = explode('-', $tree_id);
- foreach ($tree_ids as $key => $id) {
- $form['#parents'][] = $id;
- }
- if ($parent) {
- $form['#parents'][] = $parent;
- $form['#parents'][] = 'children';
- /*$all_parents = taxonomy_get_parents_all($parent);
- for ($i=count($all_parents)-1; $i >= 0; $i--) {
- $form['#parents'][] = $all_parents[$i]->tid;
- $form['#parents'][] = 'children';
- }*/
- }
-}
-
-/**
- * validates submitted form values
- * checks if selected terms really belong to initial voc, if not --> form_set_error
- *
- * if all is valid, selected values get added to 'selected_terms' for easy use in submit
- *
- * @param $form
- */
-function taxonomy_manager_tree_validate($form, &$form_state) {
- $selected = array();
-
- if ($form['#multiple']) {
- $selected = _taxonomy_manager_tree_get_selected_terms($form['#value']);
- }
- else if (is_numeric($form['#value'])) {
- $selected[$form['#value']] = $form['#value'];
- }
-
- $vid = $form['#vid'];
- foreach ($selected as $tid) {
- if (!_taxonomy_manager_tree_term_valid($tid, $vid)) {
- form_set_error('', t('An illegal choice has been detected. Please contact the site administrator.'));
- }
- }
- form_set_value($form, array('selected_terms' => $selected), $form_state);
-}
-
-/**
- * checks if term id belongs to vocabulary
- *
- * @param $tid term id
- * @param $vid voc id
- * @return true, if term belongs to voc, else false
- */
-function _taxonomy_manager_tree_term_valid($tid, $vid) {
- $term = taxonomy_get_term($tid);
- if ($term->vid != $vid) return FALSE;
- return TRUE;
-}
-
-/**
- * returns term ids of selected checkboxes
- *
- * goes through nested form array recursivly
- *
- * @param $form_values
- * @return an array with ids of selected terms
- */
-function _taxonomy_manager_tree_get_selected_terms($form_values) {
- $tids = array();
- if (is_array($form_values)) {
- foreach ($form_values as $tid => $form_value) {
- if ($form_value['checkbox'] && $tid && ($tid == $form_value['checkbox'])) {
- $tids[$tid] = $tid;
- }
- if (is_array($form_value['children'])) {
- $tids += _taxonomy_manager_tree_get_selected_terms($form_value['children']);
- }
- }
- }
- return $tids;
-}
-
-/**
- * returns language of a term (multilingual voc), if i18ntaxonomy enabled
- */
-function _taxonomy_manager_term_get_lang($tid) {
- if (module_exists('i18ntaxonomy')) {
- return db_result(db_query("SELECT language FROM {term_data} WHERE tid = %d", $tid));
- }
- return "";
-}
-
-/**
- * theme function for root element
- *
- * @param $element
- * @return html output
- */
-function theme_taxonomy_manager_tree($element) {
- $tree = theme('taxonomy_manager_tree_elements', $element['#elements']);
- if ((!$element['#parent'] && !$element['#siblings_page']) || $element['#render_whole_tree']) {
- $output = '<div id="'. $element['#id'] .'">';
- $output .= $tree;
- $output .= '</div>';
- return theme('form_element', $element, $output);
- }
-
- return $tree;
-}
-
-/**
- * recursive theme function for term elements
- *
- * @param $element
- * @return html lists
- */
-function theme_taxonomy_manager_tree_elements($element) {
- $output .= '<ul class="treeview">';
-
- if (is_array($element)) {
- foreach (element_children($element) as $tid) {
- if (is_numeric($tid)) {
- $output .= '<li'. drupal_attributes($element[$tid]['#attributes']) .'>';
- if (strpos($element[$tid]['#attributes']['class'], 'has-children') !== FALSE || is_array($element[$tid]['children'])) {
- $output .= '<div class="hitArea"></div>';
- }
- $output .='<div class="term-line">';
- $output .= drupal_render($element[$tid]['checkbox']);
-
- $output .= '<div class="term-operations" style="display: none;">';
- $output .= drupal_render($element[$tid]['operations']);
- $output .= '</div>';
-
- if (is_array($element[$tid]['weight']) && is_array($element[$tid]['tid'])) {
- $output .= drupal_render($element[$tid]['weight']);
- $output .= drupal_render($element[$tid]['tid']);
- }
-
- if (is_array($element[$tid]['has-more-siblings'])) {
- $output .= '<div class="term-has-more-siblings">';
- $output .= '<div class="term-next-count">next '. drupal_render($element[$tid]['next_count']) .'</div>';
- $output .= '<div class="term-downarrow-img">';
- $output .= drupal_render($element[$tid]['has-more-siblings']);
- $output .= drupal_render($element[$tid]['page']);
- $output .= '</div><div class="clear"></div></div>';
- }
-
- $output .= '</div>';
-
- if (is_array($element[$tid]['children'])) {
- $output .= theme('taxonomy_manager_tree_elements', $element[$tid]['children']);
- }
-
- $output .='</li>';
- }
- }
- }
-
- $output .= "</ul>";
- if (isset($element['language'])) {
- $output .= drupal_render($element['language']);
- }
- return $output;
-}
-
-/**
- * themes a checkbox, where a label can optional contain a link
- */
-function theme_taxonomy_manager_tree_checkbox($element) {
- _form_set_class($element, array('form-checkbox'));
- $checkbox = '<input ';
- $checkbox .= 'type="checkbox" ';
- $checkbox .= 'name="'. $element['#name'] .'" ';
- $checkbox .= 'id="'. $element['#id'] .'" ' ;
- $checkbox .= 'value="'. $element['#return_value'] .'" ';
- $checkbox .= $element['#value'] ? ' checked="checked" ' : ' ';
- $checkbox .= drupal_attributes($element['#attributes']) .' />';
-
- $title = $element['#title'];
- if ($element['#link']) {
- $attr = array();
- $attr["class"] = "term-data-link";
- if (isset($element['#extra_info'])) {
- $attr["title"] = $element['#extra_info'];
- }
- $title = $title = l($title, $element['#link'], array('attributes' => $attr));
- }
- else {
- $title = check_plain($title);
- }
-
- if (!is_null($title)) {
- $checkbox = '<label class="option">'. $checkbox .' '. $title .'</label>';
- }
-
- unset($element['#title']);
- return theme('form_element', $element, $checkbox);
-}
-
-/**
- * themes a radio, where a label can optional contain a link
- */
-function theme_taxonomy_manager_tree_radio($element) {
- _form_set_class($element, array('form-radio'));
- $output = '<input ';
- $output .= 'type="radio" ';
- $output .= 'name="'. $element['#parents'][0] ."[". $element['#parents'][1] ."]" .'" '; //TODO check this
- $output .= 'id="'. $element['#id'] .'" ' ;
- $output .= 'value="'. $element['#return_value'] .'" ';
- $checkbox .= $element['#value'] ? ' checked="checked" ' : ' ';
-
-
- $output .= $element['#value'] ? ' checked="checked" ' : ' ';
- $output .= drupal_attributes($element['#attributes']) .' />';
-
- $title = $element['#title'];
- if ($element['#link']) {
- $title = l($title, $element['#link'], array('attributes' => array("class" => "term-data-link")));
- }
- else {
- $title = check_plain($title);
- }
-
- if (!is_null($title)) {
- $output = '<label class="option">'. $output .' '. $title .'</label>';
- }
-
- unset($element['#title']);
- return theme('form_element', $element, $output);
-}
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/de.po b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/de.po
deleted file mode 100644
index ab12bde..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/de.po
+++ /dev/null
@@ -1,654 +0,0 @@
-# $Id$
-#
-# LANGUAGE translation of Drupal (general)
-# Copyright 2009 NAME <EMAIL at ADDRESS>
-# Generated from files:
-# taxonomy_manager.admin.inc,v 1.1.2.17.2.25 2009/09/05 10:09:41 mh86
-# js/doubleTree.js: n/a
-# taxonomy_manager.module,v 1.5.2.17.2.14.2.15 2009/09/05 10:09:41 mh86
-# tree.js,v 1.4.2.4.2.9.2.13 2009/08/10 13:47:45 mh86
-# taxonomy_manager.info: n/a
-#
-msgid ""
-msgstr "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-11-03 23:51+0100\n"
-"PO-Revision-Date: 2009-11-03 23:54+0100\n"
-"Last-Translator: Thomas Zahreddin <thomas at voicehero.net>\n"
-"Language-Team: German\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: Germany\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: taxonomy_manager.admin.inc:17
-msgid "Add new vocabulary"
-msgstr "Neues Vokabular hinzufügen"
-
-#: taxonomy_manager.admin.inc:18
-msgid "Edit vocabulary settings"
-msgstr "Wortschatz-Einstellungen bearbeiten"
-
-#: taxonomy_manager.admin.inc:27
-msgid "No Vocabularies available"
-msgstr "Keine Vokabulare vorhanden."
-
-#: taxonomy_manager.admin.inc:29
-msgid "Vocabularies:"
-msgstr "Vokabulare"
-
-#: taxonomy_manager.admin.inc:62
-msgid "Taxonomy Manager - %voc_name"
-msgstr "Taxonomy Manager -%voc_name"
-
-#: taxonomy_manager.admin.inc:65
-msgid "No vocabulary with this ID available! Check this <a href=\"!list\">list</a> for available vocabularies or <a href=\"!create\">create</a> a new one"
-msgstr "Kein Vokabular mit dieser ID vorhanden. Aktivieren Sie diese <a href=\\\"!list\\\">Liste</a> der verfügbaren Vokabularien oder <a href=\\\"!create\\\">erstellen</a> Sie ein neues"
-
-#: taxonomy_manager.admin.inc:75
-msgid "No terms available"
-msgstr "Keine Begriffe vorhanden."
-
-#: taxonomy_manager.admin.inc:111;342;931;1056
-msgid "Language"
-msgstr "Sprache"
-
-#: taxonomy_manager.admin.inc:113;344
-msgid "All"
-msgstr "Alle"
-
-#: taxonomy_manager.admin.inc:113;344
-msgid "no language"
-msgstr "Keine Sprache"
-
-#: taxonomy_manager.admin.inc:119;119;350;350
-msgid "Resize tree"
-msgstr "Baum in der Größe anpassen"
-
-#: taxonomy_manager.admin.inc:130
-msgid ""
-"You can search directly for exisiting terms. \n"
-" If your input doesn't match an existing term, it will be used for filtering root level terms (useful for non-hierarchical vocabularies)."
-msgstr "Sie können sich direkt nach bestehenden Begriffen durchsuchen. \n"
-" Wenn Ihre Eingabe keinem bestehenden Begriff entspricht, wird er für die Filterung ab der Root-Ebene Begriffe verwendet werden (nützlich für nicht-hierarchische Vokabularien)."
-
-#: taxonomy_manager.admin.inc:136;154;1091
-msgid "Search"
-msgstr "Suchen"
-
-#: taxonomy_manager.admin.inc:145
-msgid "Search String"
-msgstr "Suchmuster"
-
-#: taxonomy_manager.admin.inc:158
-msgid "Include synonyms"
-msgstr "Enthaltene Synonyme"
-
-#: taxonomy_manager.admin.inc:159
-msgid "Search under selected terms"
-msgstr "[fuzzy] Die Begriffe nach denen gesucht werden soll."
-
-#: taxonomy_manager.admin.inc:163
-msgid "Search within selected language"
-msgstr "Innerhalb einer bestimmten Gruppe suchen"
-
-#: taxonomy_manager.admin.inc:168
-msgid "Search options"
-msgstr "Einstellungen für die Suche"
-
-#: taxonomy_manager.admin.inc:174
-msgid "Toolbar"
-msgstr "Werkzeugleiste"
-
-#: taxonomy_manager.admin.inc:181
-msgid "Up"
-msgstr "nach oben"
-
-#: taxonomy_manager.admin.inc:189
-msgid "Down"
-msgstr "Herunter"
-
-#: taxonomy_manager.admin.inc:196;458;1266
-msgid "Delete"
-msgstr "Löschen"
-
-#: taxonomy_manager.admin.inc:210;523;1011;1077
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: taxonomy_manager.admin.inc:216;646
-msgid "Move"
-msgstr "Verschieben"
-
-#: taxonomy_manager.admin.inc:224;585
-msgid "Merge"
-msgstr "Zusammenlegen"
-
-#: taxonomy_manager.admin.inc:231;681
-msgid "CSV Export"
-msgstr "CSV-Export"
-
-#: taxonomy_manager.admin.inc:237
-msgid "Double Tree"
-msgstr "Doppelter Baum"
-
-#: taxonomy_manager.admin.inc:277;817
-msgid "Save changes"
-msgstr "Änderungen speichern"
-
-#: taxonomy_manager.admin.inc:307;774
-msgid "Disable Double Tree"
-msgstr "Kein Doppelter Baum"
-
-#: taxonomy_manager.admin.inc:367
-msgid "Move right"
-msgstr "Nach rechts Verschieben"
-
-#: taxonomy_manager.admin.inc:376
-msgid "Move left"
-msgstr "Nach links Verschieben"
-
-#: taxonomy_manager.admin.inc:385
-msgid "Switch selected terms and its children to the right voc"
-msgstr "Ausgewählte Begriffe und ihre Unterbegriffe in das rechte Vokabular "
-
-#: taxonomy_manager.admin.inc:387
-msgid "Switch selected terms and its children to the left voc"
-msgstr "Ausgewählte Begriffe und ihre Unterbegriffe in das linke Vokabular "
-
-#: taxonomy_manager.admin.inc:393
-msgid "Add Translation"
-msgstr "Übersetzung hinzufügen"
-
-#: taxonomy_manager.admin.inc:438
-msgid "Confirmation"
-msgstr "Bestätigung"
-
-#: taxonomy_manager.admin.inc:441
-msgid "Are you sure you want to delete all selected terms? "
-msgstr "Sind Sie sicher, dass Sie auf alle ausgewählten Begriffe löschen wollen? "
-
-#: taxonomy_manager.admin.inc:442
-msgid "Remember all term specific data will be lost. This action cannot be undone."
-msgstr "Denken Sie daran, dass alle Daten des Begriffes verloren gehen. Diese Aktion kann nicht rückgängig gemacht werden."
-
-#: taxonomy_manager.admin.inc:447
-msgid "Delete children of selected terms, if there are any"
-msgstr "Löscht auch die Unterbegriffe von ausgewählten Begriffen."
-
-#: taxonomy_manager.admin.inc:452;578;639
-msgid "Options"
-msgstr "Optionen"
-
-#: taxonomy_manager.admin.inc:467;529;593;653;728;780;1267
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: taxonomy_manager.admin.inc:492
-msgid "If you have selected one or more terms in the tree view, the new terms are automatically children of those."
-msgstr "Wenn Sie einen oder mehrere Begriffe in der Baumansicht ausgewählt haben, sind die neuen Begriffe automatisch Unterbegriffe dazu."
-
-#: taxonomy_manager.admin.inc:498
-msgid "Add new terms"
-msgstr "Hinzufügen neuer Begriffe"
-
-#: taxonomy_manager.admin.inc:510
-msgid "Mass term import (with textarea)"
-msgstr "Begriff in großer Zahl importieren (mit textarea)"
-
-#: taxonomy_manager.admin.inc:516
-msgid "Terms"
-msgstr "Begriffe"
-
-#: taxonomy_manager.admin.inc:517
-msgid "One term per line"
-msgstr "Ein Begriff pro Zeile"
-
-#: taxonomy_manager.admin.inc:550
-msgid ""
-"The selected terms get merged into one term. \n"
-" This resulting merged term can either be an exisiting term or a completely new term. \n"
-" The selected terms will automatically get synomyms of the merged term and will be deleted afterwards."
-msgstr "Die ausgewählten Begriffe zu einem Begriff zusammenfassen. \n"
-" Die hieraus resultierende fusionierte Begriff kann entweder eine bestehende Begriff oder eine völlig neuer sein. \n"
-" Die ausgewählten Begriffe werden automatisch Synonyme des fusionierten Begriffs."
-
-#: taxonomy_manager.admin.inc:558
-msgid "Merging of terms"
-msgstr "Verschmelzung der Begriffe"
-
-#: taxonomy_manager.admin.inc:564
-msgid "Resulting merged term"
-msgstr "Resultierende fusionierte Begriff"
-
-#: taxonomy_manager.admin.inc:571
-msgid "Collect all parents of selected terms an add it to the merged term"
-msgstr "Sammeln Sie alle Oberbegriffe von ausgewählten Begriffen und fügen Sie es dem fusionierten Begriff hinzu"
-
-#: taxonomy_manager.admin.inc:572
-msgid "Collect all children of selected terms an add it to the merged term"
-msgstr "Sammeln Sie alle Überbegriffe von ausgewählten Begriffen und fügen Sie es dem fusionierten Begriff hinzu"
-
-#: taxonomy_manager.admin.inc:573
-msgid "Collect all relations of selected terms an add it to the merged term"
-msgstr "Sammeln Sie alle Beziehungen der ausgewählten Begriffen ein fügen Sie es dem fusionierten Begriff"
-
-#: taxonomy_manager.admin.inc:612
-msgid ""
-"You can change the parent of one or more selected terms. \n"
-" If you leave the autocomplete field empty, the term will be a root term."
-msgstr "You can change the parent of one or more selected terms. \n"
-" If you leave the autocomplete field empty, the term will be a root term."
-
-#: taxonomy_manager.admin.inc:619
-msgid "Moving of terms"
-msgstr "Moving of terms"
-
-#: taxonomy_manager.admin.inc:624
-msgid "Separate parent terms with a comma. "
-msgstr "Separate parent terms with a comma. "
-
-#: taxonomy_manager.admin.inc:629
-msgid "Parent term(s)"
-msgstr "Parent term(s)"
-
-#: taxonomy_manager.admin.inc:636
-msgid "Keep old parents and add new ones (multi-parent). Otherwise old parents get replaced."
-msgstr "Keep old parents and add new ones (multi-parent). Otherwise old parents get replaced."
-
-#: taxonomy_manager.admin.inc:688
-msgid "Delimiter for CSV File"
-msgstr "Delimiter for CSV File"
-
-#: taxonomy_manager.admin.inc:693
-msgid "Whole Vocabulary"
-msgstr "Whole Vocabulary"
-
-#: taxonomy_manager.admin.inc:694
-msgid "Child terms of a selected term"
-msgstr "Child terms of a selected term"
-
-#: taxonomy_manager.admin.inc:695
-msgid "Root level terms only"
-msgstr "Root level terms only"
-
-#: taxonomy_manager.admin.inc:699
-msgid "Terms to export"
-msgstr "Terms to export"
-
-#: taxonomy_manager.admin.inc:708
-msgid "Depth of tree"
-msgstr "Depth of tree"
-
-#: taxonomy_manager.admin.inc:709
-msgid "The number of levels of the tree to export. Leave empty to return all levels."
-msgstr "The number of levels of the tree to export. Leave empty to return all levels."
-
-#: taxonomy_manager.admin.inc:714
-msgid "Exported CSV"
-msgstr "Exported CSV"
-
-#: taxonomy_manager.admin.inc:715
-msgid "The generated code will appear here (per AJAX). You can copy and paste the code into a .csv file. The csv has following columns: voc id | term id | term name | description | parent id 1 | ... | parent id n"
-msgstr "The generated code will appear here (per AJAX). You can copy and paste the code into a .csv file. The csv has following columns: voc id | term id | term name | description | parent id 1 | ... | parent id n"
-
-#: taxonomy_manager.admin.inc:722
-msgid "Export now"
-msgstr "Export now"
-
-#: taxonomy_manager.admin.inc:748
-msgid "Double Tree Settings"
-msgstr "Double Tree Settings"
-
-#: taxonomy_manager.admin.inc:749
-msgid "Specify settings for second tree. Choose the same vocabulary if you want to move terms in the hierarchy or if you want to add new translations within a multilingual vocabulary. Choose a different vocabulary if you want to switch terms among these vocabularies."
-msgstr "Specify settings for second tree. Choose the same vocabulary if you want to move terms in the hierarchy or if you want to add new translations within a multilingual vocabulary. Choose a different vocabulary if you want to switch terms among these vocabularies."
-
-#: taxonomy_manager.admin.inc:759
-msgid "Vocabulary for second tree"
-msgstr "Vocabulary for second tree"
-
-#: taxonomy_manager.admin.inc:767
-msgid "Enable Double Tree"
-msgstr "Enable Double Tree"
-
-#: taxonomy_manager.admin.inc:838
-msgid "Error! Your last operation couldn't be performed because of following problem:"
-msgstr "Error! Your last operation couldn't be performed because of following problem:"
-
-#: taxonomy_manager.admin.inc:883
-msgid "Close"
-msgstr "Close"
-
-#: taxonomy_manager.admin.inc:891
-msgid "Name"
-msgstr "Name"
-
-#: taxonomy_manager.admin.inc:901
-msgid "Description"
-msgstr "Description"
-
-#: taxonomy_manager.admin.inc:909
-msgid "Synonyms"
-msgstr "Synonyms"
-
-#: taxonomy_manager.admin.inc:913
-msgid "Relations"
-msgstr "Relations"
-
-#: taxonomy_manager.admin.inc:918
-msgid "Parents"
-msgstr "Parents"
-
-#: taxonomy_manager.admin.inc:925
-msgid "Translations"
-msgstr "Translations"
-
-#: taxonomy_manager.admin.inc:934
-msgid "This term belongs to a multilingual vocabulary. You can set a language for it."
-msgstr "This term belongs to a multilingual vocabulary. You can set a language for it."
-
-#: taxonomy_manager.admin.inc:946
-msgid "Weight"
-msgstr "Weight"
-
-#: taxonomy_manager.admin.inc:951
-msgid "Go to the term page"
-msgstr "Go to the term page"
-
-#: taxonomy_manager.admin.inc:991;1051
-msgid "Remove"
-msgstr "Remove"
-
-#: taxonomy_manager.admin.inc:1092
-msgid "Search field is empty"
-msgstr "Search field is empty"
-
-#: taxonomy_manager.admin.inc:1130
-msgid "Your search string matches exactly one term"
-msgstr "Your search string matches exactly one term"
-
-#: taxonomy_manager.admin.inc:1144
-msgid "Your search string matches !count terms:"
-msgstr "Your search string matches !count terms:"
-
-#: taxonomy_manager.admin.inc:1148
-msgid "No match found. Filtering root level terms starting with @search_string."
-msgstr "No match found. Filtering root level terms starting with @search_string."
-
-#: taxonomy_manager.admin.inc:1149
-msgid "Show unfiltered tree"
-msgstr "Show unfiltered tree"
-
-#: taxonomy_manager.admin.inc:1203
-msgid "Saving terms to language @lang"
-msgstr "Saving terms to language @lang"
-
-#: taxonomy_manager.admin.inc:1216
-msgid "No terms for deleting selected"
-msgstr "No terms for deleting selected"
-
-#: taxonomy_manager.admin.inc:1260
-msgid "Deleting a term will delete all its children if there are any. "
-msgstr "Deleting a term will delete all its children if there are any. "
-
-#: taxonomy_manager.admin.inc:1261
-msgid "This action cannot be undone."
-msgstr "Diese Aktion kann nicht rückgängig gemacht werden."
-
-#: taxonomy_manager.admin.inc:1263
-msgid "Are you sure you want to delete the following terms: "
-msgstr "Are you sure you want to delete the following terms: "
-
-#: taxonomy_manager.admin.inc:1296
-msgid "Please selected terms you want to move in the hierarchy"
-msgstr "Please selected terms you want to move in the hierarchy"
-
-#: taxonomy_manager.admin.inc:1300;1453
-msgid "Warning: Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name"
-msgstr "Warning: Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name"
-
-#: taxonomy_manager.admin.inc:1312
-msgid "Invalid selection. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself."
-msgstr "Invalid selection. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself."
-
-#: taxonomy_manager.admin.inc:1316;1469;1596
-msgid "Terms must be of the same language"
-msgstr "Terms must be of the same language"
-
-#: taxonomy_manager.admin.inc:1412
-msgid "root level"
-msgstr "root level"
-
-#: taxonomy_manager.admin.inc:1417
-msgid "Terms %term_names moved to %parent_names"
-msgstr "Terms %term_names moved to %parent_names"
-
-#: taxonomy_manager.admin.inc:1436
-msgid "Please enter a name into \"Resulting merged term\""
-msgstr "Please enter a name into \"Resulting merged term\""
-
-#: taxonomy_manager.admin.inc:1440
-msgid "Please only enter single names into \"Resulting merged term\""
-msgstr "Please only enter single names into \"Resulting merged term\""
-
-#: taxonomy_manager.admin.inc:1445
-msgid "Please selected terms you want to merge"
-msgstr "Please selected terms you want to merge"
-
-#: taxonomy_manager.admin.inc:1449
-msgid "Please select less than 50 terms to merge. Merging of too many terms in one step can cause timeouts and inconsistent database states"
-msgstr "Please select less than 50 terms to merge. Merging of too many terms in one step can cause timeouts and inconsistent database states"
-
-#: taxonomy_manager.admin.inc:1463
-msgid "Invalid selection. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself. Unselect \"Collect all parents of selected terms an add it to the merged term\" or specify a different resulting term."
-msgstr "Invalid selection. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself. Unselect \"Collect all parents of selected terms an add it to the merged term\" or specify a different resulting term."
-
-#: taxonomy_manager.admin.inc:1497
-msgid "Terms %term_names merged into %main_term"
-msgstr "Terms %term_names merged into %main_term"
-
-#: taxonomy_manager.admin.inc:1537
-msgid "Disable mouse-over effect for terms (weights and direct link)"
-msgstr "Disable mouse-over effect for terms (weights and direct link)"
-
-#: taxonomy_manager.admin.inc:1539
-msgid "Disabeling this feature speeds up the Taxonomy Manager"
-msgstr "Disabeling this feature speeds up the Taxonomy Manager"
-
-#: taxonomy_manager.admin.inc:1543
-msgid "Disable redirect of the taxonomy term page to merged terms "
-msgstr "Disable redirect of the taxonomy term page to merged terms "
-
-#: taxonomy_manager.admin.inc:1545
-msgid "When using the merging feature, the selected terms get merged into one term. All selected terms will be deleted afterwards. Normally the Taxonomy Manager redirects calls to taxonomy/term/$tid of the deleted terms (through merging) to the resulting merged term. This feature might conflict with other modules (e.g. Taxonomy Breadcrumb, Panels), which implement hook_menu_alter to change the taxonomy_manager_term_page callback. Disable this feature if it conflicts with other modules or if you do not need it. Changing this setting requires a (menu) cache flush to become active."
-msgstr "When using the merging feature, the selected terms get merged into one term. All selected terms will be deleted afterwards. Normally the Taxonomy Manager redirects calls to taxonomy/term/$tid of the deleted terms (through merging) to the resulting merged term. This feature might conflict with other modules (e.g. Taxonomy Breadcrumb, Panels), which implement hook_menu_alter to change the taxonomy_manager_term_page callback. Disable this feature if it conflicts with other modules or if you do not need it. Changing this setting requires a (menu) cache flush to become active."
-
-#: taxonomy_manager.admin.inc:1549
-msgid "Pager count"
-msgstr "Pager count"
-
-#: taxonomy_manager.admin.inc:1552
-msgid "Select how many terms should be listed on one page. Huge page counts can slow down the Taxonomy Manager"
-msgstr "Select how many terms should be listed on one page. Huge page counts can slow down the Taxonomy Manager"
-
-#: taxonomy_manager.admin.inc:1592
-msgid "Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name"
-msgstr "Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name"
-
-#: taxonomy_manager.admin.inc:1608;1832
-msgid "Invalid parent. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself."
-msgstr "Invalid parent. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself."
-
-#: taxonomy_manager.admin.inc:1618
-msgid "Please provide only one term for translation"
-msgstr "Please provide only one term for translation"
-
-#: taxonomy_manager.admin.inc:1622
-msgid "Invalid language selection"
-msgstr "Invalid language selection"
-
-#: taxonomy_manager.admin.inc:1626
-msgid "Missing language for new term"
-msgstr "Missing language for new term"
-
-#: taxonomy_manager.admin.inc:1633
-msgid "Invalid language selection. Translation already exists"
-msgstr "Invalid language selection. Translation already exists"
-
-#: taxonomy_manager.admin.inc:1644
-msgid "Invalid language selection."
-msgstr "Invalid language selection."
-
-#: taxonomy_manager.admin.inc:1693
-msgid "Successfully updated parents"
-msgstr "Successfully updated parents"
-
-#: taxonomy_manager.admin.inc:1707
-msgid "Successfully updated related terms"
-msgstr "Successfully updated related terms"
-
-#: taxonomy_manager.admin.inc:1718
-msgid "Successfully updated synonyms"
-msgstr "Successfully updated synonyms"
-
-#: taxonomy_manager.admin.inc:1724
-msgid "Successfully updated weight to !weight"
-msgstr "Successfully updated weight to !weight"
-
-#: taxonomy_manager.admin.inc:1731
-msgid "Successfully updated language"
-msgstr "Successfully updated language"
-
-#: taxonomy_manager.admin.inc:1735;1759
-msgid "Module i18ntaxonomy not enabled"
-msgstr "Module i18ntaxonomy not enabled"
-
-#: taxonomy_manager.admin.inc:1747
-msgid "Successfully added translation"
-msgstr "Successfully added translation"
-
-#: taxonomy_manager.admin.inc:1754
-msgid "Successfully removed translation"
-msgstr "Successfully removed translation"
-
-#: taxonomy_manager.admin.inc:1796
-msgid "Invalid operation."
-msgstr "Invalid operation."
-
-#: taxonomy_manager.admin.inc:1809
-#: js/doubleTree.js:0
-msgid "No terms selected."
-msgstr "No terms selected."
-
-#: taxonomy_manager.admin.inc:1827
-msgid "Terms must be of the same language."
-msgstr "Terms must be of the same language."
-
-#: taxonomy_manager.admin.inc:1864
-msgid "Removed current parent form terms %terms."
-msgstr "Removed current parent form terms %terms."
-
-#: taxonomy_manager.admin.inc:1867
-msgid "Terms %terms moved to parents %parents."
-msgstr "Terms %terms moved to parents %parents."
-
-#: taxonomy_manager.admin.inc:1881
-msgid "Selected terms are of the same language."
-msgstr "Selected terms are of the same language."
-
-#: taxonomy_manager.admin.inc:1888;1896
-msgid "Translation for this language already exists."
-msgstr "Translation for this language already exists."
-
-#: taxonomy_manager.admin.inc:1904
-msgid "This is not a multilingual vocabulary."
-msgstr "This is not a multilingual vocabulary."
-
-#: taxonomy_manager.admin.inc:1909
-msgid "Module i18ntaxonomy not enabled."
-msgstr "Module i18ntaxonomy not enabled."
-
-#: taxonomy_manager.admin.inc:1915
-msgid "Translation for %term2 - %term1 added."
-msgstr "Translation for %term2 - %term1 added."
-
-#: taxonomy_manager.admin.inc:1942
-msgid "Terms %terms moved to vocabulary %voc."
-msgstr "Terms %terms moved to vocabulary %voc."
-
-#: taxonomy_manager.admin.inc:1945
-msgid "Terms %terms moved to vocabulary %voc under parents %parents."
-msgstr "Terms %terms moved to vocabulary %voc under parents %parents."
-
-#: taxonomy_manager.module:169
-msgid ""
-"The Taxonomy Manager provides an additional interface for managing vocabularies of the taxonomy module. It's especially very useful for long sets of terms. \n"
-" The vocabulary is represented in a dynamic tree view. \n"
-" It supports operation like mass adding and deleting of terms, fast weight editing, moving of terms in hierarchies, merging of terms and fast term data editing.\n"
-" For more information on how to use please read the readme file included in the taxonomy_manager directory."
-msgstr "The Taxonomy Manager provides an additional interface for managing vocabularies of the taxonomy module. It's especially very useful for long sets of terms. \n"
-" The vocabulary is represented in a dynamic tree view. \n"
-" It supports operation like mass adding and deleting of terms, fast weight editing, moving of terms in hierarchies, merging of terms and fast term data editing.\n"
-" For more information on how to use please read the readme file included in the taxonomy_manager directory."
-
-#: taxonomy_manager.module:186
-#: js/tree.js:0
-msgid "Select all children"
-msgstr "Select all children"
-
-#: taxonomy_manager.module:188
-msgid "Move up"
-msgstr "Move up"
-
-#: taxonomy_manager.module:189
-msgid "Move down"
-msgstr "Move down"
-
-#: taxonomy_manager.module:191
-msgid "Go to term page"
-msgstr "Go to term page"
-
-#: taxonomy_manager.module:763
-msgid "Children Count: "
-msgstr "Children Count: "
-
-#: taxonomy_manager.module:768
-msgid "Direct Parents: "
-msgstr "Direct Parents: "
-
-#: taxonomy_manager.module:946
-msgid "An illegal choice has been detected. Please contact the site administrator."
-msgstr "An illegal choice has been detected. Please contact the site administrator."
-
-#: taxonomy_manager.module:21;77;85;94
-#: taxonomy_manager.info:0
-msgid "Taxonomy Manager"
-msgstr "Taxonomy Manager"
-
-#: taxonomy_manager.module:22
-msgid "Administer vocabularies with the Taxonomy Manager"
-msgstr "Administer vocabularies with the Taxonomy Manager"
-
-#: taxonomy_manager.module:95
-msgid "Advanced settings for the Taxonomy Manager"
-msgstr "Advanced settings for the Taxonomy Manager"
-
-#: taxonomy_manager.module:110
-msgid "Taxonomy Manager Autocomplete"
-msgstr "Taxonomy Manager Autocomplete"
-
-#: taxonomy_manager.info:0
-msgid "Tool for administrating taxonomy terms."
-msgstr "Tool for administrating taxonomy terms."
-
-#: js/doubleTree.js:0
-msgid "Select one term per tree to add a new translation."
-msgstr "Select one term per tree to add a new translation."
-
-#: js/tree.js:0
-msgid "Unselect all children"
-msgstr "Unselect all children"
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/fr.po b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/fr.po
deleted file mode 100644
index 91eaa2f..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/fr.po
+++ /dev/null
@@ -1,353 +0,0 @@
-# $Id: fr.po,v 1.1.2.1 2009/02/10 15:19:16 slybud Exp $
-#
-# French translation of Drupal (general)
-# Copyright YEAR NAME <EMAIL at ADDRESS>
-# Generated from files:
-# taxonomy_manager.admin.inc: n/a
-# taxonomy_manager.module,v 1.5.2.17.2.10 2008/09/16 12:06:29 mh86
-# taxonomy_manager.info: n/a
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: french translation for drupal taxonomy_manager module\n"
-"POT-Creation-Date: 2009-02-10 11:54+0100\n"
-"PO-Revision-Date: 2009-02-10 16:12+0100\n"
-"Last-Translator: Sylvain Moreau <sylvain.moreau at ows.fr>\n"
-"Language-Team: Sylvain Moreau, OWS <sylvain.moreau at ows.fr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Poedit-Language: French\n"
-
-#: taxonomy_manager.admin.inc:15
-msgid "No Vocabularies available"
-msgstr "Aucun Vocabulaire disponible"
-
-#: taxonomy_manager.admin.inc:17
-msgid "Vocabularies:"
-msgstr "Vocabulaires :"
-
-#: taxonomy_manager.admin.inc:50
-msgid "Taxonomy Manager - %voc_name"
-msgstr "Gestionnaire de Taxonomie - %voc_name"
-
-#: taxonomy_manager.admin.inc:53
-msgid "No vocabulary with this ID available!. "
-msgstr "Aucun vocabulaire avec cet ID disponible !"
-
-#: taxonomy_manager.admin.inc:54
-msgid "Check this !link_list for available vocabularies or !link_create a new one"
-msgstr "Consultez cette !link_list pour les vocabulaires disponibles, ou !link_create pour en créer un nouveau"
-
-#: taxonomy_manager.admin.inc:64
-msgid "No terms available"
-msgstr "Aucun terme disponible"
-
-#: taxonomy_manager.admin.inc:90
-msgid ""
-"You can search directly for exisiting terms. \n"
-" If your input doesn't match an existing term, it will be used for filtering root level terms (useful for non-hierarchical vocabularies)."
-msgstr ""
-"Vous pouvez rechercher directement des termes existant. \n"
-" Si votre saisie ne correspond à aucun terme existant, elle sera utilisée pour filtrer les termes du niveau racine (utile pour les vocabulaires non-hiérarchiques)."
-
-#: taxonomy_manager.admin.inc:96;114;747
-msgid "Search"
-msgstr "Recherche"
-
-#: taxonomy_manager.admin.inc:105
-msgid "Search String"
-msgstr "Chaîne de caractères pour la recherche"
-
-#: taxonomy_manager.admin.inc:120
-msgid "Toolbar"
-msgstr "Barre d'outils"
-
-#: taxonomy_manager.admin.inc:127
-msgid "Up"
-msgstr "Haut"
-
-#: taxonomy_manager.admin.inc:135
-msgid "Down"
-msgstr "Bas"
-
-#: taxonomy_manager.admin.inc:142;285;855
-msgid "Delete"
-msgstr "Supprimer"
-
-#: taxonomy_manager.admin.inc:156;346
-msgid "Add"
-msgstr "Ajouter"
-
-#: taxonomy_manager.admin.inc:162;469
-msgid "Move"
-msgstr "Déplacer"
-
-#: taxonomy_manager.admin.inc:170;408
-msgid "Merge"
-msgstr "Fusionner"
-
-#: taxonomy_manager.admin.inc:177;504
-msgid "CSV Export"
-msgstr "Export CSV"
-
-#: taxonomy_manager.admin.inc:215;582
-msgid "Save changes"
-msgstr "Enregistrer les modifications"
-
-#: taxonomy_manager.admin.inc:265
-msgid "Confirmation"
-msgstr "Confirmation"
-
-#: taxonomy_manager.admin.inc:268
-msgid "Are you sure you want to delete all selected terms? "
-msgstr "Etes-vous sûr(e) de vouloir supprimer tous les termes sélectionnés ?"
-
-#: taxonomy_manager.admin.inc:269
-msgid "Remember all term specific data will be lost. This action cannot be undone."
-msgstr "Rappelez-vous que toutes les données propre au terme seront perdues. Cette action n'est pas réversible."
-
-#: taxonomy_manager.admin.inc:274
-msgid "Delete children of selected terms, if there are any"
-msgstr "Supprimer les enfants des termes sélectionnés, s'ils existent"
-
-#: taxonomy_manager.admin.inc:279;401;462
-msgid "Options"
-msgstr "Options"
-
-#: taxonomy_manager.admin.inc:294;352;416;476;545;856
-msgid "Cancel"
-msgstr "Annuler"
-
-#: taxonomy_manager.admin.inc:315
-msgid "If you have selected one or more terms in the tree view, the new terms are automatically children of those."
-msgstr "Si vous avez sélectionné un ou plusieurs termes dans la vue en arbre, les nouveaux termes seront automatiquement leurs enfants. "
-
-#: taxonomy_manager.admin.inc:321
-msgid "Add new terms"
-msgstr "Ajouter de nouveaux termes"
-
-#: taxonomy_manager.admin.inc:333
-msgid "Mass term import (with textarea)"
-msgstr "Import de masse de termes (avec le champ texte) "
-
-#: taxonomy_manager.admin.inc:339
-msgid "Terms"
-msgstr "Termes"
-
-#: taxonomy_manager.admin.inc:340
-msgid "One term per line"
-msgstr "Un terme par ligne"
-
-#: taxonomy_manager.admin.inc:373
-msgid ""
-"The selected terms get merged into one term. \n"
-" This resulting merged term can either be an exisiting term or a completely new term. \n"
-" The selected terms will automatically get synomyms of the merged term and will be deleted afterwards."
-msgstr ""
-"Les termes sélectionnés sont fusionnés dans un seul terme. \n"
-" Ce terme fusionné résultant peut soit être un terme existant, soit un terme entièrement nouveau.\n"
-" Les termes sélectionnés obtiendront automatiquement les synonymes du terme fusionné et seront supprimes ensuite."
-
-#: taxonomy_manager.admin.inc:381
-msgid "Merging of terms"
-msgstr "Fusion de termes"
-
-#: taxonomy_manager.admin.inc:387
-msgid "Resulting merged term"
-msgstr "Terme fusionné résultant"
-
-#: taxonomy_manager.admin.inc:394
-msgid "Collect all parents of selected terms an add it to the merged term"
-msgstr "Collecter tous les parents des termes sélectionnés et les ajouter au terme fusionné"
-
-#: taxonomy_manager.admin.inc:395
-msgid "Collect all children of selected terms an add it to the merged term"
-msgstr "Collecter tous les enfants des termes sélectionnés et les ajouter au terme fusionné"
-
-#: taxonomy_manager.admin.inc:396
-msgid "Collect all relations of selected terms an add it to the merged term"
-msgstr "Collecter toutes les relations (parents/enfants) des termes sélectionnés et les ajouter au terme fusionné"
-
-#: taxonomy_manager.admin.inc:435
-msgid ""
-"You can change the parent of one or more selected terms. \n"
-" If you leave the autocomplete field empty, the term will be a root term."
-msgstr ""
-"Vous pouvez modifier le parent de un ou plusieurs termes sélectionnés.\n"
-" Si vous laissez vide le champ d'autocomplétion, le terme sera un terme racine."
-
-#: taxonomy_manager.admin.inc:442
-msgid "Moving of terms"
-msgstr "Déplacement de termes"
-
-#: taxonomy_manager.admin.inc:447
-msgid "Separate parent terms with a comma. "
-msgstr "Séparer les termes parents avec une virgule."
-
-#: taxonomy_manager.admin.inc:452
-msgid "Parent term(s)"
-msgstr "Terme(s) parent(s)"
-
-#: taxonomy_manager.admin.inc:459
-msgid "Keep old parents and add new ones (multi-parent). Otherwise old parents get replaced."
-msgstr "Conserver les anciens parents et en ajouter de nouveaux (multi-parent). Autrement, les anciens parents sont remplacés."
-
-#: taxonomy_manager.admin.inc:511
-msgid "Delimiter for CSV File"
-msgstr "Séparateur pour le fichier CSV"
-
-#: taxonomy_manager.admin.inc:516
-msgid "Whole Vocabulary"
-msgstr "Vocabulaire Complet"
-
-#: taxonomy_manager.admin.inc:517
-msgid "Child terms of a selected term"
-msgstr "Termes enfants pour un terme sélectionné"
-
-#: taxonomy_manager.admin.inc:518
-msgid "Root level terms only"
-msgstr "Termes du niveau racine seulement"
-
-#: taxonomy_manager.admin.inc:522
-msgid "Terms to export"
-msgstr "Termes à exporter"
-
-#: taxonomy_manager.admin.inc:531
-msgid "Exported CSV"
-msgstr "Fichier CSV exporté"
-
-#: taxonomy_manager.admin.inc:532
-msgid "The generated code will appear here (per AJAX). You can copy and paste the code into a .csv file. The csv has following columns: voc id | term id | term name | description | parent id 1 | ... | parent id n"
-msgstr "Le code généré apparaîtra ici (en AJAX). Vous pouvez le copier/coller dans un fichier .csv. Le csv possède les colonnes suivantes : voc id | term id | term name | description | parent id 1 | ... | parent id n"
-
-#: taxonomy_manager.admin.inc:539
-msgid "Export now"
-msgstr "Exporter maintenant"
-
-#: taxonomy_manager.admin.inc:636
-msgid "Name"
-msgstr "Nom"
-
-#: taxonomy_manager.admin.inc:646
-msgid "Description"
-msgstr "Description"
-
-#: taxonomy_manager.admin.inc:652
-msgid "Synonyms"
-msgstr "Synonymes"
-
-#: taxonomy_manager.admin.inc:656
-msgid "Relations"
-msgstr "Relations"
-
-#: taxonomy_manager.admin.inc:662
-msgid "Parents"
-msgstr "Parents"
-
-#: taxonomy_manager.admin.inc:672
-msgid "Weight"
-msgstr "Poids"
-
-#: taxonomy_manager.admin.inc:675
-msgid "Go to the term page site"
-msgstr "Aller à la page du site du terme"
-
-#: taxonomy_manager.admin.inc:748
-msgid "Search field is empty"
-msgstr "Le champ de recherche est vide"
-
-#: taxonomy_manager.admin.inc:812
-msgid "No terms for deleting selected"
-msgstr "Aucun terme sélectionné pour la suppression"
-
-#: taxonomy_manager.admin.inc:849
-msgid "Deleting a term will delete all its children if there are any. "
-msgstr "La suppression d'un terme entraînera la suppression de tous ses enfants, s'ils existent."
-
-#: taxonomy_manager.admin.inc:850
-msgid "This action cannot be undone."
-msgstr "Cette action est irréversible."
-
-#: taxonomy_manager.admin.inc:852
-msgid "Are you sure you want to delete the following terms: "
-msgstr "Etes-vous sûr(e) de vouloir supprimer les termes suivants :"
-
-#: taxonomy_manager.admin.inc:879
-msgid "Please selected terms you want to move in the hierarchy"
-msgstr "Veuillez sélectionner les termes que vous souhaitez déplacer au sein de la hiérarchie"
-
-#: taxonomy_manager.admin.inc:921
-msgid "Please enter a name into %title"
-msgstr "Veuillez saisir un nom dans %title"
-
-#: taxonomy_manager.admin.inc:921;925
-msgid "Main term"
-msgstr "Terme principal"
-
-#: taxonomy_manager.admin.inc:925
-msgid "Please only enter single names into %title"
-msgstr "Veuillez saisir seulement des termes uniques dans %title"
-
-#: taxonomy_manager.admin.inc:930
-msgid "Please selected terms you want to merge"
-msgstr "Veuillez sélectionner les termes que vous souhaitez fusionner"
-
-#: taxonomy_manager.admin.inc:934
-msgid "Please select less than 50 terms to merge. Merging to many terms in one step can cause timeouts and inconsistent database states"
-msgstr "Veuillez sélectionner moins de 50 termes à fusionner. La fusion d'un trop grand nombre de termes en une seule fois peut entraîner des arrêts de script et des instabilités d'état de base de données."
-
-#: taxonomy_manager.admin.inc:963
-msgid "Disable mouse-over effect for terms (weights and direct link)"
-msgstr "Désactiver l'effet au survol de la souris pour les termes (poids et lien direct)"
-
-#: taxonomy_manager.admin.inc:965
-msgid "Disabeling this feature speeds up the Taxonomy Manager"
-msgstr "La désactivation de cette fonctionnalité accélère le Gestionnaire de Taxonomie"
-
-#: taxonomy_manager.admin.inc:969
-msgid "Pager count"
-msgstr "Compte de la pagination"
-
-#: taxonomy_manager.admin.inc:972
-msgid "Select how many terms should be listed on one page. Huge page counts can slow down the Taxonomy Manager"
-msgstr "Sélectionnez combien de termes doivent être listés sur une page. Un nombre important d'éléments par page peut ralentir le Gestionnaire de Taxonomie"
-
-#: taxonomy_manager.module:141
-msgid ""
-"The Taxonomy Manager provides an additional interface for managing vocabularies of the taxonomy module. It's especially very useful for long sets of terms. \n"
-" The vocabulary is represented in a dynamic tree view. \n"
-" It supports operation like mass adding and deleting of terms, fast weight editing, moving of terms in hierarchies, merging of terms and fast term data editing.\n"
-" For more information on how to use please read the readme file included in the taxonomy_manager directory."
-msgstr ""
-"Le Gestionnaire de Taxonomie fournit une interface supplémentaire pour administrer les vocabulaires du module taxonomy. Il est particulièrement utile pour les longues séries de termes.\n"
-" Le vocabulaire est representé sous forme de vue dynamique en arbre.\n"
-" Il supporte des opérations telles que l'ajout et la suppression en masse de termes, l'édition rapide des poids, le déplacement des termes au sein des hiérarchies, la fusion de termes, et l'édition rapide des données associées aux termes.\n"
-" Pour plus d'informations sur l'utilisation du module, veuillez lire le fichier readme inclus dans le répertoire taxonomy_manager."
-
-#: taxonomy_manager.module:733
-msgid "An illegal choice has been detected. Please contact the site administrator."
-msgstr "Un choix interdit a été détecté. Veuillez contacter l'administrateur du site."
-
-#: taxonomy_manager.module:21;70;79
-#: taxonomy_manager.info:0
-msgid "Taxonomy Manager"
-msgstr "Taxonomy Manager"
-
-#: taxonomy_manager.module:22
-msgid "Administer vocabularies with the Taxonomy Manager"
-msgstr "Administrer les vocabulaires avec le Gestionnaire de Taxonomie"
-
-#: taxonomy_manager.module:80
-msgid "Advanced settings for the Taxonomy Manager"
-msgstr "Paramètres avancés pour le Gestionnaire de Taxonomie"
-
-#: taxonomy_manager.module:0
-msgid "taxonomy_manager"
-msgstr "taxonomy_manager"
-
-#: taxonomy_manager.info:0
-msgid "Tool for administrating taxonomy terms."
-msgstr "Outil pour administrer les termes de taxonomie."
-
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/ja.po b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/ja.po
deleted file mode 100644
index 9145461..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/ja.po
+++ /dev/null
@@ -1,341 +0,0 @@
-# $Id: ja.po,v 1.1.2.1 2008/10/25 12:22:15 imagine Exp $
-# -----------------------------------------------------------------------------
-# Japanese translation of Drupal (modules-taxonomy_manager)
-#
-# Copyright (c) 2008 Drupal Japan ( http://drupal.jp/ ) /
-# Takafumi ( jp.drupal at imagine **reverse order**)
-#
-# Generated from file:
-# taxonomy_manager.admin.inc: n/a
-# taxonomy_manager.module,v 1.5.2.17.2.10 2008/09/16 12:06:29 mh86
-# taxonomy_manager.info: n/a
-#
-# -----------------------------------------------------------------------------
-msgid ""
-msgstr ""
-"POT-Creation-Date: 2008-09-17 23:11+0900\n"
-"Last-Translator: Takafumi <jp.drupal at imagine **reverse order**>\n"
-"Language-Team: Drupal Japan\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: taxonomy_manager.admin.inc:15
-msgid "No Vocabularies available"
-msgstr "利用ã§ãるボã‚ャブラリã¯ã‚ã‚Šã¾ã›ã‚“"
-
-#: taxonomy_manager.admin.inc:17
-msgid "Vocabularies:"
-msgstr "ボã‚ャブラリ："
-
-#: taxonomy_manager.admin.inc:50
-msgid "Taxonomy Manager - %voc_name"
-msgstr "タクソノミーマãƒãƒ¼ã‚¸ãƒ£ ï¼ %voc_name"
-
-#: taxonomy_manager.admin.inc:53
-msgid "No vocabulary with this ID available!. "
-msgstr "指定ã•ã‚ŒãŸIDã®ãƒœã‚ャブラリã¯åˆ©ç”¨ã§ãã¾ã›ã‚“ï¼"
-
-#: taxonomy_manager.admin.inc:54
-msgid "Check this !link_list for available vocabularies or !link_create a new one"
-msgstr "利用ã§ãるボã‚ャブラリを!link_listã§ç¢ºèªã™ã‚‹ã‹ã€æ–°ã—ã„ã‚‚ã®ã‚’!link_createã—ã¦ãã ã•ã„"
-
-#: taxonomy_manager.admin.inc:64
-msgid "No terms available"
-msgstr "利用ã§ãるタームã¯ã‚ã‚Šã¾ã›ã‚“"
-
-#: taxonomy_manager.admin.inc:90
-msgid ""
-"You can search directly for exisiting terms. \n"
-" If your input doesn't match an existing term, it will be used for filtering root level terms (useful for non-hierarchical vocabularies)."
-msgstr "æ—¢å˜ã®ã‚¿ãƒ¼ãƒ を直接検索ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 入力ã•ã‚ŒãŸã‚‚ã®ãŒæ—¢å˜ã®ã‚¿ãƒ¼ãƒ ã¨ä¸€è‡´ã—ãªã„å ´åˆã€æœ€ä¸Šä½ãƒ¬ãƒ™ãƒ«ã‚¿ãƒ¼ãƒ ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°ï¼ˆéžéšŽå±¤çš„ãªãƒœã‚ャブラリã«æœ‰ç”¨ï¼‰ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:96;114;747
-msgid "Search"
-msgstr "検索"
-
-#: taxonomy_manager.admin.inc:105
-msgid "Search String"
-msgstr "æ–‡å—列ã®æ¤œç´¢"
-
-#: taxonomy_manager.admin.inc:120
-msgid "Toolbar"
-msgstr "ツールãƒãƒ¼"
-
-#: taxonomy_manager.admin.inc:127
-msgid "Up"
-msgstr "上ã¸"
-
-#: taxonomy_manager.admin.inc:135
-msgid "Down"
-msgstr "下ã¸"
-
-#: taxonomy_manager.admin.inc:142;285;855
-msgid "Delete"
-msgstr "削除"
-
-#: taxonomy_manager.admin.inc:156;346
-msgid "Add"
-msgstr "è¿½åŠ "
-
-#: taxonomy_manager.admin.inc:162;469
-msgid "Move"
-msgstr "移動"
-
-#: taxonomy_manager.admin.inc:170;408
-msgid "Merge"
-msgstr "マージ"
-
-#: taxonomy_manager.admin.inc:177;504
-msgid "CSV Export"
-msgstr "CSVエクスãƒãƒ¼ãƒˆ"
-
-#: taxonomy_manager.admin.inc:215;582
-msgid "Save changes"
-msgstr "変更をä¿å˜"
-
-#: taxonomy_manager.admin.inc:265
-msgid "Confirmation"
-msgstr "確èª"
-
-#: taxonomy_manager.admin.inc:268
-msgid "Are you sure you want to delete all selected terms? "
-msgstr "本当ã«ã€é¸æŠžã•ã‚ŒãŸå…¨ã‚¿ãƒ¼ãƒ を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-
-#: taxonomy_manager.admin.inc:269
-msgid "Remember all term specific data will be lost. This action cannot be undone."
-msgstr "タームã«å›ºæœ‰ã®å…¨ãƒ‡ãƒ¼ã‚¿ã¯å¤±ã‚ã‚Œã¾ã™ã€‚ ã“ã®æ“作ã¯å…ƒã«æˆ»ã™ã“ã¨ãŒã§ãã¾ã›ã‚“ã®ã§ã€å分ã«æ³¨æ„ã—ã¦å®Ÿè¡Œã—ã¦ãã ã•ã„。"
-
-#: taxonomy_manager.admin.inc:274
-msgid "Delete children of selected terms, if there are any"
-msgstr "å˜åœ¨ã™ã‚‹å ´åˆã€é¸æŠžã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã®ä¸‹ä½ã‚¿ãƒ¼ãƒ も削除ã™ã‚‹"
-
-#: taxonomy_manager.admin.inc:279;401;462
-msgid "Options"
-msgstr "オプション"
-
-#: taxonomy_manager.admin.inc:294;352;416;476;545;856
-msgid "Cancel"
-msgstr "ã‚ャンセル"
-
-#: taxonomy_manager.admin.inc:315
-msgid "If you have selected one or more terms in the tree view, the new terms are automatically children of those."
-msgstr "ツリービューã§1ã¤ä»¥ä¸Šã®ã‚¿ãƒ¼ãƒ ã‚’é¸æŠžã—ãŸå ´åˆã€æ–°ã—ã„タームã¯è‡ªå‹•çš„ã«ãれらã®ä¸‹ä½ã¨ãªã‚Šã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:321
-msgid "Add new terms"
-msgstr "æ–°è¦ã‚¿ãƒ¼ãƒ ã®è¿½åŠ "
-
-#: taxonomy_manager.admin.inc:333
-msgid "Mass term import (with textarea)"
-msgstr "タームã®ä¸€æ‹¬ã‚¤ãƒ³ãƒãƒ¼ãƒˆï¼ˆãƒ†ã‚ストエリア使用）"
-
-#: taxonomy_manager.admin.inc:339
-msgid "Terms"
-msgstr "ターム"
-
-#: taxonomy_manager.admin.inc:340
-msgid "One term per line"
-msgstr "タームを行å˜ä½ã§å…¥åŠ›ã—ã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:373
-msgid ""
-"The selected terms get merged into one term. \n"
-" This resulting merged term can either be an exisiting term or a completely new term. \n"
-" The selected terms will automatically get synomyms of the merged term and will be deleted afterwards."
-msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã¯1ã¤ã®ã‚¿ãƒ¼ãƒ ã«ä½µåˆã•ã‚Œã¾ã™ã€‚ 「併åˆã™ã‚‹ã‚¿ãƒ¼ãƒ ã€ã¯ã€æ—¢å˜ã®ã‚¿ãƒ¼ãƒ ã§ã‚‚ã€å…¨ãæ–°ã—ã„タームã§ã‚‚構ã„ã¾ã›ã‚“。 é¸æŠžã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã¯ã€è‡ªå‹•çš„ã«ä½µåˆã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã®ã‚·ãƒŽãƒ‹ãƒ ã¨ã•ã‚ŒãŸå¾Œã€å‰Šé™¤ã•ã‚Œã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:381
-msgid "Merging of terms"
-msgstr "タームã®ãƒžãƒ¼ã‚¸"
-
-#: taxonomy_manager.admin.inc:387
-msgid "Resulting merged term"
-msgstr "ä½µåˆã™ã‚‹ã‚¿ãƒ¼ãƒ "
-
-#: taxonomy_manager.admin.inc:394
-msgid "Collect all parents of selected terms an add it to the merged term"
-msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã®ã™ã¹ã¦ã®ä¸Šä½ã‚¿ãƒ¼ãƒ を集ã‚ã€ä½µåˆã™ã‚‹ã‚¿ãƒ¼ãƒ ã¸è¿½åŠ "
-
-#: taxonomy_manager.admin.inc:395
-msgid "Collect all children of selected terms an add it to the merged term"
-msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã®ã™ã¹ã¦ã®ä¸‹ä½ã‚¿ãƒ¼ãƒ を集ã‚ã€ä½µåˆã™ã‚‹ã‚¿ãƒ¼ãƒ ã¸è¿½åŠ "
-
-#: taxonomy_manager.admin.inc:396
-msgid "Collect all relations of selected terms an add it to the merged term"
-msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã®ã™ã¹ã¦ã®é–¢é€£ã‚¿ãƒ¼ãƒ を集ã‚ã€ä½µåˆã™ã‚‹ã‚¿ãƒ¼ãƒ ã¸è¿½åŠ "
-
-#: taxonomy_manager.admin.inc:435
-msgid ""
-"You can change the parent of one or more selected terms. \n"
-" If you leave the autocomplete field empty, the term will be a root term."
-msgstr "1ã¤ä»¥ä¸Šã®é¸æŠžã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã®ä¸Šä½ã‚’変更ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 自動補完フィールドãŒç©ºæ¬„ã®å ´åˆã€ã‚¿ãƒ¼ãƒ ã¯æœ€ä¸Šä½ã¨ãªã‚Šã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:442
-msgid "Moving of terms"
-msgstr "タームã®ç§»å‹•"
-
-#: taxonomy_manager.admin.inc:447
-msgid "Separate parent terms with a comma. "
-msgstr "上ä½ã‚¿ãƒ¼ãƒ をコンマã§åŒºåˆ‡ã£ã¦å…¥åŠ›ã—ã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:452
-msgid "Parent term(s)"
-msgstr "上ä½ã‚¿ãƒ¼ãƒ "
-
-#: taxonomy_manager.admin.inc:459
-msgid "Keep old parents and add new ones (multi-parent). Otherwise old parents get replaced."
-msgstr "å¤ã„上ä½ã‚’ä¿æŒã—ãŸã¾ã¾æ–°ã—ã„ã‚‚ã®ã‚’è¿½åŠ ï¼ˆå¤šé‡ä¸Šä½ï¼‰ã—ãŸã„å ´åˆã¯ã€ã“ã“ã«ãƒã‚§ãƒƒã‚¯ã‚’入れã¾ã™ã€‚ ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„å ´åˆã€å¤ã„上ä½ã¯ç½®ãæ›ãˆã‚‰ã‚Œã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:511
-msgid "Delimiter for CSV File"
-msgstr "CSVファイルã®åŒºåˆ‡ã‚Šæ–‡å—"
-
-#: taxonomy_manager.admin.inc:516
-msgid "Whole Vocabulary"
-msgstr "ボã‚ャブラリ全体"
-
-#: taxonomy_manager.admin.inc:517
-msgid "Child terms of a selected term"
-msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ¼ãƒ ã®ä¸‹ä½ã‚¿ãƒ¼ãƒ "
-
-#: taxonomy_manager.admin.inc:518
-msgid "Root level terms only"
-msgstr "最上ä½ãƒ¬ãƒ™ãƒ«ã®ã‚¿ãƒ¼ãƒ ã®ã¿"
-
-#: taxonomy_manager.admin.inc:522
-msgid "Terms to export"
-msgstr "エクスãƒãƒ¼ãƒˆã™ã‚‹ã‚¿ãƒ¼ãƒ "
-
-#: taxonomy_manager.admin.inc:531
-msgid "Exported CSV"
-msgstr "エクスãƒãƒ¼ãƒˆã•ã‚ŒãŸCSV"
-
-#: taxonomy_manager.admin.inc:532
-msgid "The generated code will appear here (per AJAX). You can copy and paste the code into a .csv file. The csv has following columns: voc id | term id | term name | description | parent id 1 | ... | parent id n"
-msgstr "エクスãƒãƒ¼ãƒˆã‚’ã™ã‚‹ãŸã³ã«ã€ç”Ÿæˆã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ãŒã“ã“ã«ç¾ã‚Œã¾ã™ã€‚ ãれらをCSVファイルã«ã‚³ãƒ”ー＆ペーストã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ CSVã¯æ¬¡ã®ã‚«ãƒ©ãƒ ã‚’æŒã¡ã¾ã™ï¼š ボã‚ャブラリID | タームID | タームã®åå‰ | タームã®èª¬æ˜Ž | 上ä½ã‚¿ãƒ¼ãƒ ã®ID 1 | ... | 上ä½ã‚¿ãƒ¼ãƒ ã®ID n "
-
-#: taxonomy_manager.admin.inc:539
-msgid "Export now"
-msgstr "エクスãƒãƒ¼ãƒˆé–‹å§‹"
-
-#: taxonomy_manager.admin.inc:636
-msgid "Name"
-msgstr "åå‰"
-
-#: taxonomy_manager.admin.inc:646
-msgid "Description"
-msgstr "説明"
-
-#: taxonomy_manager.admin.inc:652
-msgid "Synonyms"
-msgstr "シノニム（åŒç¾©èªžï¼‰"
-
-#: taxonomy_manager.admin.inc:656
-msgid "Relations"
-msgstr "関連"
-
-#: taxonomy_manager.admin.inc:662
-msgid "Parents"
-msgstr "上ä½"
-
-#: taxonomy_manager.admin.inc:672
-msgid "Weight"
-msgstr "ウェイト"
-
-#: taxonomy_manager.admin.inc:675
-msgid "Go to the term page site"
-msgstr "タームページã¸è¡Œã<br />"
-
-#: taxonomy_manager.admin.inc:748
-msgid "Search field is empty"
-msgstr "検索フィールドãŒç©ºã§ã™"
-
-#: taxonomy_manager.admin.inc:812
-msgid "No terms for deleting selected"
-msgstr "削除ã™ã‚‹ã‚¿ãƒ¼ãƒ ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
-
-#: taxonomy_manager.admin.inc:849
-msgid "Deleting a term will delete all its children if there are any. "
-msgstr "タームを削除ã™ã‚‹ã¨ã€ä¸‹ä½ã«å«ã¾ã‚Œã‚‹ã™ã¹ã¦ã®ã‚¿ãƒ¼ãƒ も削除ã•ã‚Œã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:850
-msgid "This action cannot be undone."
-msgstr "ã“ã®æ“作ã¯å…ƒã«æˆ»ã™ã“ã¨ãŒã§ãã¾ã›ã‚“ã®ã§ã€å分ã«æ³¨æ„ã—ã¦å®Ÿè¡Œã—ã¦ãã ã•ã„。"
-
-#: taxonomy_manager.admin.inc:852
-msgid "Are you sure you want to delete the following terms: "
-msgstr "本当ã«ã€ä»¥ä¸‹ã®ã‚¿ãƒ¼ãƒ を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-
-#: taxonomy_manager.admin.inc:879
-msgid "Please selected terms you want to move in the hierarchy"
-msgstr "階層ã«ç§»å‹•ã—ãŸã„タームをé¸æŠžã—ã¦ãã ã•ã„"
-
-#: taxonomy_manager.admin.inc:921
-msgid "Please enter a name into %title"
-msgstr "%title ã¸åå‰ã‚’入力ã—ã¦ãã ã•ã„"
-
-#: taxonomy_manager.admin.inc:921;925
-msgid "Main term"
-msgstr "メインターム"
-
-#: taxonomy_manager.admin.inc:925
-msgid "Please only enter single names into %title"
-msgstr "%title ã¸ã¯1ã¤ã®åå‰ã®ã¿ã‚’入力ã—ã¦ãã ã•ã„"
-
-#: taxonomy_manager.admin.inc:930
-msgid "Please selected terms you want to merge"
-msgstr "マージã—ãŸã„タームをé¸æŠžã—ã¦ãã ã•ã„"
-
-#: taxonomy_manager.admin.inc:934
-msgid "Please select less than 50 terms to merge. Merging to many terms in one step can cause timeouts and inconsistent database states"
-msgstr "マージã™ã‚‹ã‚¿ãƒ¼ãƒ 㯠50 以下ã«ã—ã¦ãã ã•ã„。 一度ã«å¤šæ•°ã®ã‚¿ãƒ¼ãƒ をマージã™ã‚‹ã¨ã€ã‚¿ã‚¤ãƒ アウトやã€ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ä¸æ•´åˆã‚’引ãèµ·ã“ã™å ´åˆãŒã‚ã‚Šã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:963
-msgid "Disable mouse-over effect for terms (weights and direct link)"
-msgstr "タームã®ãƒžã‚¦ã‚¹ã‚ªãƒ¼ãƒãƒ¼ã‚¨ãƒ•ã‚§ã‚¯ãƒˆï¼ˆã‚¦ã‚§ã‚¤ãƒˆã¨ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒªãƒ³ã‚¯ï¼‰ã‚’無効化"
-
-#: taxonomy_manager.admin.inc:965
-msgid "Disabeling this feature speeds up the Taxonomy Manager"
-msgstr "ã“ã®æ©Ÿèƒ½ã‚’無効化ã™ã‚‹ã¨ã€ã‚¿ã‚¯ã‚½ãƒŽãƒŸãƒ¼ãƒžãƒãƒ¼ã‚¸ãƒ£ã®é€Ÿåº¦ãŒå‘上ã—ã¾ã™ã€‚"
-
-#: taxonomy_manager.admin.inc:969
-msgid "Pager count"
-msgstr "ページャーカウント"
-
-#: taxonomy_manager.admin.inc:972
-msgid "Select how many terms should be listed on one page. Huge page counts can slow down the Taxonomy Manager"
-msgstr "ページå˜ä½ã®ã‚¿ãƒ¼ãƒ 数を指定ã—ã¾ã™ã€‚ éžå¸¸ã«å¤§ããªæ•°å€¤ã‚’指定ã™ã‚‹ã¨ã€ã‚¿ã‚¯ã‚½ãƒŽãƒŸãƒ¼ãƒžãƒãƒ¼ã‚¸ãƒ£ã®é€Ÿåº¦ãŒä½Žä¸‹ã—ã¾ã™ã€‚"
-
-#: taxonomy_manager.module:141
-msgid ""
-"The Taxonomy Manager provides an additional interface for managing vocabularies of the taxonomy module. It's especially very useful for long sets of terms. \n"
-" The vocabulary is represented in a dynamic tree view. \n"
-" It supports operation like mass adding and deleting of terms, fast weight editing, moving of terms in hierarchies, merging of terms and fast term data editing.\n"
-" For more information on how to use please read the readme file included in the taxonomy_manager directory."
-msgstr "Taxonomy Manager（タクソノミーマãƒãƒ¼ã‚¸ãƒ£ï¼‰ã¯ã€ã‚¿ã‚¯ã‚½ãƒŽãƒŸãƒ¼ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®ãƒœã‚ャブラリを管ç†ã™ã‚‹ãŸã‚ã®ä»˜åŠ çš„ãªã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’æä¾›ã—ã¾ã™ã€‚ ã“ã‚Œã¯ç‰¹ã«ã‚¿ãƒ¼ãƒ æ•°ãŒå¤šã„å ´åˆã«å¤§å¤‰å½¹ç«‹ã¡ã¾ã™ã€‚ ボã‚ャブラリã¯å‹•çš„ãªãƒ„リービューã«è¡¨ç¤ºã•ã‚Œã€ã‚¿ãƒ¼ãƒ ã®ä¸€æ‹¬è¿½åŠ や削除ã€ç´ æ—©ã„ウェイトã®ç·¨é›†ã€éšŽå±¤ã§ã®ã‚¿ãƒ¼ãƒ ã®ç§»å‹•ã€ã‚¿ãƒ¼ãƒ ã®çµ±åˆã€ç´ æ—©ã„タームデータã®ç·¨é›†ãªã©ã®æ“作をサãƒãƒ¼ãƒˆã—ã¾ã™ã€‚ 使用法ã®è©³ç´°ã¯ã€taxonomy_manager ディレクトリã«ã‚ã‚‹ readme ファイルをèªã‚“ã§ãã ã•ã„。"
-
-#: taxonomy_manager.module:733
-msgid "An illegal choice has been detected. Please contact the site administrator."
-msgstr "ä¸æ£ãªé¸æŠžè‚¢ãŒæ¤œå‡ºã•ã‚Œã¾ã—ãŸã€‚ ãŠæ‰‹æ•°ã§ã™ãŒã€ã‚µã‚¤ãƒˆç®¡ç†è€…ã¾ã§ã”連絡ãã ã•ã„。"
-
-#: taxonomy_manager.module:21;70;79 taxonomy_manager.info:0
-msgid "Taxonomy Manager"
-msgstr "タクソノミーマãƒãƒ¼ã‚¸ãƒ£"
-
-#: taxonomy_manager.module:22
-msgid "Administer vocabularies with the Taxonomy Manager"
-msgstr "タクソノミーマãƒãƒ¼ã‚¸ãƒ£ã§ãƒœã‚ャブラリを管ç†ã—ã¾ã™ã€‚"
-
-#: taxonomy_manager.module:80
-msgid "Advanced settings for the Taxonomy Manager"
-msgstr "タクソノミーマãƒãƒ¼ã‚¸ãƒ£ã®é«˜åº¦ãªè¨å®šã‚’è¡Œã„ã¾ã™ã€‚"
-
-#: taxonomy_manager.module:0
-msgid "taxonomy_manager"
-msgstr "taxonomy_manager"
-
-#: taxonomy_manager.info:0
-msgid "Tool for administrating taxonomy terms."
-msgstr "タクソノミータームを管ç†ã™ã‚‹ãŸã‚ã®ãƒ„ールã§ã™ã€‚"
diff --git a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/taxonomy_manager.pot b/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/taxonomy_manager.pot
deleted file mode 100644
index 493cc95..0000000
--- a/kolab.org/www/drupal-6.26/sites/all/modules/taxonomy_manager/translations/taxonomy_manager.pot
+++ /dev/null
@@ -1,632 +0,0 @@
-# $Id$
-#
-# LANGUAGE translation of Drupal (general)
-# Copyright YEAR NAME <EMAIL at ADDRESS>
-# Generated from files:
-# taxonomy_manager.admin.inc,v 1.1.2.17.2.25 2009/09/05 10:09:41 mh86
-# js/doubleTree.js: n/a
-# taxonomy_manager.module,v 1.5.2.17.2.14.2.15 2009/09/05 10:09:41 mh86
-# tree.js,v 1.4.2.4.2.9.2.13 2009/08/10 13:47:45 mh86
-# taxonomy_manager.info: n/a
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-11-03 23:51+0100\n"
-"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
-"Last-Translator: NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <EMAIL at ADDRESS>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: taxonomy_manager.admin.inc:17
-msgid "Add new vocabulary"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:18
-msgid "Edit vocabulary settings"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:27
-msgid "No Vocabularies available"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:29
-msgid "Vocabularies:"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:62
-msgid "Taxonomy Manager - %voc_name"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:65
-msgid "No vocabulary with this ID available! Check this <a href=\"!list\">list</a> for available vocabularies or <a href=\"!create\">create</a> a new one"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:75
-msgid "No terms available"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:111;342;931;1056
-msgid "Language"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:113;344
-msgid "All"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:113;344
-msgid "no language"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:119;119;350;350
-msgid "Resize tree"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:130
-msgid "You can search directly for exisiting terms. \n If your input doesn't match an existing term, it will be used for filtering root level terms (useful for non-hierarchical vocabularies)."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:136;154;1091
-msgid "Search"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:145
-msgid "Search String"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:158
-msgid "Include synonyms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:159
-msgid "Search under selected terms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:163
-msgid "Search within selected language"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:168
-msgid "Search options"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:174
-msgid "Toolbar"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:181
-msgid "Up"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:189
-msgid "Down"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:196;458;1266
-msgid "Delete"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:210;523;1011;1077
-msgid "Add"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:216;646
-msgid "Move"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:224;585
-msgid "Merge"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:231;681
-msgid "CSV Export"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:237
-msgid "Double Tree"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:277;817
-msgid "Save changes"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:307;774
-msgid "Disable Double Tree"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:367
-msgid "Move right"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:376
-msgid "Move left"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:385
-msgid "Switch selected terms and its children to the right voc"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:387
-msgid "Switch selected terms and its children to the left voc"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:393
-msgid "Add Translation"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:438
-msgid "Confirmation"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:441
-msgid "Are you sure you want to delete all selected terms? "
-msgstr ""
-
-#: taxonomy_manager.admin.inc:442
-msgid "Remember all term specific data will be lost. This action cannot be undone."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:447
-msgid "Delete children of selected terms, if there are any"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:452;578;639
-msgid "Options"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:467;529;593;653;728;780;1267
-msgid "Cancel"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:492
-msgid "If you have selected one or more terms in the tree view, the new terms are automatically children of those."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:498
-msgid "Add new terms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:510
-msgid "Mass term import (with textarea)"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:516
-msgid "Terms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:517
-msgid "One term per line"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:550
-msgid "The selected terms get merged into one term. \n This resulting merged term can either be an exisiting term or a completely new term. \n The selected terms will automatically get synomyms of the merged term and will be deleted afterwards."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:558
-msgid "Merging of terms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:564
-msgid "Resulting merged term"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:571
-msgid "Collect all parents of selected terms an add it to the merged term"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:572
-msgid "Collect all children of selected terms an add it to the merged term"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:573
-msgid "Collect all relations of selected terms an add it to the merged term"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:612
-msgid "You can change the parent of one or more selected terms. \n If you leave the autocomplete field empty, the term will be a root term."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:619
-msgid "Moving of terms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:624
-msgid "Separate parent terms with a comma. "
-msgstr ""
-
-#: taxonomy_manager.admin.inc:629
-msgid "Parent term(s)"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:636
-msgid "Keep old parents and add new ones (multi-parent). Otherwise old parents get replaced."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:688
-msgid "Delimiter for CSV File"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:693
-msgid "Whole Vocabulary"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:694
-msgid "Child terms of a selected term"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:695
-msgid "Root level terms only"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:699
-msgid "Terms to export"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:708
-msgid "Depth of tree"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:709
-msgid "The number of levels of the tree to export. Leave empty to return all levels."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:714
-msgid "Exported CSV"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:715
-msgid "The generated code will appear here (per AJAX). You can copy and paste the code into a .csv file. The csv has following columns: voc id | term id | term name | description | parent id 1 | ... | parent id n"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:722
-msgid "Export now"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:748
-msgid "Double Tree Settings"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:749
-msgid "Specify settings for second tree. Choose the same vocabulary if you want to move terms in the hierarchy or if you want to add new translations within a multilingual vocabulary. Choose a different vocabulary if you want to switch terms among these vocabularies."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:759
-msgid "Vocabulary for second tree"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:767
-msgid "Enable Double Tree"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:838
-msgid "Error! Your last operation couldn't be performed because of following problem:"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:883
-msgid "Close"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:891
-msgid "Name"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:901
-msgid "Description"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:909
-msgid "Synonyms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:913
-msgid "Relations"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:918
-msgid "Parents"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:925
-msgid "Translations"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:934
-msgid "This term belongs to a multilingual vocabulary. You can set a language for it."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:946
-msgid "Weight"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:951
-msgid "Go to the term page"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:991;1051
-msgid "Remove"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1092
-msgid "Search field is empty"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1130
-msgid "Your search string matches exactly one term"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1144
-msgid "Your search string matches !count terms:"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1148
-msgid "No match found. Filtering root level terms starting with @search_string."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1149
-msgid "Show unfiltered tree"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1203
-msgid "Saving terms to language @lang"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1216
-msgid "No terms for deleting selected"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1260
-msgid "Deleting a term will delete all its children if there are any. "
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1261
-msgid "This action cannot be undone."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1263
-msgid "Are you sure you want to delete the following terms: "
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1296
-msgid "Please selected terms you want to move in the hierarchy"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1300;1453
-msgid "Warning: Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1312
-msgid "Invalid selection. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1316;1469;1596
-msgid "Terms must be of the same language"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1412
-msgid "root level"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1417
-msgid "Terms %term_names moved to %parent_names"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1436
-msgid "Please enter a name into \"Resulting merged term\""
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1440
-msgid "Please only enter single names into \"Resulting merged term\""
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1445
-msgid "Please selected terms you want to merge"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1449
-msgid "Please select less than 50 terms to merge. Merging of too many terms in one step can cause timeouts and inconsistent database states"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1463
-msgid "Invalid selection. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself. Unselect \"Collect all parents of selected terms an add it to the merged term\" or specify a different resulting term."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1497
-msgid "Terms %term_names merged into %main_term"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1537
-msgid "Disable mouse-over effect for terms (weights and direct link)"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1539
-msgid "Disabeling this feature speeds up the Taxonomy Manager"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1543
-msgid "Disable redirect of the taxonomy term page to merged terms "
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1545
-msgid "When using the merging feature, the selected terms get merged into one term. All selected terms will be deleted afterwards. Normally the Taxonomy Manager redirects calls to taxonomy/term/$tid of the deleted terms (through merging) to the resulting merged term. This feature might conflict with other modules (e.g. Taxonomy Breadcrumb, Panels), which implement hook_menu_alter to change the taxonomy_manager_term_page callback. Disable this feature if it conflicts with other modules or if you do not need it. Changing this setting requires a (menu) cache flush to become active."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1549
-msgid "Pager count"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1552
-msgid "Select how many terms should be listed on one page. Huge page counts can slow down the Taxonomy Manager"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1592
-msgid "Your input matches with multiple terms, because of duplicated term names. Please enter a unique term name"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1608;1832
-msgid "Invalid parent. The resulting hierarchy would contain circles, which is not allowed. A term cannot be a parent of itself."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1618
-msgid "Please provide only one term for translation"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1622
-msgid "Invalid language selection"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1626
-msgid "Missing language for new term"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1633
-msgid "Invalid language selection. Translation already exists"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1644
-msgid "Invalid language selection."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1693
-msgid "Successfully updated parents"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1707
-msgid "Successfully updated related terms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1718
-msgid "Successfully updated synonyms"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1724
-msgid "Successfully updated weight to !weight"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1731
-msgid "Successfully updated language"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1735;1759
-msgid "Module i18ntaxonomy not enabled"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1747
-msgid "Successfully added translation"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1754
-msgid "Successfully removed translation"
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1796
-msgid "Invalid operation."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1809 js/doubleTree.js:0
-msgid "No terms selected."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1827
-msgid "Terms must be of the same language."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1864
-msgid "Removed current parent form terms %terms."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1867
-msgid "Terms %terms moved to parents %parents."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1881
-msgid "Selected terms are of the same language."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1888;1896
-msgid "Translation for this language already exists."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1904
-msgid "This is not a multilingual vocabulary."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1909
-msgid "Module i18ntaxonomy not enabled."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1915
-msgid "Translation for %term2 - %term1 added."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1942
-msgid "Terms %terms moved to vocabulary %voc."
-msgstr ""
-
-#: taxonomy_manager.admin.inc:1945
-msgid "Terms %terms moved to vocabulary %voc under parents %parents."
-msgstr ""
-
-#: taxonomy_manager.module:169
-msgid "The Taxonomy Manager provides an additional interface for managing vocabularies of the taxonomy module. It's especially very useful for long sets of terms. \n The vocabulary is represented in a dynamic tree view. \n It supports operation like mass adding and deleting of terms, fast weight editing, moving of terms in hierarchies, merging of terms and fast term data editing.\n For more information on how to use please read the readme file included in the taxonomy_manager directory."
-msgstr ""
-
-#: taxonomy_manager.module:186 js/tree.js:0
-msgid "Select all children"
-msgstr ""
-
-#: taxonomy_manager.module:188
-msgid "Move up"
-msgstr ""
-
-#: taxonomy_manager.module:189
-msgid "Move down"
-msgstr ""
-
-#: taxonomy_manager.module:191
-msgid "Go to term page"
-msgstr ""
-
-#: taxonomy_manager.module:763
-msgid "Children Count: "
-msgstr ""
-
-#: taxonomy_manager.module:768
-msgid "Direct Parents: "
-msgstr ""
-
-#: taxonomy_manager.module:946
-msgid "An illegal choice has been detected. Please contact the site administrator."
-msgstr ""
-
-#: taxonomy_manager.module:21;77;85;94 taxonomy_manager.info:0
-msgid "Taxonomy Manager"
-msgstr ""
-
-#: taxonomy_manager.module:22
-msgid "Administer vocabularies with the Taxonomy Manager"
-msgstr ""
-
-#: taxonomy_manager.module:95
-msgid "Advanced settings for the Taxonomy Manager"
-msgstr ""
-
-#: taxonomy_manager.module:110
-msgid "Taxonomy Manager Autocomplete"
-msgstr ""
-
-#: taxonomy_manager.info:0
-msgid "Tool for administrating taxonomy terms."
-msgstr ""
-
-#: js/doubleTree.js:0
-msgid "Select one term per tree to add a new translation."
-msgstr ""
-
-#: js/tree.js:0
-msgid "Unselect all children"
-msgstr ""
-
More information about the commits
mailing list