Menu
▾
▴
vbdrupal-svn — SVN Commit reports
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(30) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(39) |
Feb
(18) |
Mar
(12) |
Apr
(18) |
May
(8) |
Jun
|
Jul
(77) |
Aug
(46) |
Sep
(21) |
Oct
(19) |
Nov
(32) |
Dec
(27) |
| 2008 |
Jan
(24) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(8) |
Aug
(20) |
Sep
|
Oct
(6) |
Nov
|
Dec
(3) |
| 2009 |
Jan
(35) |
Feb
(4) |
Mar
|
Apr
(7) |
May
(3) |
Jun
(5) |
Jul
(40) |
Aug
(3) |
Sep
(3) |
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <elm...@us...> - 2010-03-04 17:46:26
|
Revision: 900
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=900&view=rev
Author: elmuerte
Date: 2010-03-04 17:46:19 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
Added Paths:
-----------
tags/v5_22_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2010-03-04 17:41:12
|
Revision: 899
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=899&view=rev
Author: elmuerte
Date: 2010-03-04 17:41:06 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
Modified Paths:
--------------
branches/vbdrupal-5/localization/general.pot
branches/vbdrupal-5/localization/installer.pot
Modified: branches/vbdrupal-5/localization/general.pot
===================================================================
--- branches/vbdrupal-5/localization/general.pot 2010-03-04 17:39:00 UTC (rev 898)
+++ branches/vbdrupal-5/localization/general.pot 2010-03-04 17:41:06 UTC (rev 899)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-12-19 16:22+0100\n"
+"POT-Creation-Date: 2010-03-04 18:38+0100\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
Modified: branches/vbdrupal-5/localization/installer.pot
===================================================================
--- branches/vbdrupal-5/localization/installer.pot 2010-03-04 17:39:00 UTC (rev 898)
+++ branches/vbdrupal-5/localization/installer.pot 2010-03-04 17:41:06 UTC (rev 899)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-12-19 16:22+0100\n"
+"POT-Creation-Date: 2010-03-04 18:38+0100\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2010-03-04 17:39:07
|
Revision: 898
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=898&view=rev
Author: elmuerte
Date: 2010-03-04 17:39:00 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
drupal 5.22 changes
Modified Paths:
--------------
branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt
branches/vbdrupal-5/CHANGELOG.txt
branches/vbdrupal-5/drupal/includes/common.inc
branches/vbdrupal-5/drupal/includes/locale.inc
branches/vbdrupal-5/drupal/includes/session.inc
branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc
branches/vbdrupal-5/drupal/modules/locale/locale.install
branches/vbdrupal-5/drupal/modules/locale/locale.module
branches/vbdrupal-5/drupal/modules/system/system.module
branches/vbdrupal-5/drupal/robots.txt
branches/vbdrupal-5/drupal/update.php
Modified: branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt
===================================================================
--- branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt 2010-03-04 17:39:00 UTC (rev 898)
@@ -1,5 +1,9 @@
// $Id$
+vbDrupal 5.22.0, 2010-03-04
+---------------------------
+- merged Drupal 5.22 changes
+
vbDrupal 5.21.0, 2009-12-19
---------------------------
- merged Drupal 5.21 changes
Modified: branches/vbdrupal-5/CHANGELOG.txt
===================================================================
--- branches/vbdrupal-5/CHANGELOG.txt 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/CHANGELOG.txt 2010-03-04 17:39:00 UTC (rev 898)
@@ -1,5 +1,10 @@
// $Id$
+Drupal 5.22, 2010-03-03
+-----------------------
+- Fixed security issues (Open redirection, Locale module cross site scripting,
+ Blocked user session regeneration), see SA-CORE-2010-001.
+
Drupal 5.21, 2009-12-16
-----------------------
- Fixed a security issue (Cross site scripting), see SA-CORE-2009-009.
Modified: branches/vbdrupal-5/drupal/includes/common.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/common.inc 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/includes/common.inc 2010-03-04 17:39:00 UTC (rev 898)
@@ -302,13 +302,24 @@
* @see drupal_get_destination()
*/
function drupal_goto($path = '', $query = NULL, $fragment = NULL, $http_response_code = 302) {
+
+ $destination = FALSE;
if (isset($_REQUEST['destination'])) {
- extract(parse_url(urldecode($_REQUEST['destination'])));
+ $destination = $_REQUEST['destination'];
}
else if (isset($_REQUEST['edit']['destination'])) {
- extract(parse_url(urldecode($_REQUEST['edit']['destination'])));
+ $destination = $_REQUEST['edit']['destination'];
}
+ if ($destination) {
+ // Do not redirect to an absolute URL originating from user input.
+ $colonpos = strpos($destination, ':');
+ $absolute = ($colonpos !== FALSE && !preg_match('![/?#]!', substr($destination, 0, $colonpos)));
+ if (!$absolute) {
+ extract(parse_url(urldecode($destination)));
+ }
+ }
+
$url = url($path, $query, $fragment, TRUE);
// Remove newlines from the URL to avoid header injection attacks.
$url = str_replace(array("\n", "\r"), '', $url);
Modified: branches/vbdrupal-5/drupal/includes/locale.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/locale.inc 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/includes/locale.inc 2010-03-04 17:39:00 UTC (rev 898)
@@ -41,6 +41,9 @@
$options = array();
$form['name'] = array('#tree' => TRUE);
foreach ($languages['name'] as $key => $lang) {
+ // Language code should contain no markup, but is emitted
+ // by radio and checkbox options.
+ $key = check_plain($key);
$options[$key] = '';
$status = db_fetch_object(db_query("SELECT isdefault, enabled FROM {locales_meta} WHERE locale = '%s'", $key));
if ($status->enabled) {
@@ -97,6 +100,14 @@
return $output;
}
+function _locale_admin_manage_screen_validate($form_id, $form_values) {
+ foreach ($form_values['name'] as $key => $value) {
+ if (preg_match('/["<>\']/', $value)) {
+ form_set_error('name][' . $key, t('The characters <, >, " and \' are not allowed in the language name in English field.'));
+ }
+ }
+}
+
/**
* Process locale admin manager form submissions.
*/
@@ -184,12 +195,22 @@
form_set_error(t('The language %language (%code) already exists.', array('%language' => $form_values['langname'], '%code' => $form_values['langcode'])));
}
+ // If we are adding a non-custom language, check for a valid langcode.
if (!isset($form_values['langname'])) {
$isocodes = _locale_get_iso639_list();
if (!isset($isocodes[$form_values['langcode']])) {
form_set_error('langcode', t('Invalid language code.'));
}
}
+ // Otherwise, check for invlaid characters
+ else {
+ if (preg_match('/["<>\']/', $form_values['langcode'])) {
+ form_set_error('langcode', t('The characters <, >, " and \' are not allowed in the language code field.'));
+ }
+ if (preg_match('/["<>\']/', $form_values['langname'])) {
+ form_set_error('langname', t('The characters <, >, " and \' are not allowed in the language name in English field.'));
+ }
+ }
}
/**
@@ -331,8 +352,14 @@
function _locale_string_seek_form() {
// Get *all* languages set up
$languages = locale_supported_languages(FALSE, TRUE);
- asort($languages['name']); unset($languages['name']['en']);
- $languages['name'] = array_map('check_plain', $languages['name']);
+ unset($languages['name']['en']);
+ // Sanitize the values to be used in radios.
+ $languages_name = array();
+ foreach ($languages['name'] as $key => $value) {
+ $languages_name[check_plain($key)] = check_plain($value);
+ }
+ $languages['name'] = $languages_name;
+ asort($languages['name']);
// Present edit form preserving previous user settings
$query = _locale_string_seek_query();
Modified: branches/vbdrupal-5/drupal/includes/session.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/session.inc 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/includes/session.inc 2010-03-04 17:39:00 UTC (rev 898)
@@ -31,8 +31,9 @@
// Otherwise, if the session is still active, we have a record of the client's session in the database.
$user = db_fetch_object(db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s'", $key));
- // We found the client's session record and they are an authenticated user
- if ($user && $user->uid > 0) {
+ // We found the client's session record and they are an authenticated,
+ // active user.
+ if ($user && $user->uid > 0 && $user->status == 1) {
// This is done to unserialize the data member of $user
$user = drupal_unpack($user);
@@ -44,7 +45,8 @@
$user->roles[$role->rid] = $role->name;
}
}
- // We didn't find the client's record (session has expired), or they are an anonymous user.
+ // We didn't find the client's record (session has expired), or they are
+ // blocked, or they are an anonymous user.
else {
$session = isset($user->session) ? $user->session : '';
$user = drupal_anonymous_user($session);
Modified: branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc 2010-03-04 17:39:00 UTC (rev 898)
@@ -3,4 +3,4 @@
/**
* the vBDrupal version
*/
-define('VBDRUPAL', '5.21.0');
+define('VBDRUPAL', '5.22.0');
Modified: branches/vbdrupal-5/drupal/modules/locale/locale.install
===================================================================
--- branches/vbdrupal-5/drupal/modules/locale/locale.install 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/modules/locale/locale.install 2010-03-04 17:39:00 UTC (rev 898)
@@ -85,3 +85,23 @@
db_query('DROP TABLE {locales_source}');
db_query('DROP TABLE {locales_target}');
}
+
+/**
+ * Neutralize unsafe language names in the database.
+ */
+function locale_update_1() {
+ $ret = array();
+ $matches = db_result(db_query("SELECT 1 FROM {locales_meta} WHERE name LIKE '%<%' OR name LIKE '%>%'"));
+ if ($matches) {
+ $ret[] = update_sql("UPDATE {locales_meta} SET name = REPLACE(name, '<', '')");
+ $ret[] = update_sql("UPDATE {locales_meta} SET name = REPLACE(name, '>', '')");
+ drupal_set_message('The language name in English of all the existing custom languages of your site have been sanitized for security purposes. Visit the <a href="'. url('admin/settings/language') .'">Languages</a> page to check these and fix them if necessary.', 'warning');
+ }
+ // Check if some langcode values contain potentially dangerous characters and
+ // warn the user if so. These are not fixed since they are referenced in other
+ // tables (e.g. {node}).
+ if (db_result(db_query("SELECT 1 FROM {locales_meta} WHERE locale LIKE '%<%' OR locale LIKE '%>%' OR locale LIKE '%\"%' OR locale LIKE '%\\\\\%'"))) {
+ drupal_set_message('Some of your custom language code values contain invalid characters. You should examine the <a href="'. url('admin/settings/language') .'">Languages</a> page. These must be fixed manually.', 'error');
+ }
+ return $ret;
+}
Modified: branches/vbdrupal-5/drupal/modules/locale/locale.module
===================================================================
--- branches/vbdrupal-5/drupal/modules/locale/locale.module 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/modules/locale/locale.module 2010-03-04 17:39:00 UTC (rev 898)
@@ -137,15 +137,17 @@
if ($user->language == '') {
$user->language = key($languages['name']);
}
- $languages['name'] = array_map('check_plain', array_map('t', $languages['name']));
+ foreach (array_map('t', $languages['name']) as $key => $value) {
+ $languages_name[check_plain($key)] = check_plain($value);
+ }
$form['locale'] = array('#type' => 'fieldset',
'#title' => t('Interface language settings'),
'#weight' => 1,
);
$form['locale']['language'] = array('#type' => 'radios',
'#title' => t('Language'),
- '#default_value' => $user->language,
- '#options' => $languages['name'],
+ '#default_value' => check_plain($user->language),
+ '#options' => $languages_name,
'#description' => t('Selecting a different locale will change the interface language of the site.'),
);
return $form;
Modified: branches/vbdrupal-5/drupal/modules/system/system.module
===================================================================
--- branches/vbdrupal-5/drupal/modules/system/system.module 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/modules/system/system.module 2010-03-04 17:39:00 UTC (rev 898)
@@ -6,7 +6,7 @@
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '5.21');
+define('VERSION', '5.22');
/**
* Implementation of hook_help().
Modified: branches/vbdrupal-5/drupal/robots.txt
===================================================================
--- branches/vbdrupal-5/drupal/robots.txt 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/robots.txt 2010-03-04 17:39:00 UTC (rev 898)
@@ -20,7 +20,6 @@
User-agent: *
Crawl-delay: 10
# Directories
-Disallow: /database/
Disallow: /includes/
Disallow: /misc/
Disallow: /modules/
Modified: branches/vbdrupal-5/drupal/update.php
===================================================================
--- branches/vbdrupal-5/drupal/update.php 2009-12-19 15:37:37 UTC (rev 897)
+++ branches/vbdrupal-5/drupal/update.php 2010-03-04 17:39:00 UTC (rev 898)
@@ -562,10 +562,11 @@
function update_info_page() {
drupal_set_title('Drupal database update');
+ $link = 'update.php?op=selection&token='. drupal_get_token('update');
$output = "<ol>\n";
$output .= "<li>Use this script to <strong>upgrade an existing Drupal installation</strong>. You don't need this script when installing Drupal from scratch.</li>";
$output .= "<li>Before doing anything, backup your database. This process will change your database and its values, and some things might get lost.</li>\n";
- $output .= "<li>Update your Drupal sources, check the notes below and <a href=\"update.php?op=selection\">run the database upgrade script</a>. Don't upgrade your database twice as it may cause problems.</li>\n";
+ $output .= "<li>Update your Drupal sources, check the notes below and <a href=\"$link\">run the database upgrade script</a>. Don't upgrade your database twice as it may cause problems.</li>\n";
$output .= "<li>Go through the various administration pages to change the existing and new settings to your liking.</li>\n";
$output .= "</ol>";
$output .= '<p>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.</p>';
@@ -793,10 +794,6 @@
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : '';
switch ($op) {
- case 'Update':
- $output = update_update_page();
- break;
-
case 'finished':
$output = update_finished_page(TRUE);
break;
@@ -813,10 +810,18 @@
$output = update_progress_page_nojs();
break;
+ case 'Update':
+ if ($_GET['token'] == drupal_get_token('update')) {
+ $output = update_update_page();
+ break;
+ }
+ // If the token did not match we just display the default page.
case 'selection':
- $output = update_selection_page();
- break;
-
+ if ($_GET['token'] == drupal_get_token('update')) {
+ $output = update_selection_page();
+ break;
+ }
+ // If the token did not match we just display the default page.
default:
$output = update_info_page();
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-12-19 15:37:46
|
Revision: 897
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=897&view=rev
Author: elmuerte
Date: 2009-12-19 15:37:37 +0000 (Sat, 19 Dec 2009)
Log Message:
-----------
Added Paths:
-----------
tags/v5_21_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-12-19 15:33:05
|
Revision: 896
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=896&view=rev
Author: elmuerte
Date: 2009-12-19 15:32:57 +0000 (Sat, 19 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/vbdrupal-5/localization/general.pot
branches/vbdrupal-5/localization/installer.pot
Modified: branches/vbdrupal-5/localization/general.pot
===================================================================
--- branches/vbdrupal-5/localization/general.pot 2009-12-19 15:21:48 UTC (rev 895)
+++ branches/vbdrupal-5/localization/general.pot 2009-12-19 15:32:57 UTC (rev 896)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-09-16 22:46+0200\n"
+"POT-Creation-Date: 2009-12-19 16:22+0100\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
Modified: branches/vbdrupal-5/localization/installer.pot
===================================================================
--- branches/vbdrupal-5/localization/installer.pot 2009-12-19 15:21:48 UTC (rev 895)
+++ branches/vbdrupal-5/localization/installer.pot 2009-12-19 15:32:57 UTC (rev 896)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-09-16 22:46+0200\n"
+"POT-Creation-Date: 2009-12-19 16:22+0100\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-12-19 15:22:06
|
Revision: 895
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=895&view=rev
Author: elmuerte
Date: 2009-12-19 15:21:48 +0000 (Sat, 19 Dec 2009)
Log Message:
-----------
vbdrupal 5.21
Modified Paths:
--------------
branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt
branches/vbdrupal-5/CHANGELOG.txt
branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc
branches/vbdrupal-5/drupal/modules/contact/contact.module
branches/vbdrupal-5/drupal/modules/system/system.module
branches/vbdrupal-5/localization/general.pot
branches/vbdrupal-5/localization/installer.pot
Modified: branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt
===================================================================
--- branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt 2009-09-16 21:52:40 UTC (rev 894)
+++ branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt 2009-12-19 15:21:48 UTC (rev 895)
@@ -1,5 +1,9 @@
// $Id$
+vbDrupal 5.21.0, 2009-12-19
+---------------------------
+- merged Drupal 5.21 changes
+
vbDrupal 5.20.0, 2009-09-16
---------------------------
- fixed an issue where user logins from vBulletin were not properly logged in
Modified: branches/vbdrupal-5/CHANGELOG.txt
===================================================================
--- branches/vbdrupal-5/CHANGELOG.txt 2009-09-16 21:52:40 UTC (rev 894)
+++ branches/vbdrupal-5/CHANGELOG.txt 2009-12-19 15:21:48 UTC (rev 895)
@@ -1,5 +1,10 @@
// $Id$
+Drupal 5.21, 2009-12-16
+-----------------------
+- Fixed a security issue (Cross site scripting), see SA-CORE-2009-009.
+- Fixed a variety of small bugs.
+
Drupal 5.20, 2009-09-16
-----------------------
- Avoid security problems resulting from writing Drupal 6-style menu
Modified: branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc 2009-09-16 21:52:40 UTC (rev 894)
+++ branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc 2009-12-19 15:21:48 UTC (rev 895)
@@ -3,4 +3,4 @@
/**
* the vBDrupal version
*/
-define('VBDRUPAL', '5.20.0');
+define('VBDRUPAL', '5.21.0');
Modified: branches/vbdrupal-5/drupal/modules/contact/contact.module
===================================================================
--- branches/vbdrupal-5/drupal/modules/contact/contact.module 2009-09-16 21:52:40 UTC (rev 894)
+++ branches/vbdrupal-5/drupal/modules/contact/contact.module 2009-12-19 15:21:48 UTC (rev 895)
@@ -145,7 +145,7 @@
$result = db_query('SELECT cid, category, recipients, selected FROM {contact} ORDER BY weight, category');
$rows = array();
while ($category = db_fetch_object($result)) {
- $rows[] = array($category->category, $category->recipients, ($category->selected ? t('Yes') : t('No')), l(t('edit'), 'admin/build/contact/edit/'. $category->cid), l(t('delete'), 'admin/build/contact/delete/'. $category->cid));
+ $rows[] = array(check_plain($category->category), check_plain($category->recipients), ($category->selected ? t('Yes') : t('No')), l(t('edit'), 'admin/build/contact/edit/'. $category->cid), l(t('delete'), 'admin/build/contact/delete/'. $category->cid));
}
$header = array(t('Category'), t('Recipients'), t('Selected'), array('data' => t('Operations'), 'colspan' => 2));
@@ -549,4 +549,3 @@
// Jump to home page rather than back to contact page to avoid contradictory messages if flood control has been activated.
return '';
}
-
Modified: branches/vbdrupal-5/drupal/modules/system/system.module
===================================================================
--- branches/vbdrupal-5/drupal/modules/system/system.module 2009-09-16 21:52:40 UTC (rev 894)
+++ branches/vbdrupal-5/drupal/modules/system/system.module 2009-12-19 15:21:48 UTC (rev 895)
@@ -6,7 +6,7 @@
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '5.20');
+define('VERSION', '5.21');
/**
* Implementation of hook_help().
Modified: branches/vbdrupal-5/localization/general.pot
===================================================================
--- branches/vbdrupal-5/localization/general.pot 2009-09-16 21:52:40 UTC (rev 894)
+++ branches/vbdrupal-5/localization/general.pot 2009-12-19 15:21:48 UTC (rev 895)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-09-16 22:44+0200\n"
+"POT-Creation-Date: 2009-09-16 22:46+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
Modified: branches/vbdrupal-5/localization/installer.pot
===================================================================
--- branches/vbdrupal-5/localization/installer.pot 2009-09-16 21:52:40 UTC (rev 894)
+++ branches/vbdrupal-5/localization/installer.pot 2009-12-19 15:21:48 UTC (rev 895)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-09-16 22:44+0200\n"
+"POT-Creation-Date: 2009-09-16 22:46+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-09-16 21:52:48
|
Revision: 894
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=894&view=rev
Author: elmuerte
Date: 2009-09-16 21:52:40 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
Added Paths:
-----------
tags/v5_20_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-09-16 20:47:08
|
Revision: 893
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=893&view=rev
Author: elmuerte
Date: 2009-09-16 20:47:00 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
5.20.0
Modified Paths:
--------------
branches/vbdrupal-5/build.xml
branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc
branches/vbdrupal-5/localization/general.pot
branches/vbdrupal-5/localization/installer.pot
Modified: branches/vbdrupal-5/build.xml
===================================================================
--- branches/vbdrupal-5/build.xml 2009-09-16 20:42:45 UTC (rev 892)
+++ branches/vbdrupal-5/build.xml 2009-09-16 20:47:00 UTC (rev 893)
@@ -38,6 +38,7 @@
<exclude name="drupal/.htaccess" />
<exclude name="drupal/files/**" />
<exclude name="drupal/sites/all/modules/**" />
+ <exclude name="drupal/sites/eldevel.tds/**" />
<exclude name="drupal/sites/default/settings.php" />
</fileset>
<zip destfile="dist/vbDrupal-${version}.zip">
Modified: branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc 2009-09-16 20:42:45 UTC (rev 892)
+++ branches/vbdrupal-5/drupal/includes/vbdrupal/version.inc 2009-09-16 20:47:00 UTC (rev 893)
@@ -3,4 +3,4 @@
/**
* the vBDrupal version
*/
-define('VBDRUPAL', '5.19.1');
+define('VBDRUPAL', '5.20.0');
Modified: branches/vbdrupal-5/localization/general.pot
===================================================================
--- branches/vbdrupal-5/localization/general.pot 2009-09-16 20:42:45 UTC (rev 892)
+++ branches/vbdrupal-5/localization/general.pot 2009-09-16 20:47:00 UTC (rev 893)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-07-02 17:06+0200\n"
+"POT-Creation-Date: 2009-09-16 22:44+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -117,7 +117,7 @@
msgid "Default comment setting"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:179;231 ../drupal/modules/vblist/vblist.module:162 ../drupal/modules/vbuser/vbuser.module:325
+#: ../drupal/modules/comment_vb/comment_vb.module:179;231 ../drupal/modules/vblist/vblist.module:171 ../drupal/modules/vbuser/vbuser.module:325
msgid "Disabled"
msgstr ""
@@ -225,7 +225,7 @@
msgid "Jump to the first comment of this posting."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:651 ../drupal/modules/vblist/vblist.module:384
+#: ../drupal/modules/comment_vb/comment_vb.module:651 ../drupal/modules/vblist/vblist.module:407
msgid "Jump to the first new comment of this posting."
msgstr ""
@@ -811,39 +811,51 @@
msgid "The time period to cache the results. New threads will invalidate the cache right away, only the thread content will be cached for a given time."
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:162
+#: ../drupal/modules/vblist/vblist.module:144
+msgid "Cache slack period"
+msgstr ""
+
+#: ../drupal/modules/vblist/vblist.module:147
+msgid "Time before updating the first post of the thread will invalidate the cache."
+msgstr ""
+
+#: ../drupal/modules/vblist/vblist.module:171
msgid "Full"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:162
+#: ../drupal/modules/vblist/vblist.module:171
msgid "Preview"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:179
+#: ../drupal/modules/vblist/vblist.module:188
msgid "Save forums"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "ID"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "Forum"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "Status"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "Ignore privs"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "Sub view"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:286
+#: ../drupal/modules/vblist/vblist.module:331
+msgid "page !d"
+msgstr ""
+
+#: ../drupal/modules/vblist/vblist.module:295
msgid "1 comment"
msgid_plural "@count comments"
msgstr[0] ""
Modified: branches/vbdrupal-5/localization/installer.pot
===================================================================
--- branches/vbdrupal-5/localization/installer.pot 2009-09-16 20:42:45 UTC (rev 892)
+++ branches/vbdrupal-5/localization/installer.pot 2009-09-16 20:47:00 UTC (rev 893)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-07-02 17:06+0200\n"
+"POT-Creation-Date: 2009-09-16 22:44+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-09-16 20:42:57
|
Revision: 892
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=892&view=rev
Author: elmuerte
Date: 2009-09-16 20:42:45 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
5.20 changes
Modified Paths:
--------------
branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt
branches/vbdrupal-5/CHANGELOG.txt
branches/vbdrupal-5/drupal/includes/cache.inc
branches/vbdrupal-5/drupal/includes/common.inc
branches/vbdrupal-5/drupal/includes/database.mysql.inc
branches/vbdrupal-5/drupal/includes/database.mysqli.inc
branches/vbdrupal-5/drupal/includes/database.vbulletin.inc
branches/vbdrupal-5/drupal/includes/menu.inc
branches/vbdrupal-5/drupal/modules/search/search.module
branches/vbdrupal-5/drupal/modules/system/system.module
branches/vbdrupal-5/drupal/modules/taxonomy/taxonomy.module
branches/vbdrupal-5/drupal/themes/garland/style.css
Modified: branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt
===================================================================
--- branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt 2009-09-16 20:42:45 UTC (rev 892)
@@ -1,11 +1,12 @@
// $Id$
-vbDrupal 5.19.1, 2009-??-??
+vbDrupal 5.20.0, 2009-09-16
---------------------------
- fixed an issue where user logins from vBulletin were not properly logged in
drupal
- improved caching of vblist
- comment thread deletion did not work
+- merged Drupal 5.20 changes
vbDrupal 5.19.0, 2009-07-02
---------------------------
Modified: branches/vbdrupal-5/CHANGELOG.txt
===================================================================
--- branches/vbdrupal-5/CHANGELOG.txt 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/CHANGELOG.txt 2009-09-16 20:42:45 UTC (rev 892)
@@ -1,5 +1,12 @@
// $Id$
+Drupal 5.20, 2009-09-16
+-----------------------
+- Avoid security problems resulting from writing Drupal 6-style menu
+ declarations.
+- Fixed security issues (session fixation), see SA-CORE-2009-008.
+- Fixed a variety of small bugs.
+
Drupal 5.19, 2009-07-01
-----------------------
- Fixed security issues (Cross site scripting and Password leakage in URL), see
Modified: branches/vbdrupal-5/drupal/includes/cache.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/cache.inc 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/includes/cache.inc 2009-09-16 20:42:45 UTC (rev 892)
@@ -14,10 +14,10 @@
global $user;
// Garbage collection necessary when enforcing a minimum cache lifetime
- $cache_flush = variable_get('cache_flush', 0);
+ $cache_flush = variable_get('cache_flush_'. $table, 0);
if ($cache_flush && ($cache_flush + variable_get('cache_lifetime', 0) <= time())) {
// Reset the variable immediately to prevent a meltdown in heavy load situations.
- variable_set('cache_flush', 0);
+ variable_set('cache_flush_'. $table, 0);
// Time to flush old cache data
db_query("DELETE FROM {". $table ."} WHERE expire != %d AND expire <= %d", CACHE_PERMANENT, $cache_flush);
}
@@ -134,16 +134,16 @@
// cached data that was cached before the timestamp.
$user->cache = time();
- $cache_flush = variable_get('cache_flush', 0);
+ $cache_flush = variable_get('cache_flush_'. $table, 0);
if ($cache_flush == 0) {
// This is the first request to clear the cache, start a timer.
- variable_set('cache_flush', time());
+ variable_set('cache_flush_'. $table, time());
}
else if (time() > ($cache_flush + variable_get('cache_lifetime', 0))) {
- // Clear the cache for everyone, cache_flush_delay seconds have
+ // Clear the cache for everyone, cache_lifetime seconds have
// passed since the first request to clear the cache.
db_query("DELETE FROM {". $table. "} WHERE expire != %d AND expire < %d", CACHE_PERMANENT, time());
- variable_set('cache_flush', 0);
+ variable_set('cache_flush_'. $table, 0);
}
}
else {
Modified: branches/vbdrupal-5/drupal/includes/common.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/common.inc 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/includes/common.inc 2009-09-16 20:42:45 UTC (rev 892)
@@ -427,6 +427,18 @@
// Parse the URL, and make sure we can handle the schema.
$uri = parse_url($url);
+ if ($uri == FALSE) {
+ $result->error = 'unable to parse URL';
+ $result->code = -1001;
+ return $result;
+ }
+
+ if (!isset($uri['scheme'])) {
+ $result->error = 'missing schema';
+ $result->code = -1002;
+ return $result;
+ }
+
switch ($uri['scheme']) {
case 'http':
$port = isset($uri['port']) ? $uri['port'] : 80;
@@ -441,6 +453,7 @@
break;
default:
$result->error = 'invalid schema '. $uri['scheme'];
+ $result->code = -1003;
return $result;
}
Modified: branches/vbdrupal-5/drupal/includes/database.mysql.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/database.mysql.inc 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/includes/database.mysql.inc 2009-09-16 20:42:45 UTC (rev 892)
@@ -360,7 +360,7 @@
$tablename = array_pop($args);
array_shift($args);
- $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' SELECT', db_prefix_tables($query));
+ $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' Engine=HEAP SELECT', db_prefix_tables($query));
if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
$args = $args[0];
}
Modified: branches/vbdrupal-5/drupal/includes/database.mysqli.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/database.mysqli.inc 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/includes/database.mysqli.inc 2009-09-16 20:42:45 UTC (rev 892)
@@ -343,7 +343,7 @@
$tablename = array_pop($args);
array_shift($args);
- $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' SELECT', db_prefix_tables($query));
+ $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' Engine=HEAP SELECT', db_prefix_tables($query));
if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
$args = $args[0];
}
Modified: branches/vbdrupal-5/drupal/includes/database.vbulletin.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/database.vbulletin.inc 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/includes/database.vbulletin.inc 2009-09-16 20:42:45 UTC (rev 892)
@@ -422,7 +422,7 @@
$tablename = array_pop($args);
array_shift($args);
- $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' SELECT', db_prefix_tables($query));
+ $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' Engine=HEAP SELECT', db_prefix_tables($query));
if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
$args = $args[0];
}
Modified: branches/vbdrupal-5/drupal/includes/menu.inc
===================================================================
--- branches/vbdrupal-5/drupal/includes/menu.inc 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/includes/menu.inc 2009-09-16 20:42:45 UTC (rev 892)
@@ -1055,6 +1055,10 @@
$temp_mid = -1;
foreach ($menu_item_list as $item) {
+ // Protect against D6 style access
+ if (isset($item['access']) && is_array($item['access']) && count($item['access']) == 1 && isset($item['access'][0]) && is_string($item['access'][0])) {
+ $item['access'] = FALSE;
+ }
if (!isset($item['path'])) {
$item['path'] = '';
}
@@ -1225,6 +1229,10 @@
$new_items = array();
foreach ($menu_item_list as $item) {
+ // Protect against D6 style access
+ if (isset($item['access']) && is_array($item['access']) && count($item['access']) == 1 && isset($item['access'][0]) && is_string($item['access'][0])) {
+ $item['access'] = FALSE;
+ }
if (isset($item['callback'])) {
$_menu['callbacks'][$item['path']] = array('callback' => $item['callback']);
if (isset($item['callback arguments'])) {
Modified: branches/vbdrupal-5/drupal/modules/search/search.module
===================================================================
--- branches/vbdrupal-5/drupal/modules/search/search.module 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/modules/search/search.module 2009-09-16 20:42:45 UTC (rev 892)
@@ -1052,6 +1052,17 @@
* Process a block search form submission.
*/
function search_box_form_submit($form_id, $form_values) {
+ // The search form relies on control of the redirect destination for its
+ // functionality, so we override any static destination set in the request,
+ // for example by drupal_access_denied() or drupal_not_found()
+ // (see http://drupal.org/node/292565).
+ if (isset($_REQUEST['destination'])) {
+ unset($_REQUEST['destination']);
+ }
+ if (isset($_REQUEST['edit']['destination'])) {
+ unset($_REQUEST['edit']['destination']);
+ }
+
return 'search/node/'. trim($form_values[$form_id .'_keys']);
}
Modified: branches/vbdrupal-5/drupal/modules/system/system.module
===================================================================
--- branches/vbdrupal-5/drupal/modules/system/system.module 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/modules/system/system.module 2009-09-16 20:42:45 UTC (rev 892)
@@ -6,7 +6,7 @@
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '5.19');
+define('VERSION', '5.20');
/**
* Implementation of hook_help().
@@ -533,7 +533,7 @@
function _system_zonelist() {
$timestamp = time();
- $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2.5, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14);
+ $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14);
$zones = array();
foreach ($zonelist as $offset) {
$zone = $offset * 3600;
Modified: branches/vbdrupal-5/drupal/modules/taxonomy/taxonomy.module
===================================================================
--- branches/vbdrupal-5/drupal/modules/taxonomy/taxonomy.module 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/modules/taxonomy/taxonomy.module 2009-09-16 20:42:45 UTC (rev 892)
@@ -57,7 +57,6 @@
* @return
* An internal Drupal path.
*/
-
function taxonomy_term_path($term) {
$vocabulary = taxonomy_get_vocabulary($term->vid);
if ($vocabulary->module != 'taxonomy' && $path = module_invoke($vocabulary->module, 'term_path', $term)) {
Modified: branches/vbdrupal-5/drupal/themes/garland/style.css
===================================================================
--- branches/vbdrupal-5/drupal/themes/garland/style.css 2009-08-04 02:25:04 UTC (rev 891)
+++ branches/vbdrupal-5/drupal/themes/garland/style.css 2009-09-16 20:42:45 UTC (rev 892)
@@ -606,6 +606,7 @@
text-decoration: none;
position: relative;
top: -1px;
+ display: inline-block;
}
ul.primary li.active a, ul.primary li.active a:link, ul.primary li.active a:visited, ul.primary li a:hover,
ul.secondary li.active a, ul.secondary li.active a:link, ul.secondary li.active a:visited, ul.secondary li a:hover {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2009-08-04 02:25:12
|
Revision: 891
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=891&view=rev
Author: tomeee
Date: 2009-08-04 02:25:04 +0000 (Tue, 04 Aug 2009)
Log Message:
-----------
VbForumBlocks module works.
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.install
trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.module
Modified: trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.install
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.install 2009-08-02 15:23:45 UTC (rev 890)
+++ trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.install 2009-08-04 02:25:04 UTC (rev 891)
@@ -8,7 +8,7 @@
*/
function vbforumblocks_install() {
- drupal_install_schema('forum_blocks');
+ drupal_install_schema('vbforumblocks');
}
/**
Modified: trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.module
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.module 2009-08-02 15:23:45 UTC (rev 890)
+++ trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.module 2009-08-04 02:25:04 UTC (rev 891)
@@ -141,7 +141,7 @@
function __vbforumblocks_save($delta, $edit = array()) {
if ($delta == -1) {
- $delta = db_last_insert_id('{vbforumblocks}_bid');
+ $delta = db_last_insert_id('vbforumblocks', 'bid');
}
$options = array();
@@ -373,7 +373,7 @@
function vbforumblocks_form_submit($form, &$form_state) {
if (isset($form_state['values']['newblock'])) {
- __vbforumblocks_save(db_last_insert_id('{vbforumblocks}_bid'), $form_state['values']);
+ __vbforumblocks_save(db_last_insert_id('vbforumblocks', 'bid'), $form_state['values']);
drupal_set_message(t('The new forum block has been added.'));
drupal_goto('admin/build/block');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-08-02 15:24:02
|
Revision: 890
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=890&view=rev
Author: elmuerte
Date: 2009-08-02 15:23:45 +0000 (Sun, 02 Aug 2009)
Log Message:
-----------
changed to ant build script
Added Paths:
-----------
branches/vbdrupal-5/build.xml
Removed Paths:
-------------
branches/vbdrupal-5/build.php
branches/vbdrupal-5/build.spec.xml
Deleted: branches/vbdrupal-5/build.php
===================================================================
--- branches/vbdrupal-5/build.php 2009-08-02 15:22:41 UTC (rev 889)
+++ branches/vbdrupal-5/build.php 2009-08-02 15:23:45 UTC (rev 890)
@@ -1,352 +0,0 @@
-<?php
-
-// $Id$
-
-/**
- * This will create a release package for vbDrupal
- *
- * Required PEAR packages:
- * Log
- * Console/Getargs
- * Console/ProgressBar
- * File/Archive
- * File/Find
- *
- * @author Michiel Hendriks
- */
-
-define('APP_NAME', 'vbDrupal build script');
-define('VERSION', '$Revision$');
-
-require_once 'PEAR.php';
-
-//
-// Setting up the logging interface
-//
-
-require_once 'Log.php';
-$log = &Log::singleton('console', '', 'build', array('lineFormat' => '%1s [%3$s] %4$s'), PEAR_LOG_WARNING);
-
-function phpErrorHandler($code, $message, $file, $line) {
- global $log;
- /* Map the PHP error to a Log priority. */
- switch ($code) {
- case E_WARNING:
- case E_USER_WARNING:
- $priority = PEAR_LOG_WARNING;
- break;
- case E_NOTICE:
- case E_USER_NOTICE:
- $priority = PEAR_LOG_NOTICE;
- break;
- case E_ERROR:
- case E_USER_ERROR:
- $priority = PEAR_LOG_ERR;
- break;
- default:
- $priotity = PEAR_LOG_INFO;
- }
- $log->log($message . ' in ' . $file . ' at line ' . $line, $priority);
-}
-
-set_error_handler('phpErrorHandler');
-
-function pearErrorHandler($error) {
- global $log;
- $message = $error->getMessage();
- if (!empty($error->backtrace[1]['file'])) {
- $message .= ' (' . $error->backtrace[1]['file'];
- if (!empty($error->backtrace[1]['line'])) {
- $message .= ' at line ' . $error->backtrace[1]['line'];
- }
- $message .= ')';
- }
- $log->log($message, $error->code);
-}
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'pearErrorHandler');
-
-//
-// Process commandline arguments
-//
-
-require_once 'Console/Getargs.php';
-
-$cmdArgConfig = array(
- 'version' => array(
- 'short' => 'v',
- 'max' => 0,
- 'desc' => 'Show program version.',
- ),
- 'debug' => array(
- 'short' => 'd',
- 'max' => 0,
- 'desc' => 'Enable debug output. Can be used multiple times to increase debug output.',
- ),
- 'file|makefile' => array(
- 'short' => 'f',
- 'default' => 'build.spec.xml',
- 'max' => 1,
- 'desc' => 'The build specification to use.',
- ),
- 'quiet' => array(
- 'short' => 'q',
- 'max' => 0,
- 'desc' => 'Reduce output.',
- ),
- 'help' => array(
- 'short' => '?',
- 'max' => 0,
- 'desc' => 'Show this message.',
- ),
- 'nopre' => array(
- 'max' => 0,
- 'desc' => 'Disable pre-processing instructions',
- ),
-);
-$args =& Console_Getargs::factory($cmdArgConfig);
-
-if (PEAR::isError($args)) {
- if ($args->getCode() === CONSOLE_GETARGS_ERROR_USER) {
- echo Console_Getargs::getHelp($cmdArgConfig, null, "\n".$args->getMessage()."\n");
- }
- else if ($args->getCode() === CONSOLE_GETARGS_HELP) {
- echo Console_Getargs::getHelp($cmdArgConfig);
- }
- exit;
-}
-
-if ($args->isDefined('debug')) {
- switch (count($args->getValue('debug'))) {
- case 3:
- $log->setMask(PEAR_LOG_ALL);
- $log->debug('Maximum debug output set');
- break;
- case 2:
- $log->setMask(Log::UPTO(PEAR_LOG_INFO));
- break;
- default:
- $log->setMask(Log::UPTO(PEAR_LOG_NOTICE));
- }
-}
-if ($args->isDefined('quiet')) {
- $log->setMask(Log::UPTO(PEAR_LOG_ERR));
-}
-if ($args->isDefined('help')) {
- echo Console_Getargs::getHelp($cmdArgConfig);
- exit;
-}
-if ($args->isDefined('version')) {
- echo APP_NAME.' '.VERSION;
- exit;
-}
-
-if (version_compare(phpversion(), '5.2', '<=')) {
- $log->crit('PHP 5.2 or later is required. Current version is: '.phpversion());
- exit(1);
-}
-
-//
-// Step 1
-// Reading specification
-//
-
-$specfile = $args->getValue('file');
-if (!is_readable($specfile)) {
- $log->err('Unable to read build specification from: '.$specfile);
- exit(1);
-}
-
-$log->notice('Loading build specification from '.$specfile);
-$spec = simplexml_load_file($specfile);
-
-/**
- * Product class
- */
-class Product {
- protected $title = 'untitled';
- protected $version = 'unknown';
- protected $files = array();
-
- public function setTitle($string) {
- $this->title = $string;
- }
-
- public function getTitle() {
- return $this->title;
- }
-
- public function setVersion($string) {
- $this->version = $string;
- }
-
- public function getVersion() {
- return $this->version;
- }
-
- public function getSafeVersion() {
- return str_replace(' ', '_', $this->getVersion());
- }
-
- public function setFiles($files) {
- $this->files = $files;
- }
-
- public function getFiles() {
- return $this->files;
- }
-
- public function __toString() {
- return $this->getTitle().' '.$this->getVersion();
- }
-}
-
-$product = new Product();
-$product->setTitle((string) $spec['title']);
-$product->setVersion('unknown');
-if (preg_match("/^@(.*):(.*)$/" , (string) $spec['version'], $vars)) {
- if (@include_once($vars[1])) {
- if (substr($vars[2], 0, 1) == '$') {
- $x = $vars[2];
- $product->setVersion($$x);
- }
- else {
- $product->setVersion(constant($vars[2]));
- }
- }
-}
-
-if (!$args->isDefined('quiet') && !$args->isDefined('debug')) {
- require_once 'Console/ProgressBar.php';
- $progress = new Console_ProgressBar(((string) $product).' [%bar%] %percent%', '=>', ' ', 80, 100);
- $progress->update(0);
-
- class PBErasor extends Log {
- function PBErasor($name, $ident = '', $conf = array(), $level = PEAR_LOG_DEBUG)
- {}
-
- function log($message, $priority = null) {
- global $progress;
- if ($this->_isMasked($priority)) {
- $progress->erase(true);
- }
- }
- }
- $pberaser =& new PBErasor('logerasor');
- $pberaser->setMask($log->getMask());
-
- $_log =& $log;
- $log =& Log::singleton('composite');
- $log->addChild($pberaser);
- $log->addChild($_log);
- $log->setMask($_log->getMask());
-}
-else {
- $progress = false;
-}
-
-//
-// Step 2
-// Constructing file list
-//
-$log->notice('Constructing file list');
-//if ($progress) $progress->update(25);
-require_once 'File/Find.php';
-chdir(dirname($specfile));
-$baseDir = getcwd();
-$log->info('Current directory: '.$baseDir);
-$filesSpec =& $spec->files;
-$log->info('Listing files from: '.(string)$filesSpec['base']);
-list($directories, $files) = File_Find::maptree((string)$filesSpec['base']);
-unset($directories);
-
-function filterFiles($entry) {
- global $filesSpec, $log;
- foreach ($filesSpec->exclude as $exclude) {
- if (preg_match($exclude, $entry)) {
- $log->debug('Excluding file: '.$entry);
- return false;
- }
- }
- foreach ($filesSpec->include as $include) {
- if (preg_match($include, $entry)) {
- $log->debug('Including file: '.$entry);
- return true;
- }
- }
- $log->debug('Excluding file: '.$entry);
- return false;
-}
-
-$product->setFiles(array_filter($files, 'filterFiles'));
-unset($files);
-
-$log->notice('Loaded product: '.((string) $product));
-
-//
-// Step 3
-// Preprocessing
-//
-if ($progress) $progress->update(33);
-if (!$args->isDefined('nopre')) {
- $log->notice('Preprocessing');
- foreach ($spec->preprocess->exec as $exec) {
- chdir($baseDir);
- $log->notice('[PRE] '.$exec['label']);
- if ($exec['isphp'] == 'true') {
- eval((string) $exec);
- }
- else {
- $log->warn('Unrecognized preprocessing instructions');
- }
- }
-}
-else {
- $log->notice('Preprocessing DISABLED');
-}
-
-//
-// Step 4
-// Packaging
-//
-chdir($baseDir);
-require_once 'File/Archive.php';
-
-$log->notice('Packaging in dir: '.getcwd());
-if ($progress) $progress->update(66);
-
-$files = $product->getFiles();
-$_cur = 0;
-$_tot = count($spec->output) * count($files) + 1;
-foreach ($spec->output as $output) {
- $outfile = $output['name'];
- $outfile = str_replace('{title}', $product->getTitle(), $outfile);
- $outfile = str_replace('{version}', $product->getSafeVersion(), $outfile);
-
- if (file_exists($outfile)) {
- $log->warning('Removing old archive: '.$outfile);
- unlink($outfile);
- }
-
- //$appender = File_Archive::appender($outfile, null, $output['type']);
- $writer =& File_Archive::toFiles();
- $appender = File_Archive::toArchive($outfile, $writer, $output['type']);
- foreach($files as $file) {
- $log->debug('Adding file '.$file.' to '.$outfile);
- $source = File_Archive::read($file, $file);
- $error = File_Archive::extract($source, $appender, false);
-
- if ($progress) {
- $_cur++;
- $progress->update(66 + 33 * ($_cur/$_tot));
- }
- }
- $appender->close();
-}
-
-if ($progress) $progress->update(100);
-
-
-exit(0);
-//
-// The end
-//
Deleted: branches/vbdrupal-5/build.spec.xml
===================================================================
--- branches/vbdrupal-5/build.spec.xml 2009-08-02 15:22:41 UTC (rev 889)
+++ branches/vbdrupal-5/build.spec.xml 2009-08-02 15:23:45 UTC (rev 890)
@@ -1,53 +0,0 @@
-<!-- $Id$ -->
-<product title="vbDrupal" version="@drupal/includes/vbdrupal/version.inc:VBDRUPAL">
- <output name="dist/{title}-{version}.tar.gz" format="tar.gz" />
- <!--<output name="{title}-{version}.tar.bz2" format="tar.bz2" />-->
- <output name="dist/{title}-{version}.zip" format="zip" />
-
- <files base=".">
- <include>#^./CHANGELOG(.*).txt$#i</include>
- <include>#^./README.html$#i</include>
- <include>#^./LICENSE.txt$#i</include>
-
- <include>#^./drupal/.*#</include>
-
- <exclude>#^./drupal/\.htaccess$#</exclude>
- <exclude>#^./drupal/sites/eldevel.tds#</exclude>
- <exclude>#^./drupal/files/#</exclude>
-
- <!-- exclude CVS/SVN files -->
- <exclude>#CVS/.*#</exclude>
- <exclude>#\.cvsignore#</exclude>
- <exclude>#\.svn/.*#i</exclude>
-
- <!-- dev scripts -->
- <exclude>#^./dev-scripts/#</exclude>
- <exclude>#^./conversion/.*#</exclude>
- <exclude>#^./localization/.*#</exclude>
- <exclude>#^./TODO.TXT#i</exclude>
-
- <!-- temp files e.d. -->
- <exclude>#~$#</exclude>
- <exclude>#.*\.old$#</exclude>
- <exclude>#^[^/]*\.(zip)|(gz)|(bz)$#i</exclude>
- </files>
-
- <preprocess>
- <exec isphp="true" label="Updating hashdb..."><![CDATA[
- ob_start();
- $_GET['dbupdate'] = true;
- chdir('dev-scripts');
- include('./file_check.php');
- ob_end_clean();
- ]]></exec>
- <exec isphp="true" label="Updating localization templates..."><![CDATA[
- function __update_loc() {
- ob_start();
- chdir('localization');
- include('./vbdrupal.php');
- ob_end_clean();
- }
- __update_loc();
- ]]></exec>
- </preprocess>
-</product>
Added: branches/vbdrupal-5/build.xml
===================================================================
--- branches/vbdrupal-5/build.xml (rev 0)
+++ branches/vbdrupal-5/build.xml 2009-08-02 15:23:45 UTC (rev 890)
@@ -0,0 +1,51 @@
+<project name="vbdrupal" default="dist">
+
+ <target name="init">
+ <mkdir dir="dist" />
+
+ <exec executable="php" resolveexecutable="off" outputproperty="version">
+ <arg value="-r" />
+ <arg value="require 'drupal/includes/vbdrupal/version.inc'; echo VBDRUPAL;" />
+ <redirector>
+ <outputfilterchain>
+ <replaceregex pattern="[ ]" replace="_" flags="gi" />
+ </outputfilterchain>
+ </redirector>
+ </exec>
+ </target>
+
+ <target name="update-filedb">
+ <exec executable="php" dir="dev-scripts" resolveexecutable="off" outputproperty="filedb.output">
+ <arg value="file_check.php" />
+ <arg value="--" />
+ <arg value="dbupdate" />
+ </exec>
+ </target>
+
+ <target name="update-localization">
+ <exec executable="php" dir="localization" resolveexecutable="off">
+ <arg value="vbdrupal.php" />
+ </exec>
+ </target>
+
+ <target name="dist" depends="init,update-filedb,update-localization" description="Build the release distribution">
+ <fileset id="distfiles" dir="${basedir}">
+ <include name="CHANGELOG*.txt" />
+ <include name="README.html" />
+ <include name="LICENSE.txt" />
+ <include name="drupal/**" />
+
+ <exclude name="drupal/.htaccess" />
+ <exclude name="drupal/files/**" />
+ <exclude name="drupal/sites/all/modules/**" />
+ <exclude name="drupal/sites/default/settings.php" />
+ </fileset>
+ <zip destfile="dist/vbDrupal-${version}.zip">
+ <fileset refid="distfiles" />
+ </zip>
+ <tar destfile="dist/vbDrupal-${version}.tar.gz" compression="gzip">
+ <fileset refid="distfiles" />
+ </tar>
+ </target>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-08-02 15:22:49
|
Revision: 889
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=889&view=rev
Author: elmuerte
Date: 2009-08-02 15:22:41 +0000 (Sun, 02 Aug 2009)
Log Message:
-----------
changed the build script to ant
Modified Paths:
--------------
trunk/vbdrupal-ng/dev-scripts/file_check.hashdb.php
trunk/vbdrupal-ng/dev-scripts/file_check.php
trunk/vbdrupal-ng/drupal/includes/vbdrupal/version.inc
trunk/vbdrupal-ng/drupal/modules/vbnode/vbnode.install
trunk/vbdrupal-ng/drupal/modules/vbnode/vbnode.module
trunk/vbdrupal-ng/localization/general.pot
trunk/vbdrupal-ng/localization/installer.pot
Added Paths:
-----------
trunk/vbdrupal-ng/build.xml
Removed Paths:
-------------
trunk/vbdrupal-ng/build.php
trunk/vbdrupal-ng/build.spec.xml
Deleted: trunk/vbdrupal-ng/build.php
===================================================================
--- trunk/vbdrupal-ng/build.php 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/build.php 2009-08-02 15:22:41 UTC (rev 889)
@@ -1,352 +0,0 @@
-<?php
-
-// $Id$
-
-/**
- * This will create a release package for vbDrupal
- *
- * Required PEAR packages:
- * Log
- * Console/Getargs
- * Console/ProgressBar
- * File/Archive
- * File/Find
- *
- * @author Michiel Hendriks
- */
-
-define('APP_NAME', 'vbDrupal build script');
-define('VERSION', '$Revision$');
-
-require_once 'PEAR.php';
-
-//
-// Setting up the logging interface
-//
-
-require_once 'Log.php';
-$log = &Log::singleton('console', '', 'build', array('lineFormat' => '%1s [%3$s] %4$s'), PEAR_LOG_WARNING);
-
-function phpErrorHandler($code, $message, $file, $line) {
- global $log;
- /* Map the PHP error to a Log priority. */
- switch ($code) {
- case E_WARNING:
- case E_USER_WARNING:
- $priority = PEAR_LOG_WARNING;
- break;
- case E_NOTICE:
- case E_USER_NOTICE:
- $priority = PEAR_LOG_NOTICE;
- break;
- case E_ERROR:
- case E_USER_ERROR:
- $priority = PEAR_LOG_ERR;
- break;
- default:
- $priotity = PEAR_LOG_INFO;
- }
- $log->log($message . ' in ' . $file . ' at line ' . $line, $priority);
-}
-
-set_error_handler('phpErrorHandler');
-
-function pearErrorHandler($error) {
- global $log;
- $message = $error->getMessage();
- if (!empty($error->backtrace[1]['file'])) {
- $message .= ' (' . $error->backtrace[1]['file'];
- if (!empty($error->backtrace[1]['line'])) {
- $message .= ' at line ' . $error->backtrace[1]['line'];
- }
- $message .= ')';
- }
- $log->log($message, $error->code);
-}
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'pearErrorHandler');
-
-//
-// Process commandline arguments
-//
-
-require_once 'Console/Getargs.php';
-
-$cmdArgConfig = array(
- 'version' => array(
- 'short' => 'v',
- 'max' => 0,
- 'desc' => 'Show program version.',
- ),
- 'debug' => array(
- 'short' => 'd',
- 'max' => 0,
- 'desc' => 'Enable debug output. Can be used multiple times to increase debug output.',
- ),
- 'file|makefile' => array(
- 'short' => 'f',
- 'default' => 'build.spec.xml',
- 'max' => 1,
- 'desc' => 'The build specification to use.',
- ),
- 'quiet' => array(
- 'short' => 'q',
- 'max' => 0,
- 'desc' => 'Reduce output.',
- ),
- 'help' => array(
- 'short' => '?',
- 'max' => 0,
- 'desc' => 'Show this message.',
- ),
- 'nopre' => array(
- 'max' => 0,
- 'desc' => 'Disable pre-processing instructions',
- ),
-);
-$args =& Console_Getargs::factory($cmdArgConfig);
-
-if (PEAR::isError($args)) {
- if ($args->getCode() === CONSOLE_GETARGS_ERROR_USER) {
- echo Console_Getargs::getHelp($cmdArgConfig, null, "\n".$args->getMessage()."\n");
- }
- else if ($args->getCode() === CONSOLE_GETARGS_HELP) {
- echo Console_Getargs::getHelp($cmdArgConfig);
- }
- exit;
-}
-
-if ($args->isDefined('debug')) {
- switch (count($args->getValue('debug'))) {
- case 3:
- $log->setMask(PEAR_LOG_ALL);
- $log->debug('Maximum debug output set');
- break;
- case 2:
- $log->setMask(Log::UPTO(PEAR_LOG_INFO));
- break;
- default:
- $log->setMask(Log::UPTO(PEAR_LOG_NOTICE));
- }
-}
-if ($args->isDefined('quiet')) {
- $log->setMask(Log::UPTO(PEAR_LOG_ERR));
-}
-if ($args->isDefined('help')) {
- echo Console_Getargs::getHelp($cmdArgConfig);
- exit;
-}
-if ($args->isDefined('version')) {
- echo APP_NAME.' '.VERSION;
- exit;
-}
-
-if (version_compare(phpversion(), '5.2', '<=')) {
- $log->crit('PHP 5.2 or later is required. Current version is: '.phpversion());
- exit(1);
-}
-
-//
-// Step 1
-// Reading specification
-//
-
-$specfile = $args->getValue('file');
-if (!is_readable($specfile)) {
- $log->err('Unable to read build specification from: '.$specfile);
- exit(1);
-}
-
-$log->notice('Loading build specification from '.$specfile);
-$spec = simplexml_load_file($specfile);
-
-/**
- * Product class
- */
-class Product {
- protected $title = 'untitled';
- protected $version = 'unknown';
- protected $files = array();
-
- public function setTitle($string) {
- $this->title = $string;
- }
-
- public function getTitle() {
- return $this->title;
- }
-
- public function setVersion($string) {
- $this->version = $string;
- }
-
- public function getVersion() {
- return $this->version;
- }
-
- public function getSafeVersion() {
- return str_replace(' ', '_', $this->getVersion());
- }
-
- public function setFiles($files) {
- $this->files = $files;
- }
-
- public function getFiles() {
- return $this->files;
- }
-
- public function __toString() {
- return $this->getTitle().' '.$this->getVersion();
- }
-}
-
-$product = new Product();
-$product->setTitle((string) $spec['title']);
-$product->setVersion('unknown');
-if (preg_match("/^@(.*):(.*)$/" , (string) $spec['version'], $vars)) {
- if (@include_once($vars[1])) {
- if (substr($vars[2], 0, 1) == '$') {
- $x = $vars[2];
- $product->setVersion($$x);
- }
- else {
- $product->setVersion(constant($vars[2]));
- }
- }
-}
-
-if (!$args->isDefined('quiet') && !$args->isDefined('debug')) {
- require_once 'Console/ProgressBar.php';
- $progress = new Console_ProgressBar(((string) $product).' [%bar%] %percent%', '=>', ' ', 80, 100);
- $progress->update(0);
-
- class PBErasor extends Log {
- function PBErasor($name, $ident = '', $conf = array(), $level = PEAR_LOG_DEBUG)
- {}
-
- function log($message, $priority = null) {
- global $progress;
- if ($this->_isMasked($priority)) {
- $progress->erase(true);
- }
- }
- }
- $pberaser =& new PBErasor('logerasor');
- $pberaser->setMask($log->getMask());
-
- $_log =& $log;
- $log =& Log::singleton('composite');
- $log->addChild($pberaser);
- $log->addChild($_log);
- $log->setMask($_log->getMask());
-}
-else {
- $progress = false;
-}
-
-//
-// Step 2
-// Constructing file list
-//
-$log->notice('Constructing file list');
-//if ($progress) $progress->update(25);
-require_once 'File/Find.php';
-chdir(dirname($specfile));
-$baseDir = getcwd();
-$log->info('Current directory: '.$baseDir);
-$filesSpec =& $spec->files;
-$log->info('Listing files from: '.(string)$filesSpec['base']);
-list($directories, $files) = File_Find::maptree((string)$filesSpec['base']);
-unset($directories);
-
-function filterFiles($entry) {
- global $filesSpec, $log;
- foreach ($filesSpec->exclude as $exclude) {
- if (preg_match($exclude, $entry)) {
- $log->debug('Excluding file: '.$entry);
- return false;
- }
- }
- foreach ($filesSpec->include as $include) {
- if (preg_match($include, $entry)) {
- $log->debug('Including file: '.$entry);
- return true;
- }
- }
- $log->debug('Excluding file: '.$entry);
- return false;
-}
-
-$product->setFiles(array_filter($files, 'filterFiles'));
-unset($files);
-
-$log->notice('Loaded product: '.((string) $product));
-
-//
-// Step 3
-// Preprocessing
-//
-if ($progress) $progress->update(33);
-if (!$args->isDefined('nopre')) {
- $log->notice('Preprocessing');
- foreach ($spec->preprocess->exec as $exec) {
- chdir($baseDir);
- $log->notice('[PRE] '.$exec['label']);
- if ($exec['isphp'] == 'true') {
- eval((string) $exec);
- }
- else {
- $log->warn('Unrecognized preprocessing instructions');
- }
- }
-}
-else {
- $log->notice('Preprocessing DISABLED');
-}
-
-//
-// Step 4
-// Packaging
-//
-chdir($baseDir);
-require_once 'File/Archive.php';
-
-$log->notice('Packaging in dir: '.getcwd());
-if ($progress) $progress->update(66);
-
-$files = $product->getFiles();
-$_cur = 0;
-$_tot = count($spec->output) * count($files) + 1;
-foreach ($spec->output as $output) {
- $outfile = $output['name'];
- $outfile = str_replace('{title}', $product->getTitle(), $outfile);
- $outfile = str_replace('{version}', $product->getSafeVersion(), $outfile);
-
- if (file_exists($outfile)) {
- $log->warning('Removing old archive: '.$outfile);
- unlink($outfile);
- }
-
- //$appender = File_Archive::appender($outfile, null, $output['type']);
- $writer =& File_Archive::toFiles();
- $appender = File_Archive::toArchive($outfile, $writer, $output['type']);
- foreach($files as $file) {
- $log->debug('Adding file '.$file.' to '.$outfile);
- $source = File_Archive::read($file, $file);
- $error = File_Archive::extract($source, $appender, false);
-
- if ($progress) {
- $_cur++;
- $progress->update(66 + 33 * ($_cur/$_tot));
- }
- }
- $appender->close();
-}
-
-if ($progress) $progress->update(100);
-
-
-exit(0);
-//
-// The end
-//
Deleted: trunk/vbdrupal-ng/build.spec.xml
===================================================================
--- trunk/vbdrupal-ng/build.spec.xml 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/build.spec.xml 2009-08-02 15:22:41 UTC (rev 889)
@@ -1,54 +0,0 @@
-<!-- $Id$ -->
-<product title="vbDrupal" version="@drupal/includes/vbdrupal/version.inc:VBDRUPAL">
- <output name="dist/{title}-{version}.tar.gz" format="tar.gz" />
- <!--<output name="{title}-{version}.tar.bz2" format="tar.bz2" />-->
- <output name="dist/{title}-{version}.zip" format="zip" />
-
- <files base=".">
- <include>#^./CHANGELOG(.*).txt$#i</include>
- <include>#^./README.html$#i</include>
- <include>#^./LICENSE.txt$#i</include>
-
- <include>#^./drupal/.*#</include>
-
- <exclude>#^./drupal/\.htaccess$#</exclude>
- <exclude>#^./drupal/sites/all/modules/#</exclude>
- <exclude>#^./drupal/sites/default/settings.php#</exclude>
- <exclude>#^./drupal/files/#</exclude>
-
- <!-- exclude CVS/SVN files -->
- <exclude>#CVS/.*#</exclude>
- <exclude>#\.cvsignore#</exclude>
- <exclude>#\.svn/.*#i</exclude>
-
- <!-- dev scripts -->
- <exclude>#^./dev-scripts/#</exclude>
- <exclude>#^./conversion/.*#</exclude>
- <exclude>#^./localization/.*#</exclude>
- <exclude>#^./TODO.TXT#i</exclude>
-
- <!-- temp files e.d. -->
- <exclude>#~$#</exclude>
- <exclude>#.*\.old$#</exclude>
- <exclude>#^[^/]*\.(zip)|(gz)|(bz)$#i</exclude>
- </files>
-
- <preprocess>
- <exec isphp="true" label="Updating hashdb..."><![CDATA[
- ob_start();
- $_GET['dbupdate'] = true;
- chdir('dev-scripts');
- include('./file_check.php');
- ob_end_clean();
- ]]></exec>
- <exec isphp="true" label="Updating localization templates..."><![CDATA[
- function __update_loc() {
- ob_start();
- chdir('localization');
- include('./vbdrupal.php');
- ob_end_clean();
- }
- __update_loc();
- ]]></exec>
- </preprocess>
-</product>
Added: trunk/vbdrupal-ng/build.xml
===================================================================
--- trunk/vbdrupal-ng/build.xml (rev 0)
+++ trunk/vbdrupal-ng/build.xml 2009-08-02 15:22:41 UTC (rev 889)
@@ -0,0 +1,51 @@
+<project name="vbdrupal" default="dist">
+
+ <target name="init">
+ <mkdir dir="dist" />
+
+ <exec executable="php" resolveexecutable="off" outputproperty="version">
+ <arg value="-r" />
+ <arg value="require 'drupal/includes/vbdrupal/version.inc'; echo VBDRUPAL;" />
+ <redirector>
+ <outputfilterchain>
+ <replaceregex pattern="[ ]" replace="_" flags="gi" />
+ </outputfilterchain>
+ </redirector>
+ </exec>
+ </target>
+
+ <target name="update-filedb">
+ <exec executable="php" dir="dev-scripts" resolveexecutable="off" outputproperty="filedb.output">
+ <arg value="file_check.php" />
+ <arg value="--" />
+ <arg value="dbupdate" />
+ </exec>
+ </target>
+
+ <target name="update-localization">
+ <exec executable="php" dir="localization" resolveexecutable="off">
+ <arg value="vbdrupal.php" />
+ </exec>
+ </target>
+
+ <target name="dist" depends="init,update-filedb,update-localization" description="Build the release distribution">
+ <fileset id="distfiles" dir="${basedir}">
+ <include name="CHANGELOG*.txt" />
+ <include name="README.html" />
+ <include name="LICENSE.txt" />
+ <include name="drupal/**" />
+
+ <exclude name="drupal/.htaccess" />
+ <exclude name="drupal/files/**" />
+ <exclude name="drupal/sites/all/modules/**" />
+ <exclude name="drupal/sites/default/settings.php" />
+ </fileset>
+ <zip destfile="dist/vbDrupal-${version}.zip">
+ <fileset refid="distfiles" />
+ </zip>
+ <tar destfile="dist/vbDrupal-${version}.tar.gz" compression="gzip">
+ <fileset refid="distfiles" />
+ </tar>
+ </target>
+
+</project>
Modified: trunk/vbdrupal-ng/dev-scripts/file_check.hashdb.php
===================================================================
--- trunk/vbdrupal-ng/dev-scripts/file_check.hashdb.php 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/dev-scripts/file_check.hashdb.php 2009-08-02 15:22:41 UTC (rev 889)
@@ -211,7 +211,7 @@
'./includes/vbdrupal/version.inc' =>
array (
'type' => 1,
- 'hash' => '2f9a1646ca538efc561a8c3f7cc5e92f',
+ 'hash' => '7148d5bf91b45816fcb74d6e8e4ffa71',
),
'./includes/xmlrpc.inc' =>
array (
@@ -1600,7 +1600,7 @@
'./modules/vbforumblocks/vbforumblocks.install' =>
array (
'type' => 1,
- 'hash' => 'a0b60e478414621769277724cbfb345e',
+ 'hash' => 'a684a7868cc6561b93d600b077c9e103',
),
'./modules/vbforumblocks/vbforumblocks.module' =>
array (
@@ -1638,12 +1638,12 @@
'./modules/vbnode/vbnode.install' =>
array (
'type' => 1,
- 'hash' => '20861773399d973c52909cd2e3ed2393',
+ 'hash' => 'b903fdc42fa87f4c8e8cd2858397391d',
),
'./modules/vbnode/vbnode.module' =>
array (
'type' => 1,
- 'hash' => '9c4cb22a76487492c45db2fadc7050a7',
+ 'hash' => 'bed5175f419d137e3e20bf1f9d7f8862',
),
'./modules/vbpm' =>
array (
@@ -1657,7 +1657,7 @@
'./modules/vbpm/vbpm.module' =>
array (
'type' => 1,
- 'hash' => 'b295a3e7fded42f2b8559008460b9e42',
+ 'hash' => '0c103d7297081188db2e8a814b1ec53b',
),
'./modules/vbpolls' =>
array (
@@ -1671,12 +1671,12 @@
'./modules/vbpolls/vbpolls.install' =>
array (
'type' => 1,
- 'hash' => '295cd48c7a48227c3a3f3724b7dacfe6',
+ 'hash' => '3a4cf0988fa4de260cdf7495ba32ee1f',
),
'./modules/vbpolls/vbpolls.module' =>
array (
'type' => 1,
- 'hash' => '55e0dd793f2e520be48168f95a83e183',
+ 'hash' => '3c937afe8fc1ece6f3a7189e7f102be0',
),
'./modules/vbuser' =>
array (
Modified: trunk/vbdrupal-ng/dev-scripts/file_check.php
===================================================================
--- trunk/vbdrupal-ng/dev-scripts/file_check.php 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/dev-scripts/file_check.php 2009-08-02 15:22:41 UTC (rev 889)
@@ -68,7 +68,13 @@
$file_masks = '#^.*\.(php|inc|module|theme|install|info|css|js|engine|sh|pl|profile|xml)$#i';
$skip_dirs = '#^.[/\\\\](files|sites)$#';
+$hash = array();
$hashdb = array();
+if (isset($argv)) {
+ for ($i = 0; $i < $argc; $i++) {
+ if ($argv[$i] == 'dbupdate') $_GET['dbupdate'] = true;
+ }
+}
if (!$_GET['dbupdate']) require_once('file_check.hashdb.php');
$filedb = array();
Modified: trunk/vbdrupal-ng/drupal/includes/vbdrupal/version.inc
===================================================================
--- trunk/vbdrupal-ng/drupal/includes/vbdrupal/version.inc 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/drupal/includes/vbdrupal/version.inc 2009-08-02 15:22:41 UTC (rev 889)
@@ -3,4 +3,4 @@
/**
* the vBDrupal version
*/
-define('VBDRUPAL', '6.13.0 alpha');
+define('VBDRUPAL', '6.13.0 beta');
Modified: trunk/vbdrupal-ng/drupal/modules/vbnode/vbnode.install
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbnode/vbnode.install 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/drupal/modules/vbnode/vbnode.install 2009-08-02 15:22:41 UTC (rev 889)
@@ -8,7 +8,7 @@
*/
function vbnode_install() {
- drupal_install_schema('vbnodes');
+ drupal_install_schema('vbnode');
}
/**
@@ -16,12 +16,11 @@
*/
function vbnode_schema() {
$schema['vbnodes'] = array(
- 'fields' => array(
- 'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'length' => 10),
- 'pid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'length' => 10),
- ),
- 'unique keys' => array('nid' => array('nid', 'pid'),
- ),
+ 'fields' => array(
+ 'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'length' => 10),
+ 'pid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'length' => 10),
+ ),
+ 'unique keys' => array('nid' => array('nid', 'pid')),
);
return $schema;
@@ -30,5 +29,4 @@
function vbnode_uninstall() {
// Remove tables.
drupal_uninstall_schema('vbnode');
-
}
Modified: trunk/vbdrupal-ng/drupal/modules/vbnode/vbnode.module
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbnode/vbnode.module 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/drupal/modules/vbnode/vbnode.module 2009-08-02 15:22:41 UTC (rev 889)
@@ -14,31 +14,19 @@
return array('import posts', 'import any post');
}
-function vbnode_nodeapi(&$node, $op, $a1 = NULL, $a2 = NULL) {
+function vbnode_nodeapi(&$node, $op, &$a1 = NULL, $a2 = NULL) {
switch ($op) {
case 'delete':
__vbnode_delete($node);
return;
- case 'fields':
- return;
case 'insert':
__vbnode_insert($node);
return;
case 'load':
return __vbnode_load($node);
- case 'search result':
- return;
- case 'settings':
- return;
case 'update':
__vbnode_update($node);
return;
- case 'update index':
- return;
- case 'validate':
- return;
- case 'view':
- return;
}
}
@@ -46,8 +34,10 @@
if ($form['type']['#value'] .'_node_form' == $form_id) {
if (!user_access('import posts')) return;
__vbnode_form($form['#node'], $form);
- if (!empty($form['#post'])) {
- __vbnode_import_ex($form);
+
+ if ($form_state['submitted']) {
+ // import the data when needed
+ //__vbnode_import_ex($form, $form_state);
}
}
}
@@ -74,33 +64,37 @@
'#description' => t("When checked import the data from the post."),
'#attributes' => array("onclick" => "document.getElementById('edit-body').disabled = this.checked; document.getElementById('edit-title').disabled = this.checked;")
);
+
+ $form['#validate'][] = '__vbnode_import_ex';
}
-function __vbnode_import_ex(&$form) {
+function __vbnode_import_ex($form, &$formstate) {
global $user;
-
- $formdata =& $form['#post'];
+ $vbnode_postid = $formstate['values']['vbnode_postid'];
+ if (empty($vbnode_postid)) return;
$threadid = -1;
- if (preg_match("/showpost.php?.*p=([0-9]*)/", $formdata['vbnode_postid'], $vars)) {
- $formdata['vbnode_postid'] = $vars[1];
+
+ if (preg_match("/showpost.php?.*p=([0-9]*)/", $vbnode_postid, $vars)) {
+ $vbnode_postid = $vars[1];
}
- else if (preg_match("/showthread.php?.*t=([0-9]*)/", $formdata['vbnode_postid'], $vars)) {
+ else if (preg_match("/showthread.php?.*t=([0-9]*)/", $vbnode_postid, $vars)) {
// get first post
- $threadid = $vars[1];
+ $threadid = $vars[1];
}
- else if (preg_match("/showthread.php?.*p=([0-9]*)/", $formdata['vbnode_postid'], $vars)) {
- $formdata['vbnode_postid'] = $vars[1];
+ else if (preg_match("/showthread.php?.*p=([0-9]*)/", $vbnode_postid, $vars)) {
+ $vbnode_postid = $vars[1];
}
- if (intval($formdata['vbnode_import']) != 1) return;
-
- if ($threadid == -1) $post = vbcore_getpost($formdata['vbnode_postid']);
+ if ($threadid == -1) $post = vbcore_getpost($vbnode_postid);
else {
$post = vbcore_getpost($threadid, true);
- $formdata['vbnode_postid'] = $post->postid;
+ $vbnode_postid = $post->postid;
}
+ form_set_value($form['vbimport']['vbnode_postid'], $vbnode_postid, $formstate);
+ if (intval($formstate['values']['vbnode_import']) != 1) return;
+
if (!$post) {
form_set_error('vbnode_postid', t('This is not a valid Post ID'));
}
@@ -108,29 +102,30 @@
form_set_error('vbnode_postid', t('You are only allowed to import your own posts.'));
}
else {
- $fltlist = filter_list_format($formdata['format']);
+ $fltlist = filter_list_format($formstate['values']['format']);
$convert_to_html = !isset($fltlist['vbcore/0']); // vbcore/0 is the vBcode filter
if (isset($post->title)) {
- $formdata['title'] = $post->title;
+ form_set_value($form['title'], $post->title, $formstate);
form_set_error('title', t('The title has been imported from the selected post. Please validate the content'));
}
if ($convert_to_html) {
- $formdata['body'] = vbcore_parsecode($post->pagetext);
+ form_set_value($form['body_field']['body'], vbcore_parsecode($post->pagetext), $formstate);
}
else {
- $formdata['body'] = $post->pagetext;
+ form_set_value($form['body_field']['body'], $post->pagetext, $formstate);
}
form_set_error('body', t('The body text has been imported from the selected post. Please validate the content'));
- $formdata['created'] = $post->dateline;
- $formdata['date'] = format_date($post->dateline, 'custom', 'Y-m-d H:i:s O');
- $formdata['uid'] = $post->userid;
- $formdata['name'] = $post->username;
+ form_set_value($form['created'], $post->dateline, $formstate);
+ form_set_value($form['author']['date'], format_date($post->dateline, 'custom', 'Y-m-d H:i:s O'), $formstate);
+ form_set_value($form['uid'], $post->userid, $formstate);
+ form_set_value($form['author']['name'], $post->username, $formstate);
- $formdata['vbnode_import'] = 0;
+ form_set_value($form['vbimport']['vbnode_import'], 0, $formstate);
}
+ return $form;
}
function __vbnode_load(&$node) {
Modified: trunk/vbdrupal-ng/localization/general.pot
===================================================================
--- trunk/vbdrupal-ng/localization/general.pot 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/localization/general.pot 2009-08-02 15:22:41 UTC (rev 889)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-07-24 00:23+0200\n"
+"POT-Creation-Date: 2009-08-02 15:41+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -29,7 +29,7 @@
msgid "Thread Creation"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:95;190 ../drupal/modules/vbforumblocks/vbforumblocks.module:271 ../drupal/modules/vblist/vblist.module:46 ../drupal/modules/vbpolls/vbpolls.module:22
+#: ../drupal/modules/comment_vb/comment_vb.module:95;190 ../drupal/modules/vbforumblocks/vbforumblocks.module:271 ../drupal/modules/vblist/vblist.module:46 ../drupal/modules/vbpolls/vbpolls.module:23
msgid "Forums"
msgstr ""
@@ -241,7 +241,7 @@
msgid "cron"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:693 ../drupal/modules/vbpolls/vbpolls.module:90;125
+#: ../drupal/modules/comment_vb/comment_vb.module:693 ../drupal/modules/vbpolls/vbpolls.module:93;128
msgid "@count comment"
msgid_plural "@count comments"
msgstr[0] ""
@@ -857,43 +857,43 @@
msgid "Shows a list of the first of threads in the selected forums. Can be used as a news page using the forum as data source."
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:60
+#: ../drupal/modules/vbnode/vbnode.module:50
msgid "vBulletin import"
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:61
+#: ../drupal/modules/vbnode/vbnode.module:51
msgid "The content will automatically be converted to HTML if the selected input filter does not have the vbCode filter enabled."
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:66
+#: ../drupal/modules/vbnode/vbnode.module:56
msgid "Post id"
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:67
+#: ../drupal/modules/vbnode/vbnode.module:57
msgid "The ID of the post to import the body from. Note: you can paste the URL of the post."
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:73
+#: ../drupal/modules/vbnode/vbnode.module:63
msgid "Import body from post"
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:74
+#: ../drupal/modules/vbnode/vbnode.module:64
msgid "When checked import the data from the post."
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:105
+#: ../drupal/modules/vbnode/vbnode.module:99
msgid "This is not a valid Post ID"
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:108
+#: ../drupal/modules/vbnode/vbnode.module:102
msgid "You are only allowed to import your own posts."
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:116
+#: ../drupal/modules/vbnode/vbnode.module:110
msgid "The title has been imported from the selected post. Please validate the content"
msgstr ""
-#: ../drupal/modules/vbnode/vbnode.module:125
+#: ../drupal/modules/vbnode/vbnode.module:119
msgid "The body text has been imported from the selected post. Please validate the content"
msgstr ""
@@ -917,47 +917,47 @@
msgid "Allows the user to import vBulletin posts in Drupal nodes."
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:15;84
+#: ../drupal/modules/vbpm/vbpm.module:15;95
msgid "Private Messages"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:21
+#: ../drupal/modules/vbpm/vbpm.module:22
msgid "Show quota gauge"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:23
+#: ../drupal/modules/vbpm/vbpm.module:24
msgid "Show a gauge of the PM quota usage"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:27
+#: ../drupal/modules/vbpm/vbpm.module:28
msgid "Show last message"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:30
+#: ../drupal/modules/vbpm/vbpm.module:31
msgid "Show this number of last received private messages. Set to 0 to disable."
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:55
+#: ../drupal/modules/vbpm/vbpm.module:58;60
msgid "Using @cur of the @max allowed"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:70
-msgid "From: @from\nTitle: @title\nOn: @date"
+#: ../drupal/modules/vbpm/vbpm.module:78
+msgid "From: @from \nTitle: @title \nOn: @date"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:114
+#: ../drupal/modules/vbpm/vbpm.module:123
msgid "vBulletin Private Messages"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:118
+#: ../drupal/modules/vbpm/vbpm.module:127
msgid "Pop-up on new PM"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:120
+#: ../drupal/modules/vbpm/vbpm.module:129
msgid "Show a pop-up message when a new PM is available, just like in the forum area. You should not enable this when using the defaultangy theme."
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:68
+#: ../drupal/modules/vbpm/vbpm.module:73
msgid "Last @count message"
msgid_plural "Last @count messages"
msgstr[0] ""
@@ -979,39 +979,39 @@
msgid "Latest Poll"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:23
+#: ../drupal/modules/vbpolls/vbpolls.module:24
msgid "The list of forums to pick the latest poll from. You can select multiple forums by holding shift or control."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:31
+#: ../drupal/modules/vbpolls/vbpolls.module:32
msgid "No submit form"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:33
+#: ../drupal/modules/vbpolls/vbpolls.module:34
msgid "Never show a voting form, only the current results."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:37
+#: ../drupal/modules/vbpolls/vbpolls.module:38
msgid "Result bar width"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:39
+#: ../drupal/modules/vbpolls/vbpolls.module:40
msgid "Size (in pixels) of the result bars, this is the size for 100%."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:122
+#: ../drupal/modules/vbpolls/vbpolls.module:125
msgid "Vote"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:144
+#: ../drupal/modules/vbpolls/vbpolls.module:147
msgid "Latest poll"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:160
+#: ../drupal/modules/vbpolls/vbpolls.module:163
msgid "No active poll."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:96;131
+#: ../drupal/modules/vbpolls/vbpolls.module:99;134
msgid "@count vote"
msgid_plural "@count votes"
msgstr[0] ""
Modified: trunk/vbdrupal-ng/localization/installer.pot
===================================================================
--- trunk/vbdrupal-ng/localization/installer.pot 2009-07-29 15:24:05 UTC (rev 888)
+++ trunk/vbdrupal-ng/localization/installer.pot 2009-08-02 15:22:41 UTC (rev 889)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-07-24 00:23+0200\n"
+"POT-Creation-Date: 2009-08-02 15:41+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-29 15:24:14
|
Revision: 888
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=888&view=rev
Author: elmuerte
Date: 2009-07-29 15:24:05 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
fixed install/update script
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.install
Modified: trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.install
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.install 2009-07-29 14:09:18 UTC (rev 887)
+++ trunk/vbdrupal-ng/drupal/modules/vbforumblocks/vbforumblocks.install 2009-07-29 15:24:05 UTC (rev 888)
@@ -16,22 +16,31 @@
*/
function vbforumblocks_schema() {
$schema['forum_blocks'] = array(
- 'fields' => array(
- 'bid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny', 'length' => 4),
- 'title' => array('type' => 'varchar', 'not null' => TRUE, 'default' => '', 'length' => 64),
- 'info' => array('type' => 'varchar', 'not null' => TRUE, 'default' => '', 'length' => 128),
- 'forumids' => array('type' => 'varchar', 'not null' => TRUE, 'default' => '', 'length' => 64),
- 'options' => array('type' => 'text', 'not null' => TRUE, 'size' => 'tiny')
- ),
- 'unique keys' => array('bid' => array('bid')),
+ 'fields' => array(
+ 'bid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny', 'length' => 4),
+ 'title' => array('type' => 'varchar', 'not null' => TRUE, 'default' => '', 'length' => 64),
+ 'info' => array('type' => 'varchar', 'not null' => TRUE, 'default' => '', 'length' => 128),
+ 'forumids' => array('type' => 'varchar', 'not null' => TRUE, 'default' => '', 'length' => 1024),
+ 'options' => array('type' => 'text', 'not null' => TRUE, 'size' => 'tiny')
+ ),
+ 'unique keys' => array('bid' => array('bid')),
);
-
return $schema;
}
function vbforumblocks_uninstall() {
// Remove tables.
drupal_uninstall_schema('vbforumblocks');
-
}
+function vbforumblocks_update_1() {
+ $ret = array();
+ $ret[] = update_sql('UPDATE {sequences} SET name = "%s" WHERE name = "{vbforumblocks}_bid"', 'forum_blocks_bid');
+ return $ret;
+}
+
+function vbforumblocks_update_2() {
+ $ret = array();
+ db_change_field($ret, 'forum_blocks', 'forumids', array('type' => 'varchar', 'not null' => TRUE, 'default' => '', 'length' => 1024));
+ return $ret;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-29 14:09:33
|
Revision: 887
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=887&view=rev
Author: elmuerte
Date: 2009-07-29 14:09:18 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
vbPM module appears to work correctly now
Issue: #14
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/vbpm/vbpm.module
Modified: trunk/vbdrupal-ng/drupal/modules/vbpm/vbpm.module
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbpm/vbpm.module 2009-07-29 13:53:53 UTC (rev 886)
+++ trunk/vbdrupal-ng/drupal/modules/vbpm/vbpm.module 2009-07-29 14:09:18 UTC (rev 887)
@@ -13,6 +13,7 @@
function vbpm_block($op = 'list', $delta = 0, $edit = array()) {
if ($op == 'list') {
$blocks[0]['info'] = t('Private Messages');
+ $blocks[0]['cache'] = BLOCK_CACHE_PER_USER;
return $blocks;
}
else if ($op == 'configure') {
@@ -52,6 +53,10 @@
}
function theme_vbpm_gauge($cur, $max) {
+ if ($cur == 0)
+ {
+ return '<table width="100%" class="vbpm_gauge" style="border: 2px groove gray; padding: 0; margin: 0;"><colgroup><col width="'. ($max-$cur) .'*" /></colgroup><tr title="'. t('Using @cur of the @max allowed', array('@cur' => $cur, '@max' => $max)) .'"><td style="background: green; line-height: 10px; padding: 0; margin: 0;" class="vbpm_gauge_max"> </td></tr></table>';
+ }
return '<table width="100%" class="vbpm_gauge" style="border: 2px groove gray; padding: 0; margin: 0;"><colgroup><col width="'. ($cur) .'*" /><col width="'. ($max-$cur) .'*" /></colgroup><tr title="'. t('Using @cur of the @max allowed', array('@cur' => $cur, '@max' => $max)) .'"><td style="background: red; line-height: 10px; padding: 0; margin: 0;" class="vbpm_gauge_cur"> </td><td style="background: green; line-height: 10px; padding: 0; margin: 0;" class="vbpm_gauge_max"> </td></tr></table>';
}
@@ -67,7 +72,13 @@
$lst = array();
$output .= "<h3>". format_plural(count($lastpms), 'Last @count message', 'Last @count messages') ."</h3>";
foreach ($lastpms as $pm) {
- $lst[] = l($pm->title, $vbulletin->options['bburl'] .'/private.php', array('title' => t("From: @from\nTitle: @title\nOn: @date", array('@title' => $pm->title, '@from' => $pm->from, '@date' => format_date($pm->dateline)))), "do=showpm&pmid=". $pm->pmid);
+ $lst[] = l($pm->title, $vbulletin->options['bburl'] .'/private.php',
+ array(
+ 'attributes' => array(
+ 'title' => t("From: @from \nTitle: @title \nOn: @date", array('@title' => $pm->title, '@from' => $pm->from, '@date' => format_date($pm->dateline))),
+ ),
+ 'query' => "do=showpm&pmid=". $pm->pmid,
+ ));
}
$output .= theme('item_list', $lst);
}
@@ -97,16 +108,14 @@
}
function vbpm_menu() {
-
- $items['admin/settings/vbpm'] = array(
- 'title' => 'vb Private Messages',
- 'description' => 'Adjust global private message behavior.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('vbpm_admin_settings'),
- 'access arguments' => array('administer site configuration'),
- 'type' => MENU_NORMAL_ITEM,
- );
-
+ $items['admin/settings/vbpm'] = array(
+ 'title' => 'vb Private Messages',
+ 'description' => 'Adjust global private message behavior.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('vbpm_admin_settings'),
+ 'access arguments' => array('administer site configuration'),
+ 'type' => MENU_NORMAL_ITEM,
+ );
return $items;
}
@@ -119,7 +128,6 @@
'#default_value' => variable_get('vbpm_popup', false),
'#description' => t('Show a pop-up message when a new PM is available, just like in the forum area. You should not enable this when using the defaultangy theme.')
);
-
return system_settings_form($form);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-29 13:54:05
|
Revision: 886
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=886&view=rev
Author: elmuerte
Date: 2009-07-29 13:53:53 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
oops, set the wrong field
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.module
Modified: trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.module
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.module 2009-07-28 19:34:57 UTC (rev 885)
+++ trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.module 2009-07-29 13:53:53 UTC (rev 886)
@@ -12,7 +12,7 @@
function vbpolls_block($op = 'list', $delta = 0, $edit = array()) {
if ($op == 'list') {
$blocks[0]['info'] = t('Latest Poll');
- $blocks[0]['info'] = BLOCK_NO_CACHE; // we do our own caching
+ $blocks[0]['cache'] = BLOCK_NO_CACHE; // we do our own caching
return $blocks;
}
else if ($op == 'configure') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-28 19:35:07
|
Revision: 885
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=885&view=rev
Author: elmuerte
Date: 2009-07-28 19:34:57 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
Theme registry was incorrect, for the rest all seems to work ok.
Issue: #15
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.install
trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.module
Modified: trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.install
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.install 2009-07-23 23:26:10 UTC (rev 884)
+++ trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.install 2009-07-28 19:34:57 UTC (rev 885)
@@ -31,4 +31,4 @@
variable_set("vbpolls_forumids", $forumids);
}
return $ret;
-}
\ No newline at end of file
+}
Modified: trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.module
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.module 2009-07-23 23:26:10 UTC (rev 884)
+++ trunk/vbdrupal-ng/drupal/modules/vbpolls/vbpolls.module 2009-07-28 19:34:57 UTC (rev 885)
@@ -12,6 +12,7 @@
function vbpolls_block($op = 'list', $delta = 0, $edit = array()) {
if ($op == 'list') {
$blocks[0]['info'] = t('Latest Poll');
+ $blocks[0]['info'] = BLOCK_NO_CACHE; // we do our own caching
return $blocks;
}
else if ($op == 'configure') {
@@ -46,22 +47,24 @@
variable_set("vbpolls_width", $edit['width']);
}
else if ($op == 'view') {
- if ($delta == 0) return __vbpolls_view();
+ if ($delta == 0) {
+ return __vbpolls_view();
+ }
}
}
function vbpolls_theme() {
return array(
- 'theme_vbpoll_result' => array(
+ 'vbpoll_result' => array(
'arguments' => array('label' => NULL, 'votes' => NULL, 'pct' => NULL, 'highlight' => FALSE),
),
- 'theme_vbpoll' => array(
+ 'vbpoll' => array(
'arguments' => array('thread' => NULL, 'poll' => NULL),
),
- 'theme_vbpoll_option' => array(
+ 'vbpoll_option' => array(
'arguments' => array('idx' => NULL, 'label' => NULL, 'multi' => FALSE),
),
- 'theme_vbpoll_form' => array(
+ 'vbpoll_form' => array(
'arguments' => array('thread' => NULL, 'poll' => NULL),
),
);
@@ -169,6 +172,5 @@
cache_set("vbpolls:$custom_theme:". $vbulletin->userinfo['usergroupid'], CACHE_TEMPORARY, $block['content']);
}
}
-
return $block;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-23 23:26:19
|
Revision: 884
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=884&view=rev
Author: elmuerte
Date: 2009-07-23 23:26:10 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Added Paths:
-----------
tags/v6_13_0_alpha/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-23 22:51:53
|
Revision: 883
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=883&view=rev
Author: elmuerte
Date: 2009-07-23 22:51:40 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
first vbDrupal 6 alpha release
Modified Paths:
--------------
trunk/vbdrupal-ng/CHANGELOG.VBDRUPAL.txt
trunk/vbdrupal-ng/build.spec.xml
trunk/vbdrupal-ng/localization/general.pot
trunk/vbdrupal-ng/localization/installer.pot
Modified: trunk/vbdrupal-ng/CHANGELOG.VBDRUPAL.txt
===================================================================
--- trunk/vbdrupal-ng/CHANGELOG.VBDRUPAL.txt 2009-07-23 12:35:22 UTC (rev 882)
+++ trunk/vbdrupal-ng/CHANGELOG.VBDRUPAL.txt 2009-07-23 22:51:40 UTC (rev 883)
@@ -1,7 +1,27 @@
// $Id$
-vbDrupal 5.15.0, 20009-01-15
+vbDrupal 6.13.0 alpha, 2009-07-24
+---------------------------------
+- first alpha release of vbDrupal based on Drupal 6
+
+vbDrupal 5.19.0, 2009-07-02
---------------------------
+- merged Drupal 5.19 changes
+
+vbDrupal 5.18.0, 2009-05-13
+---------------------------
+- merged Drupal 5.18 changes
+
+vbDrupal 5.17.0, 2009-04-30
+---------------------------
+- merged Drupal 5.17 changes
+
+vbDrupal 5.16.0, 2009-02-26
+---------------------------
+- merged Drupal 5.16 changes
+
+vbDrupal 5.15.0, 2009-01-15
+---------------------------
- merged Drupal 5.15 changes
vbDrupal 5.13.0, 2008-11-12
Modified: trunk/vbdrupal-ng/build.spec.xml
===================================================================
--- trunk/vbdrupal-ng/build.spec.xml 2009-07-23 12:35:22 UTC (rev 882)
+++ trunk/vbdrupal-ng/build.spec.xml 2009-07-23 22:51:40 UTC (rev 883)
@@ -12,7 +12,8 @@
<include>#^./drupal/.*#</include>
<exclude>#^./drupal/\.htaccess$#</exclude>
- <exclude>#^./drupal/sites/eldevel.tds#</exclude>
+ <exclude>#^./drupal/sites/all/modules/#</exclude>
+ <exclude>#^./drupal/sites/default/settings.php#</exclude>
<exclude>#^./drupal/files/#</exclude>
<!-- exclude CVS/SVN files -->
Modified: trunk/vbdrupal-ng/localization/general.pot
===================================================================
--- trunk/vbdrupal-ng/localization/general.pot 2009-07-23 12:35:22 UTC (rev 882)
+++ trunk/vbdrupal-ng/localization/general.pot 2009-07-23 22:51:40 UTC (rev 883)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-07-23 14:33+0200\n"
+"POT-Creation-Date: 2009-07-24 00:23+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
Modified: trunk/vbdrupal-ng/localization/installer.pot
===================================================================
--- trunk/vbdrupal-ng/localization/installer.pot 2009-07-23 12:35:22 UTC (rev 882)
+++ trunk/vbdrupal-ng/localization/installer.pot 2009-07-23 22:51:40 UTC (rev 883)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-07-23 14:33+0200\n"
+"POT-Creation-Date: 2009-07-24 00:23+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-23 12:35:29
|
Revision: 882
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=882&view=rev
Author: elmuerte
Date: 2009-07-23 12:35:22 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
improved build script
Modified Paths:
--------------
branches/vbdrupal-5/build.php
Modified: branches/vbdrupal-5/build.php
===================================================================
--- branches/vbdrupal-5/build.php 2009-07-23 12:35:11 UTC (rev 881)
+++ branches/vbdrupal-5/build.php 2009-07-23 12:35:22 UTC (rev 882)
@@ -226,7 +226,9 @@
function log($message, $priority = null) {
global $progress;
- $progress->erase(true);
+ if ($this->_isMasked($priority)) {
+ $progress->erase(true);
+ }
}
}
$pberaser =& new PBErasor('logerasor');
@@ -236,6 +238,7 @@
$log =& Log::singleton('composite');
$log->addChild($pberaser);
$log->addChild($_log);
+ $log->setMask($_log->getMask());
}
else {
$progress = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-23 12:35:18
|
Revision: 881
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=881&view=rev
Author: elmuerte
Date: 2009-07-23 12:35:11 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
improved build script a bit
Modified Paths:
--------------
trunk/vbdrupal-ng/build.php
trunk/vbdrupal-ng/dev-scripts/file_check.hashdb.php
trunk/vbdrupal-ng/localization/general.pot
trunk/vbdrupal-ng/localization/installer.pot
Modified: trunk/vbdrupal-ng/build.php
===================================================================
--- trunk/vbdrupal-ng/build.php 2009-07-23 09:15:57 UTC (rev 880)
+++ trunk/vbdrupal-ng/build.php 2009-07-23 12:35:11 UTC (rev 881)
@@ -226,7 +226,9 @@
function log($message, $priority = null) {
global $progress;
- $progress->erase(true);
+ if ($this->_isMasked($priority)) {
+ $progress->erase(true);
+ }
}
}
$pberaser =& new PBErasor('logerasor');
@@ -236,6 +238,7 @@
$log =& Log::singleton('composite');
$log->addChild($pberaser);
$log->addChild($_log);
+ $log->setMask($_log->getMask());
}
else {
$progress = false;
Modified: trunk/vbdrupal-ng/dev-scripts/file_check.hashdb.php
===================================================================
--- trunk/vbdrupal-ng/dev-scripts/file_check.hashdb.php 2009-07-23 09:15:57 UTC (rev 880)
+++ trunk/vbdrupal-ng/dev-scripts/file_check.hashdb.php 2009-07-23 12:35:11 UTC (rev 881)
@@ -12,7 +12,7 @@
'./includes/actions.inc' =>
array (
'type' => 1,
- 'hash' => 'b54aba4a41f266a4d46490b16d8fc97c',
+ 'hash' => '83f9197e085244e9a23e3a36d087b0b4',
),
'./includes/batch.inc' =>
array (
@@ -22,7 +22,7 @@
'./includes/bootstrap.inc' =>
array (
'type' => 1,
- 'hash' => 'f23c2bf5d31ef62779d7cf54dc52c3c0',
+ 'hash' => 'ca8d2000ea337cf49994968faf2b6792',
),
'./includes/cache-install.inc' =>
array (
@@ -32,17 +32,17 @@
'./includes/cache.inc' =>
array (
'type' => 1,
- 'hash' => '902b0e04c9010a1e4e300e2aa57b48a5',
+ 'hash' => '3d1b706dacd53162de5e319610fb6c86',
),
'./includes/common.inc' =>
array (
'type' => 1,
- 'hash' => 'e1725014c795a3a78258a3cd204f1d40',
+ 'hash' => 'a3bc75ed7e5e978167546e870a6009a4',
),
'./includes/database.inc' =>
array (
'type' => 1,
- 'hash' => '392bd2d8a1d9a6cc8119ca84243c1c25',
+ 'hash' => '3faec01883b3c9574dd9252a4a01b450',
),
'./includes/database.mysql-common.inc' =>
array (
@@ -62,22 +62,22 @@
'./includes/database.pgsql.inc' =>
array (
'type' => 1,
- 'hash' => '591507ce776ee0a4a1b6b7ae38e89b49',
+ 'hash' => '608a679acab07db3bb3b0c09c1bf8c5f',
),
'./includes/database.vbulletin.inc' =>
array (
'type' => 1,
- 'hash' => '51d2e250c96e530285dac41c3927a5e9',
+ 'hash' => '736c66d305e5fc77b74e85b7e60947db',
),
'./includes/file.inc' =>
array (
'type' => 1,
- 'hash' => 'fc60d1bf45a2b858b45581258c77d7dd',
+ 'hash' => 'c7e346e856d8d246f81025c64eccba56',
),
'./includes/form.inc' =>
array (
'type' => 1,
- 'hash' => '44280dbe42a514479211464fa233f587',
+ 'hash' => '2f85abbacc25c63b33b9130efffed656',
),
'./includes/image.gd.inc' =>
array (
@@ -92,7 +92,7 @@
'./includes/install.inc' =>
array (
'type' => 1,
- 'hash' => '684bf95ce832edf3ff6a339bb6a2a050',
+ 'hash' => '9e0273c3ed0b3a9e81016ff893b17107',
),
'./includes/install.mysql.inc' =>
array (
@@ -112,7 +112,7 @@
'./includes/install.vbulletin.inc' =>
array (
'type' => 1,
- 'hash' => 'b3a784d21e302c3f962a379dd1e26f9e',
+ 'hash' => '6b97fdfd10ab045b2f244f3ac52ec336',
),
'./includes/language.inc' =>
array (
@@ -122,27 +122,27 @@
'./includes/locale.inc' =>
array (
'type' => 1,
- 'hash' => 'a5197e7664ca26a65aacb08aed557cda',
+ 'hash' => 'b298646259be48e10937b5a76b5d96c2',
),
'./includes/mail.inc' =>
array (
'type' => 1,
- 'hash' => 'aae667b991a8fb571c2da59463f78e35',
+ 'hash' => '9714eb0780d4773760f4204467e8cae4',
),
'./includes/menu.inc' =>
array (
'type' => 1,
- 'hash' => 'e47c8bb05d3f4603d1d65937c36a6917',
+ 'hash' => '49b0481ab9421df9c445eacec6d74200',
),
'./includes/module.inc' =>
array (
'type' => 1,
- 'hash' => '3eb23cc2e68cb6f35e90fd9719c8fa04',
+ 'hash' => 'e950f4e245f7d3e685d8845711bafa8c',
),
'./includes/pager.inc' =>
array (
'type' => 1,
- 'hash' => 'd5fbb1b5e024e9d75dc6f63fd379e620',
+ 'hash' => '0ab11f15b6712bdfcf5080c717dc3aee',
),
'./includes/path.inc' =>
array (
@@ -157,12 +157,12 @@
'./includes/tablesort.inc' =>
array (
'type' => 1,
- 'hash' => 'ac55a7739c574fc4daddecbd7c909f1f',
+ 'hash' => '3308b9209aa870c857933a71b962766f',
),
'./includes/theme.inc' =>
array (
'type' => 1,
- 'hash' => '2ef46d7b07dbb5ea36853fcfc4474636',
+ 'hash' => '44937f5fda9a9ba5c2b93508b26653df',
),
'./includes/theme.maintenance.inc' =>
array (
@@ -181,37 +181,37 @@
'./includes/vbdrupal/bootstrap.inc' =>
array (
'type' => 1,
- 'hash' => 'd954ea091031f533363e757a1ca9169d',
+ 'hash' => 'dd7718224fe4ac6bb8a4416086da5bbe',
),
'./includes/vbdrupal/install.inc' =>
array (
'type' => 1,
- 'hash' => '61c696e588d64c9b237774aae5a846d9',
+ 'hash' => 'e8152a31e323447ea61aa2205161f24c',
),
'./includes/vbdrupal/session.inc' =>
array (
'type' => 1,
- 'hash' => 'c5e299298b80e8ed5f6b8a5036b8d115',
+ 'hash' => 'a19ca1de69e70b5f431a1d2077b666ab',
),
'./includes/vbdrupal/update.inc' =>
array (
'type' => 1,
- 'hash' => 'fe42a57a4b891a550ed833a4088fc2bc',
+ 'hash' => '0b36be441d21f6284b7e373eb1b2c11c',
),
'./includes/vbdrupal/vbmailwrapper.inc' =>
array (
'type' => 1,
- 'hash' => '0083a853899e61fa288edcb2bc6668a9',
+ 'hash' => '0eba6158db8c48c328ae06c455ab9051',
),
'./includes/vbdrupal/vbplugin.inc' =>
array (
'type' => 1,
- 'hash' => '4ae43c115f871867f359ec5f5921f3a6',
+ 'hash' => 'ff8f2f5a1e43f0290f82671b5240ff2e',
),
'./includes/vbdrupal/version.inc' =>
array (
'type' => 1,
- 'hash' => '924d1af1607c5f5ef6a30529d26fa8c2',
+ 'hash' => '2f9a1646ca538efc561a8c3f7cc5e92f',
),
'./includes/xmlrpc.inc' =>
array (
@@ -231,7 +231,7 @@
'./install.php' =>
array (
'type' => 1,
- 'hash' => '265ce572bb2015152b8d775ba237daf7',
+ 'hash' => '1a097d6271e1a5018aa982199f04f51f',
),
'./misc' =>
array (
@@ -309,12 +309,12 @@
'./misc/tabledrag.js' =>
array (
'type' => 1,
- 'hash' => '979ed6f8289612cec4168986a10b14af',
+ 'hash' => 'dc5f3d0cd1709c5922626e673c3f489a',
),
'./misc/tableheader.js' =>
array (
'type' => 1,
- 'hash' => 'bd3225ac37a684b29eded1560b0a3bc4',
+ 'hash' => 'd4e6ed0439c8ec26118d8a2704986e64',
),
'./misc/tableselect.js' =>
array (
@@ -324,7 +324,7 @@
'./misc/teaser.js' =>
array (
'type' => 1,
- 'hash' => '6d4dfc54bb43c4b11ec1d05809e754ca',
+ 'hash' => 'c215ae047b2e5379d47b56408fb3bdea',
),
'./misc/textarea.js' =>
array (
@@ -392,7 +392,7 @@
'./modules/aggregator/aggregator.module' =>
array (
'type' => 1,
- 'hash' => '2da85fed3b9bfce8b35eb8fed94defaa',
+ 'hash' => 'b6ffc8ebf7590a4fe93d2424d1697461',
),
'./modules/aggregator/aggregator.pages.inc' =>
array (
@@ -445,13 +445,18 @@
'./modules/blog/blog.info' =>
array (
'type' => 1,
- 'hash' => 'fcc77fd05f431be2f683fc112cabed72',
+ 'hash' => '6adf8b5fe9b79dca90b1db10921d36dc',
),
'./modules/blog/blog.module' =>
array (
'type' => 1,
- 'hash' => '6fb1a9052238b49e7c0decfac24859c2',
+ 'hash' => '2c2b05d7bc3463f949d7eccc4921196d',
),
+ './modules/blog/blog.pages.inc' =>
+ array (
+ 'type' => 1,
+ 'hash' => 'a989c8b18e5de21c31d9fc99b87d2a94',
+ ),
'./modules/blogapi' =>
array (
'type' => 2,
@@ -483,7 +488,7 @@
'./modules/book/book-export-html.tpl.php' =>
array (
'type' => 1,
- 'hash' => '9e9e6502eb1650d7a27e79d5a9cf869f',
+ 'hash' => '650e8ee9901260da1ccc8bc8628686b2',
),
'./modules/book/book-navigation.tpl.php' =>
array (
@@ -523,7 +528,7 @@
'./modules/book/book.module' =>
array (
'type' => 1,
- 'hash' => 'd7af022bbad04e7eb7d09923d7678311',
+ 'hash' => 'cbc101b1e25dde34c09b92b29a907137',
),
'./modules/book/book.pages.inc' =>
array (
@@ -562,7 +567,7 @@
'./modules/color/color.module' =>
array (
'type' => 1,
- 'hash' => 'f8f14967e32906164f05eb3da2e2b850',
+ 'hash' => '19eb84d58fb63734ebd800b02782c574',
),
'./modules/color/images' =>
array (
@@ -615,12 +620,12 @@
'./modules/comment/comment.module' =>
array (
'type' => 1,
- 'hash' => '3bba15f485c6a4c237b85e9e3f5beea9',
+ 'hash' => '2030b5699f7b5b126e5994de16447016',
),
'./modules/comment/comment.pages.inc' =>
array (
'type' => 1,
- 'hash' => 'a2229337621338140fed93356ef03961',
+ 'hash' => '342722f4887300e49fb22938a31df0ea',
),
'./modules/comment/comment.tpl.php' =>
array (
@@ -634,18 +639,23 @@
'./modules/comment_vb/comment_vb.info' =>
array (
'type' => 1,
- 'hash' => 'ccde8d6c51066c42b9a14c963e23d384',
+ 'hash' => 'bd22fc512687aa26319482f7b9750aaa',
),
'./modules/comment_vb/comment_vb.install' =>
array (
'type' => 1,
- 'hash' => '987605d6c6e40ca37f69b8f94c5e3152',
+ 'hash' => '7e218102a6112ff3175034e5ce3bd4d7',
),
'./modules/comment_vb/comment_vb.module' =>
array (
'type' => 1,
- 'hash' => 'cdcc5985f542518a5e8ee0384d01b855',
+ 'hash' => 'd3d92fa52797d733e1a3521090412035',
),
+ './modules/comment_vb/comment_vb_solomode.inc' =>
+ array (
+ 'type' => 1,
+ 'hash' => '2a37b2e9383846d139cd7c2545c8505d',
+ ),
'./modules/contact' =>
array (
'type' => 2,
@@ -673,7 +683,7 @@
'./modules/contact/contact.pages.inc' =>
array (
'type' => 1,
- 'hash' => 'cabaf6f88a8b58d24c9247de85144f9b',
+ 'hash' => '82ddcc2ee7c88e3023571f2ebc7120fd',
),
'./modules/dblog' =>
array (
@@ -789,7 +799,7 @@
'./modules/locale/locale.module' =>
array (
'type' => 1,
- 'hash' => 'd041cf068413225a9de4d80eff1dd543',
+ 'hash' => '4ee26ba1ced8b4d0c31124ee4b54b103',
),
'./modules/menu' =>
array (
@@ -798,7 +808,7 @@
'./modules/menu/menu.admin.inc' =>
array (
'type' => 1,
- 'hash' => 'e225c78b4dd3fed9c625eaf795f89a6e',
+ 'hash' => '2f7f1222ec892eff4639e67efd7f93fa',
),
'./modules/menu/menu.info' =>
array (
@@ -813,7 +823,7 @@
'./modules/menu/menu.module' =>
array (
'type' => 1,
- 'hash' => 'e91725ab01dd951b5c3e2238b21f14c4',
+ 'hash' => 'dd429ebff6dd98510f75d13d724df6d6',
),
'./modules/node' =>
array (
@@ -822,7 +832,7 @@
'./modules/node/content_types.inc' =>
array (
'type' => 1,
- 'hash' => '18da42766b668559544a17874aa9fa9c',
+ 'hash' => '26784c16283e6d5677d5f4f1bf36b5d2',
),
'./modules/node/node-rtl.css' =>
array (
@@ -832,7 +842,7 @@
'./modules/node/node.admin.inc' =>
array (
'type' => 1,
- 'hash' => 'a0aa73115f0bd7f93bf765d12eeda80d',
+ 'hash' => '22822a7e9ebe34ad226be1284f673da6',
),
'./modules/node/node.css' =>
array (
@@ -852,12 +862,12 @@
'./modules/node/node.module' =>
array (
'type' => 1,
- 'hash' => '0db62211f1718bc21a4370a2f4d2e2a5',
+ 'hash' => '715233bc4cda5e3b19fa57ac38acffd9',
),
'./modules/node/node.pages.inc' =>
array (
'type' => 1,
- 'hash' => '0ed4017015c0900c67d3bf04f477a66b',
+ 'hash' => '14cddbca8c79178f91a9986eee613367',
),
'./modules/node/node.tpl.php' =>
array (
@@ -871,7 +881,7 @@
'./modules/openid/openid.css' =>
array (
'type' => 1,
- 'hash' => '06ce5a41ec6d58403f02109d484ba8de',
+ 'hash' => 'fa109024fa0d76b3dc702f78b0da9943',
),
'./modules/openid/openid.inc' =>
array (
@@ -896,7 +906,7 @@
'./modules/openid/openid.module' =>
array (
'type' => 1,
- 'hash' => '054101e3c77bbcdacbc335a1b6e1fd19',
+ 'hash' => 'a39032c6cea99180dd58201d3c7b8839',
),
'./modules/openid/openid.pages.inc' =>
array (
@@ -1125,7 +1135,7 @@
'./modules/search/search.module' =>
array (
'type' => 1,
- 'hash' => '748b2debaddaccb49301fa062d9c031a',
+ 'hash' => '4c12ff457765634fd93aa5e50e30360d',
),
'./modules/search/search.pages.inc' =>
array (
@@ -1154,12 +1164,12 @@
'./modules/statistics/statistics.module' =>
array (
'type' => 1,
- 'hash' => '5cddc9bf9e1a9234c5ea209b341dc429',
+ 'hash' => '6869ab8caad7840c9a9e8426580e62bc',
),
'./modules/statistics/statistics.pages.inc' =>
array (
'type' => 1,
- 'hash' => '57519c895232386e190ed09ba804323c',
+ 'hash' => '44a00362a9d8fa97d0840c160fbeb716',
),
'./modules/syslog' =>
array (
@@ -1212,7 +1222,7 @@
'./modules/system/maintenance-page.tpl.php' =>
array (
'type' => 1,
- 'hash' => '09047ad3a46e58204bfb0accc9001d99',
+ 'hash' => '43e3f852b784dae4eefec1a4b498da4c',
),
'./modules/system/maintenance.css' =>
array (
@@ -1222,7 +1232,7 @@
'./modules/system/page.tpl.php' =>
array (
'type' => 1,
- 'hash' => '93b94534fa6aaae0ff78a047c561d724',
+ 'hash' => '8a512e6bc9628d34063237f334728614',
),
'./modules/system/system-menus-rtl.css' =>
array (
@@ -1242,7 +1252,7 @@
'./modules/system/system.admin.inc' =>
array (
'type' => 1,
- 'hash' => '56f4123b468aabcb13e65cc6c7c9d096',
+ 'hash' => '4bd841488ab8e333c079c211a7ff4e5d',
),
'./modules/system/system.css' =>
array (
@@ -1257,7 +1267,7 @@
'./modules/system/system.install' =>
array (
'type' => 1,
- 'hash' => '576bdc060e055aaccde8f4c85d2578fe',
+ 'hash' => '47160199ee8e3dd31b8941754c92992d',
),
'./modules/system/system.js' =>
array (
@@ -1267,7 +1277,7 @@
'./modules/system/system.module' =>
array (
'type' => 1,
- 'hash' => 'a9a183fee3b2090a4c6fa3908b53fd05',
+ 'hash' => 'cb3b6785be4ccf36750dc86663c963d5',
),
'./modules/taxonomy' =>
array (
@@ -1276,7 +1286,7 @@
'./modules/taxonomy/taxonomy.admin.inc' =>
array (
'type' => 1,
- 'hash' => '6a431a1f3293341378f93c2bf0de39d7',
+ 'hash' => 'bb3ef1f7b096ec9f1dc71e7131fb0509',
),
'./modules/taxonomy/taxonomy.css' =>
array (
@@ -1301,12 +1311,12 @@
'./modules/taxonomy/taxonomy.module' =>
array (
'type' => 1,
- 'hash' => 'af8142e5cece22028cae7198486dd49f',
+ 'hash' => '6efdb296a147e2e26f9279a4c64e4e27',
),
'./modules/taxonomy/taxonomy.pages.inc' =>
array (
'type' => 1,
- 'hash' => '5048fc774da5be0e6ac46a3afa43e2cf',
+ 'hash' => '0a9f41ee209add7d24e41750f1a526d5',
),
'./modules/throttle' =>
array (
@@ -1392,7 +1402,7 @@
'./modules/trigger/trigger.module' =>
array (
'type' => 1,
- 'hash' => 'f1245b1ff4c37c101fa295e5565c56a6',
+ 'hash' => '79ea5bfd3cc986c33e12f02ecf227469',
),
'./modules/update' =>
array (
@@ -1406,17 +1416,17 @@
'./modules/update/update.compare.inc' =>
array (
'type' => 1,
- 'hash' => '015d0c6e02dc90f0a1cb6bf8798401a9',
+ 'hash' => 'c57b57d8dc821aaa86654222f62c6165',
),
'./modules/update/update.css' =>
array (
'type' => 1,
- 'hash' => 'e9031db58fce560ecafc9bcc993b350d',
+ 'hash' => 'a8584196bafe49457017fe800147e6a6',
),
'./modules/update/update.fetch.inc' =>
array (
'type' => 1,
- 'hash' => '8e663af958b4a3188c533b327bb58bfd',
+ 'hash' => '13fa2e5dce0a2bdea47eb6cb3eac101e',
),
'./modules/update/update.info' =>
array (
@@ -1431,17 +1441,17 @@
'./modules/update/update.module' =>
array (
'type' => 1,
- 'hash' => '6299995a5ff25d48ee426a3710b8f3ee',
+ 'hash' => '9a035174cef1959c568ba47e410257dc',
),
'./modules/update/update.report.inc' =>
array (
'type' => 1,
- 'hash' => 'ece892f708f5d3e40bd82aa665d2a48c',
+ 'hash' => '669f1bb94bdfa79f62f3132764a81f70',
),
'./modules/update/update.settings.inc' =>
array (
'type' => 1,
- 'hash' => '3c3dff7b58f17edc04ee2fa9585704ed',
+ 'hash' => '28d3d3a9937f0706dfaa2c66d447e4ad',
),
'./modules/upload' =>
array (
@@ -1471,21 +1481,66 @@
array (
'type' => 2,
),
+ './modules/user/user-picture.tpl.php' =>
+ array (
+ 'type' => 1,
+ 'hash' => '4fc8294ba3b4fddf2c429d9c6032b41c',
+ ),
+ './modules/user/user-profile-category.tpl.php' =>
+ array (
+ 'type' => 1,
+ 'hash' => 'f3b4c176e1f74c6e887c3fe28fbdecaf',
+ ),
+ './modules/user/user-profile-item.tpl.php' =>
+ array (
+ 'type' => 1,
+ 'hash' => '7b48db815454e76c7bbd434ab9ca2b63',
+ ),
+ './modules/user/user-profile.tpl.php' =>
+ array (
+ 'type' => 1,
+ 'hash' => 'ff19f7d3830cd196217fa80450f9239a',
+ ),
+ './modules/user/user-rtl.css' =>
+ array (
+ 'type' => 1,
+ 'hash' => '22be218f9dce1df4bd156b7bf433a756',
+ ),
+ './modules/user/user.admin.inc' =>
+ array (
+ 'type' => 1,
+ 'hash' => '80c9a8351263a47c238ef6fd2bdbc8a9',
+ ),
'./modules/user/user.css' =>
array (
'type' => 1,
- 'hash' => '9d4ab9b1b547590574874d930babdb86',
+ 'hash' => '5e7bc459d4a1771c46b2ac65f23928dd',
),
'./modules/user/user.info' =>
array (
'type' => 1,
- 'hash' => 'bf52cd565daefe8c826f0e6100334f90',
+ 'hash' => '35382348031b2a03ab27311d4773c10d',
),
+ './modules/user/user.install' =>
+ array (
+ 'type' => 1,
+ 'hash' => '785ae0ec41a027ae245e744d774b30f9',
+ ),
+ './modules/user/user.js' =>
+ array (
+ 'type' => 1,
+ 'hash' => 'd1296dd8adbfb550e747f0e911738d2d',
+ ),
'./modules/user/user.module' =>
array (
'type' => 1,
- 'hash' => '11c0dfc192ba3d5db22821840aee51b3',
+ 'hash' => 'c56b93fc3bbdc1c4b25da0c2e223f41a',
),
+ './modules/user/user.pages.inc' =>
+ array (
+ 'type' => 1,
+ 'hash' => 'dbf7e7082dc98c962d5d455f4bab9b71',
+ ),
'./modules/vbbirthdays' =>
array (
'type' => 2,
@@ -1493,12 +1548,12 @@
'./modules/vbbirthdays/vbbirthdays.info' =>
array (
'type' => 1,
- 'hash' => '1297f162e88c61f31b4a94dc264a41e2',
+ 'hash' => 'ec3eecf5f21d01dab5e342a837e5b103',
),
'./modules/vbbirthdays/vbbirthdays.module' =>
array (
'type' => 1,
- 'hash' => 'a73073c0e9a0d371ba3012afcd1c7379',
+ 'hash' => '09bcc3e465f8d742b8a45c3b3b44853a',
),
'./modules/vbcore' =>
array (
@@ -1507,22 +1562,22 @@
'./modules/vbcore/vbcore.info' =>
array (
'type' => 1,
- 'hash' => 'c359c2fbe1bbfcf9b5fe67ccae9a54fb',
+ 'hash' => '686050a8da8fc4915e1b5ca4a4200080',
),
'./modules/vbcore/vbcore.install' =>
array (
'type' => 1,
- 'hash' => '1f880c01acf0ea322670fe66e3f12b86',
+ 'hash' => 'eed022bc91e7a8a38ce695926ab612af',
),
'./modules/vbcore/vbcore.module' =>
array (
'type' => 1,
- 'hash' => 'bf4ff95b58249ae468fc0281aa612078',
+ 'hash' => '095f4caaee6b0fb3692138877dec3b58',
),
'./modules/vbcore/vbproduct.inc' =>
array (
'type' => 1,
- 'hash' => '3415c0c0fa2283ebc0ce2cf90d8ddc35',
+ 'hash' => '27e71308103232086ff07d4a0e3a70da',
),
'./modules/vbcore/xml' =>
array (
@@ -1531,7 +1586,7 @@
'./modules/vbcore/xml/product-drupal.xml' =>
array (
'type' => 1,
- 'hash' => '5ed7dcaf9f92cc4c72f10681d259b651',
+ 'hash' => 'f402b99c433d982c76aba27851f6b959',
),
'./modules/vbforumblocks' =>
array (
@@ -1540,17 +1595,17 @@
'./modules/vbforumblocks/vbforumblocks.info' =>
array (
'type' => 1,
- 'hash' => 'b12162b58817143369fdabc32f7fc743',
+ 'hash' => 'd463c80e66c336f22f85c97e6e053e02',
),
'./modules/vbforumblocks/vbforumblocks.install' =>
array (
'type' => 1,
- 'hash' => '65c2aa913289458c8398c9433bf7ccae',
+ 'hash' => 'a0b60e478414621769277724cbfb345e',
),
'./modules/vbforumblocks/vbforumblocks.module' =>
array (
'type' => 1,
- 'hash' => '0a7dcf9c77772e020e10ea23fbfee1e3',
+ 'hash' => '771315d7bf0f44018c26309c80b1640d',
),
'./modules/vblist' =>
array (
@@ -1559,17 +1614,17 @@
'./modules/vblist/vblist.info' =>
array (
'type' => 1,
- 'hash' => '6693cd66d0e3d3ffaa5f58665aa885f9',
+ 'hash' => '98f8a3e9a76fc9a7acc3ce03dd074198',
),
'./modules/vblist/vblist.install' =>
array (
'type' => 1,
- 'hash' => '8d14267795c4f3d3b4ac3327ff9ffafc',
+ 'hash' => 'fa0fb933884ddecf1091d36e7d114650',
),
'./modules/vblist/vblist.module' =>
array (
'type' => 1,
- 'hash' => '4d4408775960e029b8e24aaa97b60e0a',
+ 'hash' => 'b17ff589c1b5149809b727d0cb7262f7',
),
'./modules/vbnode' =>
array (
@@ -1578,17 +1633,17 @@
'./modules/vbnode/vbnode.info' =>
array (
'type' => 1,
- 'hash' => 'e8521756f9943f4a7b4a14b5c72acfb3',
+ 'hash' => 'abd39924868d13eacd6feb7792d06e12',
),
'./modules/vbnode/vbnode.install' =>
array (
'type' => 1,
- 'hash' => '3997b98e3266721c43e1565df346056c',
+ 'hash' => '20861773399d973c52909cd2e3ed2393',
),
'./modules/vbnode/vbnode.module' =>
array (
'type' => 1,
- 'hash' => 'dc942a448b3fa24bc6707081661351c6',
+ 'hash' => '9c4cb22a76487492c45db2fadc7050a7',
),
'./modules/vbpm' =>
array (
@@ -1597,12 +1652,12 @@
'./modules/vbpm/vbpm.info' =>
array (
'type' => 1,
- 'hash' => 'f6cf9cbd544e061c676e0474d5771767',
+ 'hash' => '67f716a11b53de0c229b0fdda26c730d',
),
'./modules/vbpm/vbpm.module' =>
array (
'type' => 1,
- 'hash' => '7919c5c81bed874668fa6526ae1f88b9',
+ 'hash' => 'b295a3e7fded42f2b8559008460b9e42',
),
'./modules/vbpolls' =>
array (
@@ -1611,17 +1666,17 @@
'./modules/vbpolls/vbpolls.info' =>
array (
'type' => 1,
- 'hash' => 'ea09bdf455cbdb57fab52a31d1e3d669',
+ 'hash' => 'c8a03327c2b6e9c5e7c4e9150ce8c04f',
),
'./modules/vbpolls/vbpolls.install' =>
array (
'type' => 1,
- 'hash' => '79248234de79f73af24013e6d02a4549',
+ 'hash' => '295cd48c7a48227c3a3f3724b7dacfe6',
),
'./modules/vbpolls/vbpolls.module' =>
array (
'type' => 1,
- 'hash' => '090c686992363dbf64320957bdc1be50',
+ 'hash' => '55e0dd793f2e520be48168f95a83e183',
),
'./modules/vbuser' =>
array (
@@ -1630,12 +1685,12 @@
'./modules/vbuser/vbuser.info' =>
array (
'type' => 1,
- 'hash' => '36c87e5046f7600c580361acb8390878',
+ 'hash' => 'b3cd0f85c5b3ace9c5fe19a3aa0d44f7',
),
'./modules/vbuser/vbuser.module' =>
array (
'type' => 1,
- 'hash' => '02a2199584ffb61fdb300af8b7674f3b',
+ 'hash' => 'c4c660d6ba9dd080fc83c9b8f6dbf099',
),
'./profiles' =>
array (
@@ -1648,7 +1703,7 @@
'./profiles/default/default.profile' =>
array (
'type' => 1,
- 'hash' => '5febd42e8c049701a1903964d7c7bc46',
+ 'hash' => '2efbebede7ec04bd31117b96918e5dfa',
),
'./profiles/vbdrupal' =>
array (
@@ -1729,7 +1784,7 @@
'./themes/bluemarine/page.tpl.php' =>
array (
'type' => 1,
- 'hash' => '4d173b67a15e19e3ff9937c9511ba46f',
+ 'hash' => '5b6292d5e6c1188bae9a1a9a69d977a3',
),
'./themes/bluemarine/style-rtl.css' =>
array (
@@ -1753,7 +1808,7 @@
'./themes/chameleon/chameleon.theme' =>
array (
'type' => 1,
- 'hash' => '50edb80e0b238700a3dbdccb54cb18b6',
+ 'hash' => 'c9216fc27fea0573b4fec03b1f4792fe',
),
'./themes/chameleon/common-rtl.css' =>
array (
@@ -1871,7 +1926,7 @@
'./themes/garland/maintenance-page.tpl.php' =>
array (
'type' => 1,
- 'hash' => '9f6c027b4c1904f258cdbaabdf8a7595',
+ 'hash' => 'fd7223da62bb8868fce162d803375d6e',
),
'./themes/garland/minnelli' =>
array (
@@ -1904,7 +1959,7 @@
'./themes/garland/page.tpl.php' =>
array (
'type' => 1,
- 'hash' => '342c8be5aea21473ea1aa5572443d225',
+ 'hash' => '1ffb1dc4b3cc70447f510c4c9d481397',
),
'./themes/garland/print.css' =>
array (
@@ -1919,12 +1974,12 @@
'./themes/garland/style.css' =>
array (
'type' => 1,
- 'hash' => 'e7c86fa8a97037df320b26801f070321',
+ 'hash' => '1b233381a2fe64eed8de5649ff83f6f7',
),
'./themes/garland/template.php' =>
array (
'type' => 1,
- 'hash' => '7e2c85786b4a1328b87762feff4f24d0',
+ 'hash' => 'b17aa55765dd1d35c7b1d140f4025962',
),
'./themes/pushbutton' =>
array (
@@ -1953,7 +2008,7 @@
'./themes/pushbutton/page.tpl.php' =>
array (
'type' => 1,
- 'hash' => '807986cb6d71516c102cfe4cdd6bc8d4',
+ 'hash' => '79b8bda5ed089b576cae07927b65c413',
),
'./themes/pushbutton/pushbutton.info' =>
array (
@@ -1973,7 +2028,7 @@
'./update.php' =>
array (
'type' => 1,
- 'hash' => 'af8d07a4f2721aef874a7ae51189b7bd',
+ 'hash' => 'e3f9379bb534eabdde575f2f418347f7',
),
'./xmlrpc.php' =>
array (
Modified: trunk/vbdrupal-ng/localization/general.pot
===================================================================
--- trunk/vbdrupal-ng/localization/general.pot 2009-07-23 09:15:57 UTC (rev 880)
+++ trunk/vbdrupal-ng/localization/general.pot 2009-07-23 12:35:11 UTC (rev 881)
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-01-24 15:04+0100\n"
+"POT-Creation-Date: 2009-07-23 14:33+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -17,265 +17,241 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../drupal/modules/comment_vb/comment_vb.module:16
-msgid "When the normal comment module is enabled the comment_vb module can still be used to create vBulletin forum threads. All other features of the comment_vb module will be unavailable."
+#: ../drupal/modules/comment_vb/comment_vb.module:16 ../drupal/modules/comment_vb/comment_vb.info:0
+msgid "Allows users to comment on and discuss published content using the vBulletin forums. When the comment module is also enabled the replies in the vBulletin thread will not be included on the page."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:39
-msgid "Comments"
+#: ../drupal/modules/comment_vb/comment_vb.module:19
+msgid "When the normal comment module is enabled the comment_vb module can still be used to create vBulletin forum threads. All other features of the comment_vb module will be unavailable."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:40
-msgid "Change various comments settings including displaying and thread creation."
-msgstr ""
-
-#: ../drupal/modules/comment_vb/comment_vb.module:49
-msgid "vBulletin Settings"
-msgstr ""
-
-#: ../drupal/modules/comment_vb/comment_vb.module:50
-msgid "change settings related to the comment_vb module."
-msgstr ""
-
-#: ../drupal/modules/comment_vb/comment_vb.module:88
+#: ../drupal/modules/comment_vb/comment_vb.module:86
msgid "Thread Creation"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:97;192 ../drupal/modules/vbcore/vbcore.module:46 ../drupal/modules/vbforumblocks/vbforumblocks.module:261 ../drupal/modules/vblist/vblist.module:46 ../drupal/modules/vbpolls/vbpolls.module:23
+#: ../drupal/modules/comment_vb/comment_vb.module:95;190 ../drupal/modules/vbforumblocks/vbforumblocks.module:271 ../drupal/modules/vblist/vblist.module:46 ../drupal/modules/vbpolls/vbpolls.module:22
msgid "Forums"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:98
+#: ../drupal/modules/comment_vb/comment_vb.module:96
msgid "The forum to post the thread in. You can select multiple forums by holding shift or control. When multiple forums are selected a selection box is shown on the content creation page. !content_type"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:98
+#: ../drupal/modules/comment_vb/comment_vb.module:96
msgid "You can set the default target forum per content type."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:107
+#: ../drupal/modules/comment_vb/comment_vb.module:105
msgid "Thread creator"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:108
+#: ../drupal/modules/comment_vb/comment_vb.module:106
msgid "The user that creates the thread in the forum. Either enter a valid username or leave it blank for the posting user."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:115;204
+#: ../drupal/modules/comment_vb/comment_vb.module:113;202
msgid "Thread template"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:116
+#: ../drupal/modules/comment_vb/comment_vb.module:114
msgid "The vBulletin template to use for the created threads."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:124
+#: ../drupal/modules/comment_vb/comment_vb.module:122
msgid "Update forum post"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:125
+#: ../drupal/modules/comment_vb/comment_vb.module:123
msgid "Update the forum post when node is updated."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:131
+#: ../drupal/modules/comment_vb/comment_vb.module:129
msgid "Delete thread on node deletion"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:132
+#: ../drupal/modules/comment_vb/comment_vb.module:130
msgid "Soft-delete the associated thread when the node is deleted."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:139
+#: ../drupal/modules/comment_vb/comment_vb.module:137
msgid "Viewing options"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:146
+#: ../drupal/modules/comment_vb/comment_vb.module:144
msgid "Maximum numbers of comments to display"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:148
+#: ../drupal/modules/comment_vb/comment_vb.module:146
msgid "The maximim number of comments to display below content, before showing a \"read more..\" link. If this is 0 only a link will be shown to the thread."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:153
+#: ../drupal/modules/comment_vb/comment_vb.module:151
msgid "Show go to first new comment link"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:155
+#: ../drupal/modules/comment_vb/comment_vb.module:153
msgid "Show the \"go to first unread post\" link after the comment count link."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:160
+#: ../drupal/modules/comment_vb/comment_vb.module:158
msgid "Show reply link for anonymous users"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:162
+#: ../drupal/modules/comment_vb/comment_vb.module:160
msgid "Always show the \"add new comment\" link for anonymous users."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:177
+#: ../drupal/modules/comment_vb/comment_vb.module:175
msgid "Default comment setting"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:179;231 ../drupal/modules/vblist/vblist.module:162 ../drupal/modules/vbuser/vbuser.module:325
+#: ../drupal/modules/comment_vb/comment_vb.module:177;229 ../drupal/modules/vblist/vblist.module:171 ../drupal/modules/vbuser/vbuser.module:337
msgid "Disabled"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:179;231
+#: ../drupal/modules/comment_vb/comment_vb.module:177;229
msgid "Read only"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:179;231
+#: ../drupal/modules/comment_vb/comment_vb.module:177;229
msgid "Read/Write"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:180
+#: ../drupal/modules/comment_vb/comment_vb.module:178
msgid "Users with the <em>administer comments</em> permission will be able to override this setting."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:188
+#: ../drupal/modules/comment_vb/comment_vb.module:186
msgid "None"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:196
+#: ../drupal/modules/comment_vb/comment_vb.module:194
msgid "Default forum"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:197
+#: ../drupal/modules/comment_vb/comment_vb.module:195
msgid "The default forum to post the thread in."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:197
+#: ../drupal/modules/comment_vb/comment_vb.module:195
msgid "No target forums configured in !url"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:197
+#: ../drupal/modules/comment_vb/comment_vb.module:195
msgid "the comment settings"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:205
+#: ../drupal/modules/comment_vb/comment_vb.module:203
msgid "Template to use for thread creation. If empty the default template %def will be used."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:219
+#: ../drupal/modules/comment_vb/comment_vb.module:217
msgid "Comment settings"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:238
+#: ../drupal/modules/comment_vb/comment_vb.module:236
msgid "Thread ID"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:239
+#: ../drupal/modules/comment_vb/comment_vb.module:237
msgid "vBulletin thread id used for comments. If this is empty, a new thread will be created. If you change it, that thread will be displayed for comments. If you mark it disabled, no comments will be displayed."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:246
+#: ../drupal/modules/comment_vb/comment_vb.module:244
msgid "Update thread"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:248
-msgid "Update the linked thread. All changes made to the thread well be lost."
+#: ../drupal/modules/comment_vb/comment_vb.module:246
+msgid "Update the linked thread. All changes made to first post in this thread well be lost."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:282
+#: ../drupal/modules/comment_vb/comment_vb.module:280
msgid "Announce to this forum"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:286
+#: ../drupal/modules/comment_vb/comment_vb.module:284
msgid "Select the forum where the new thread should be created."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:343
+#: ../drupal/modules/comment_vb/comment_vb.module:342
msgid "Associated drupal node deleted"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:463
+#: ../drupal/modules/comment_vb/comment_vb.module:472
msgid "Unable to create vBulletin thread. Invalid Forum ID: <code>@id</code>"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:492;570 ../drupal/modules/vbuser/vbuser.module:465
+#: ../drupal/modules/comment_vb/comment_vb.module:501;589 ../drupal/modules/vbuser/vbuser.module:462
msgid "Anonymous"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:509;585
+#: ../drupal/modules/comment_vb/comment_vb.module:518;604
msgid "Thread creation error: %message"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:527
-msgid "vBulletin thread created in the forum: %forum"
+#: ../drupal/modules/comment_vb/comment_vb.module:541
+msgid "vBulletin thread !thread created in the forum: %forum"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:594
+#: ../drupal/modules/comment_vb/comment_vb.module:614
msgid "The forum thread has been updated."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:610
+#: ../drupal/modules/comment_vb/comment_vb.module:665
msgid "Thread creation error: template \"%templ\" produced an empty post"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:627
+#: ../drupal/modules/comment_vb/comment_vb.module:682
msgid "Forum thread"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:631
+#: ../drupal/modules/comment_vb/comment_vb.module:686
msgid "View the forum thread associated with this node"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:642;816
+#: ../drupal/modules/comment_vb/comment_vb.module:697 ../drupal/modules/comment_vb/comment_vb_solomode.inc:105
msgid "Jump to the first comment of this posting."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:651 ../drupal/modules/vblist/vblist.module:384
+#: ../drupal/modules/comment_vb/comment_vb.module:706 ../drupal/modules/vblist/vblist.module:407
msgid "Jump to the first new comment of this posting."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:659;821
+#: ../drupal/modules/comment_vb/comment_vb.module:714 ../drupal/modules/comment_vb/comment_vb_solomode.inc:110
msgid "Add new comment"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:663;824
+#: ../drupal/modules/comment_vb/comment_vb.module:718 ../drupal/modules/comment_vb/comment_vb_solomode.inc:113
msgid "Add a new comment to this page."
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:723
+#: ../drupal/modules/comment_vb/comment_vb.module:778
msgid "edit"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:731
+#: ../drupal/modules/comment_vb/comment_vb.module:786
msgid "reply"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:813
-msgid "Read full thread"
+#: ../drupal/modules/comment_vb/comment_vb.module:817
+msgid "new"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:838
-msgid "<a href=\"@login\">Login</a> or <a href=\"@register\">register</a> to post comments"
-msgstr ""
-
-#: ../drupal/modules/comment_vb/comment_vb.module:841
-msgid "<a href=\"@login\">Login</a> to post comments"
-msgstr ""
-
-#: ../drupal/modules/comment_vb/comment_vb.module:915
-msgid "by %a on %b"
-msgstr ""
-
-#: ../drupal/modules/comment_vb/comment_vb.module:441
+#: ../drupal/modules/comment_vb/comment_vb.module:423
msgid "cron"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:638 ../drupal/modules/vbpolls/vbpolls.module:74;109
+#: ../drupal/modules/comment_vb/comment_vb.module:693 ../drupal/modules/vbpolls/vbpolls.module:90;125
msgid "@count comment"
msgid_plural "@count comments"
msgstr[0] ""
msgstr[1] ""
-#: ../drupal/modules/comment_vb/comment_vb.module:77
+#: ../drupal/modules/comment_vb/comment_vb.module:75
msgid "administer comments"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.module:77
+#: ../drupal/modules/comment_vb/comment_vb.module:75
msgid "select forum"
msgstr ""
@@ -283,12 +259,24 @@
msgid "comment_vb"
msgstr ""
-#: ../drupal/modules/comment_vb/comment_vb.info:0
-msgid "Comment_vb"
+#: ../drupal/modules/comment_vb/comment_vb_solomode.inc:102
+msgid "Read full thread"
msgstr ""
+#: ../drupal/modules/comment_vb/comment_vb_solomode.inc:127
+msgid "<a href=\"@login\">Login</a> or <a href=\"@register\">register</a> to post comments"
+msgstr ""
+
+#: ../drupal/modules/comment_vb/comment_vb_solomode.inc:130
+msgid "<a href=\"@login\">Login</a> to post comments"
+msgstr ""
+
+#: ../drupal/modules/comment_vb/comment_vb_solomode.inc:197
+msgid "Submitted by !username on @datetime."
+msgstr ""
+
#: ../drupal/modules/comment_vb/comment_vb.info:0
-msgid "Allows users to comment on and discuss published content using the vBulletin forums. When the comment module is also enabled the replies in the vBulletin thread will not be included on the page."
+msgid "Comment_vb"
msgstr ""
#: ../drupal/modules/comment_vb/comment_vb.info:0
@@ -307,59 +295,75 @@
msgid "More birthdays"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:97
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:102
msgid "No birthdays today"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:98
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:103
msgid "Today's Birthdays"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:107
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:112
msgid "Link to vBulletin profile"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:109
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:114
msgid "Link to the vBulletin profile page instead of the drupal user info page"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:113
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:118
msgid "Maximum birthdays"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:115
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:120
msgid "The maximum number of birthdays to show before creating a link."
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:152
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:124;209
+msgid "Show birthday block"
+msgstr ""
+
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:126;211
+msgid "Always show"
+msgstr ""
+
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:126;211 ../drupal/modules/vbforumblocks/vbforumblocks.module:347
+msgid "Hide when empty"
+msgstr ""
+
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:127;212
+msgid "Hide the birthday block when there are no birthdays."
+msgstr ""
+
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:169
msgid "No upcoming events."
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:153
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:170
msgid "Coming Events"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:169
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:186
msgid "Calendars"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:171
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:188
msgid "Select the calendars to pick the events from."
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:179
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:196
msgid "Days"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:181
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:198
msgid "The number of days to show the events from."
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:186
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:203
msgid "Maximum events"
msgstr ""
-#: ../drupal/modules/vbbirthdays/vbbirthdays.module:188
+#: ../drupal/modules/vbbirthdays/vbbirthdays.module:205
msgid "The maximum number of events to show."
msgstr ""
@@ -376,7 +380,7 @@
msgstr ""
#: ../drupal/modules/vbbirthdays/vbbirthdays.info:0
-msgid "vb Birthdays"
+msgid "vb Events"
msgstr ""
#: ../drupal/modules/vbbirthdays/vbbirthdays.info:0
@@ -387,99 +391,87 @@
msgid "vbDrupal - Optional"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:21
-msgid "AdminCP"
-msgstr ""
-
-#: ../drupal/modules/vbcore/vbcore.module:24
-msgid "Go to the vBulletin admin control panel"
-msgstr ""
-
-#: ../drupal/modules/vbcore/vbcore.module:30
-msgid "vbcore template autocomplete"
-msgstr ""
-
-#: ../drupal/modules/vbcore/vbcore.module:117
-msgid "Forum menu"
-msgstr ""
-
-#: ../drupal/modules/vbcore/vbcore.module:122
-msgid "Add forum menu"
-msgstr ""
-
-#: ../drupal/modules/vbcore/vbcore.module:123
-msgid "Add the forum hierarchy to the navigation menu. Each forum will get a menu item. Only forums to which the user has access will be included in the list."
-msgstr ""
-
-#: ../drupal/modules/vbcore/vbcore.module:125
-msgid "No"
-msgstr ""
-
-#: ../drupal/modules/vbcore/vbcore.module:125
-msgid "Yes"
-msgstr ""
-
-#: ../drupal/modules/vbcore/vbcore.module:164
+#: ../drupal/modules/vbcore/vbcore.module:141
msgid "You can use the same tags as in the forum. !link"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:164
+#: ../drupal/modules/vbcore/vbcore.module:141
msgid "See this page for an overview of available tags."
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:167
+#: ../drupal/modules/vbcore/vbcore.module:144
msgid "Place the text you want to be parsed as vbCode between <vbcode>...</vbcode> tags."
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:170
+#: ../drupal/modules/vbcore/vbcore.module:147
msgid "You can use the same smilies as in the forum. !link"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:170
+#: ../drupal/modules/vbcore/vbcore.module:147
msgid "See this page for an overview of available smilies."
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:406
+#: ../drupal/modules/vbcore/vbcore.module:383
msgid "vbCode Filter"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:406
+#: ../drupal/modules/vbcore/vbcore.module:383
msgid "Partial vbCode Filter"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:406
+#: ../drupal/modules/vbcore/vbcore.module:383
msgid "vBulletin smilies"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:408
+#: ../drupal/modules/vbcore/vbcore.module:385
msgid "Provides full support for vbCode tags within vbDrupal."
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:409
+#: ../drupal/modules/vbcore/vbcore.module:386
msgid "Provides support for vbCode tags for text placed between <vbcode> tags."
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:410
+#: ../drupal/modules/vbcore/vbcore.module:387
msgid "Only parses the vBulletin smilies."
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:491
+#: ../drupal/modules/vbcore/vbcore.module:468
msgid "(no posts)"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:556
+#: ../drupal/modules/vbcore/vbcore.module:534
+msgid "Forum menu"
+msgstr ""
+
+#: ../drupal/modules/vbcore/vbcore.module:539
+msgid "Add forum menu"
+msgstr ""
+
+#: ../drupal/modules/vbcore/vbcore.module:540
+msgid "Add the forum hierarchy to the navigation menu. Each forum will get a menu item. Only forums to which the user has access will be included in the list."
+msgstr ""
+
+#: ../drupal/modules/vbcore/vbcore.module:542
+msgid "No"
+msgstr ""
+
+#: ../drupal/modules/vbcore/vbcore.module:542
+msgid "Yes"
+msgstr ""
+
+#: ../drupal/modules/vbcore/vbcore.module:568
msgid "Your version"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:557
+#: ../drupal/modules/vbcore/vbcore.module:569
msgid "Latest version"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:558
+#: ../drupal/modules/vbcore/vbcore.module:570
msgid "Check version"
msgstr ""
-#: ../drupal/modules/vbcore/vbcore.module:562
+#: ../drupal/modules/vbcore/vbcore.module:574
msgid "Checking version, please wait ..."
msgstr ""
@@ -555,163 +547,151 @@
msgid "Core - required"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:26;357
-msgid "Add forum block"
-msgstr ""
-
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:33 ../drupal/modules/vbforumblocks/vbforumblocks.info:0
-msgid "vb Forum Blocks"
-msgstr ""
-
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:34
-msgid "Adjust settings for all vBulletin forum blocks."
-msgstr ""
-
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:45
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:44
msgid "vBulletin Forum Blocks"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:49
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:48
msgid "Title cut-off"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:51
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:50
msgid "Cut the title short after this number of characters."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:57 ../drupal/modules/vblist/vblist.module:135
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:56 ../drupal/modules/vblist/vblist.module:135
msgid "Cache period"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:60
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:59
msgid "Time period to cache the content of the blocks."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:65
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:64
msgid "No threads message"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:66;227
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:65;237
msgid "No threads"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:67
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:66
msgid "Message to show in case the block is visible but does not contain any threads."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:85
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:84
msgid "Delete block"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:86
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:85
msgid "Check this box to delete this block."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:244
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:254
msgid "Block title"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:246
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:256
msgid "The title of the block as shown to the user."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:262
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:272
msgid "The list of forums to include in this block. You can select multiple forums by holding shift or control."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:272
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:282
msgid "Exclusive list"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:274
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:284
msgid "The above list of forum IDs is a list of forums to exclude rather than include."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:280
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:290
msgid "Maximum threads"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:282
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:292
msgid "Maximum threads to list."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:286
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:296
msgid "No limit"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:290
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:300
msgid "Age cut off"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:293
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:303
msgid "Limit results to threads not older than this limit."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:296;306
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:306;316
msgid "Thread creation date"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:297;307
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:307;317
msgid "Last post"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:300
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:310
msgid "Cut off field"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:303
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:313
msgid "Set the date field to use to check the cut-off date."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:308
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:318
msgid "Number of replies"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:309
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:319
msgid "Number of views"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:312
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:322
msgid "Sort order"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:315
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:325
msgid "The order in which the threads are displayed."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:321
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:331
msgid "Thread preview"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:323
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:333
msgid "Add a thread preview to the items in the same way as vbulletin does in the forum display."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:329
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:339
msgid "Go to new post"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:331
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:341
msgid "The links go to the last post instead of the first."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:337
-msgid "Hide when empty"
-msgstr ""
-
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:339
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:349
msgid "Hide this block when it does not contain any threads."
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:344
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:354
msgid "Block description"
msgstr ""
-#: ../drupal/modules/vbforumblocks/vbforumblocks.module:346
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:356
msgid "A brief description of your block. Used on the <a href=\"!overview\">block overview page</a>."
msgstr ""
#: ../drupal/modules/vbforumblocks/vbforumblocks.module:367
+msgid "Add forum block"
+msgstr ""
+
+#: ../drupal/modules/vbforumblocks/vbforumblocks.module:377
msgid "The new forum block has been added."
msgstr ""
@@ -720,6 +700,10 @@
msgstr ""
#: ../drupal/modules/vbforumblocks/vbforumblocks.info:0
+msgid "vb Forum Blocks"
+msgstr ""
+
+#: ../drupal/modules/vbforumblocks/vbforumblocks.info:0
msgid "Allows you to create blocks for selected forums with the lastest threads or posts"
msgstr ""
@@ -811,39 +795,51 @@
msgid "The time period to cache the results. New threads will invalidate the cache right away, only the thread content will be cached for a given time."
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:162
+#: ../drupal/modules/vblist/vblist.module:144
+msgid "Cache slack period"
+msgstr ""
+
+#: ../drupal/modules/vblist/vblist.module:147
+msgid "Time before updating the first post of the thread will invalidate the cache."
+msgstr ""
+
+#: ../drupal/modules/vblist/vblist.module:171
msgid "Full"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:162
+#: ../drupal/modules/vblist/vblist.module:171
msgid "Preview"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:179
+#: ../drupal/modules/vblist/vblist.module:188
msgid "Save forums"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "ID"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "Forum"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "Status"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "Ignore privs"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:230
+#: ../drupal/modules/vblist/vblist.module:239
msgid "Sub view"
msgstr ""
-#: ../drupal/modules/vblist/vblist.module:286
+#: ../drupal/modules/vblist/vblist.module:331
+msgid "page !d"
+msgstr ""
+
+#: ../drupal/modules/vblist/vblist.module:295
msgid "1 comment"
msgid_plural "@count comments"
msgstr[0] ""
@@ -921,7 +917,7 @@
msgid "Allows the user to import vBulletin posts in Drupal nodes."
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:15;73
+#: ../drupal/modules/vbpm/vbpm.module:15;84
msgid "Private Messages"
msgstr ""
@@ -941,35 +937,27 @@
msgid "Show this number of last received private messages. Set to 0 to disable."
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:44
+#: ../drupal/modules/vbpm/vbpm.module:55
msgid "Using @cur of the @max allowed"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:59
+#: ../drupal/modules/vbpm/vbpm.module:70
msgid "From: @from\nTitle: @title\nOn: @date"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:93 ../drupal/modules/vbpm/vbpm.info:0
-msgid "vb Private Messages"
-msgstr ""
-
-#: ../drupal/modules/vbpm/vbpm.module:94
-msgid "Adjust global private message behavior."
-msgstr ""
-
-#: ../drupal/modules/vbpm/vbpm.module:105
+#: ../drupal/modules/vbpm/vbpm.module:114
msgid "vBulletin Private Messages"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:109
+#: ../drupal/modules/vbpm/vbpm.module:118
msgid "Pop-up on new PM"
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:111
+#: ../drupal/modules/vbpm/vbpm.module:120
msgid "Show a pop-up message when a new PM is available, just like in the forum area. You should not enable this when using the defaultangy theme."
msgstr ""
-#: ../drupal/modules/vbpm/vbpm.module:57
+#: ../drupal/modules/vbpm/vbpm.module:68
msgid "Last @count message"
msgid_plural "Last @count messages"
msgstr[0] ""
@@ -980,46 +968,50 @@
msgstr ""
#: ../drupal/modules/vbpm/vbpm.info:0
+msgid "vb Private Messages"
+msgstr ""
+
+#: ../drupal/modules/vbpm/vbpm.info:0
msgid "Adds vBulletin private message support to the Drupal environment. Mostly useful when not using the defaultangy theme."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:15
+#: ../drupal/modules/vbpolls/vbpolls.module:14
msgid "Latest Poll"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:24
+#: ../drupal/modules/vbpolls/vbpolls.module:23
msgid "The list of forums to pick the latest poll from. You can select multiple forums by holding shift or control."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:32
+#: ../drupal/modules/vbpolls/vbpolls.module:31
msgid "No submit form"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:34
+#: ../drupal/modules/vbpolls/vbpolls.module:33
msgid "Never show a voting form, only the current results."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:38
+#: ../drupal/modules/vbpolls/vbpolls.module:37
msgid "Result bar width"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:40
+#: ../drupal/modules/vbpolls/vbpolls.module:39
msgid "Size (in pixels) of the result bars, this is the size for 100%."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:106
+#: ../drupal/modules/vbpolls/vbpolls.module:122
msgid "Vote"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:128
+#: ../drupal/modules/vbpolls/vbpolls.module:144
msgid "Latest poll"
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:144
+#: ../drupal/modules/vbpolls/vbpolls.module:160
msgid "No active poll."
msgstr ""
-#: ../drupal/modules/vbpolls/vbpolls.module:80;115
+#: ../drupal/modules/vbpolls/vbpolls.module:96;131
msgid "@count vote"
msgid_plural "@count votes"
msgstr[0] ""
@@ -1049,146 +1041,150 @@
msgid "Extra information"
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:151
-msgid "Userid was lost, resolved %user to %uid."
+#: ../drupal/modules/vbuser/vbuser.module:114
+msgid "Your password cannot be the same as your username."
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:155
-msgid "Userid was lost, unable to resolve id for %user"
-msgstr ""
-
-#: ../drupal/modules/vbuser/vbuser.module:174
+#: ../drupal/modules/vbuser/vbuser.module:186
msgid "Remember me"
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:178
+#: ../drupal/modules/vbuser/vbuser.module:190
msgid "Stay logged in across browser sessions."
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:210
+#: ../drupal/modules/vbuser/vbuser.module:219
msgid "vBulletin usergroups associated with this role."
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:237
+#: ../drupal/modules/vbuser/vbuser.module:246
msgid "Change email or password"
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:244
+#: ../drupal/modules/vbuser/vbuser.module:253
msgid "Edit this user's vBulletin account"
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:249
+#: ../drupal/modules/vbuser/vbuser.module:258
msgid "(Implied by vBulletin usergroup)"
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:252
+#: ../drupal/modules/vbuser/vbuser.module:261
msgid "The user has currently the following roles assigned: %r"
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:265
+#: ../drupal/modules/vbuser/vbuser.module:274
msgid "Please adjust your e-mail address here"
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:271
+#: ../drupal/modules/vbuser/vbuser.module:280
msgid "Please adjust the e-mail address here"
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:281
+#: ../drupal/modules/vbuser/vbuser.module:294
msgid "You can change your picture in the !usercp."
msgstr ""
-#: ../drupal/modules/vbuser/vbuser.module:282
+#: ../drupal/modules/vbuser/vbuser.module:295
msgid ...
[truncated message content] |
|
From: <elm...@us...> - 2009-07-23 09:16:07
|
Revision: 880
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=880&view=rev
Author: elmuerte
Date: 2009-07-23 09:15:57 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
comment_vb:
- fixed node publishing outside of the node edit form
- fixed comment thread deletion
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module
Modified: trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module 2009-07-23 09:15:10 UTC (rev 879)
+++ trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module 2009-07-23 09:15:57 UTC (rev 880)
@@ -243,7 +243,7 @@
'#type' => 'checkbox',
'#title' => t('Update thread'),
'#default_value' => ($node->threadid == $node->threadid_autogen) && variable_get('comment_vb_updatepost', true),
- '#description' => t('Update the linked thread. All changes made to the thread well be lost.'),
+ '#description' => t('Update the linked thread. All changes made to first post in this thread well be lost.'),
'#weight' => 4
);
}
@@ -326,6 +326,7 @@
if ($node->threadid) db_query('INSERT INTO {vbthreads} (nid, threadid, autogen) VALUES (%d, %d, %d)', $node->nid, $node->threadid, $node->threadid_autogen);
break;
case "update":
+ _comment_vb_ensure_forumid($node);
_comment_vb_create_thread($node);
if ($node->threadid) db_query('REPLACE INTO {vbthreads} (nid, threadid, autogen) VALUES (%d, %d, %d)', $node->nid, $node->threadid, $node->threadid_autogen);
else db_query('DELETE FROM {vbthreads} WHERE nid = %d', $node->nid);
@@ -334,7 +335,7 @@
if ($node->threadid && variable_get('comment_vb_deletethread', false)) {
global $vbulletin;
$thread = fetch_threadinfo($node->threadid);
- if (!$thread) { // the thread might already have been deleted
+ if ($thread) { // the thread might already have been deleted
$delinfo = array(
'userid' => $vbulletin->userinfo['userid'],
'username' => $vbulletin->userinfo['username'],
@@ -415,31 +416,41 @@
}
if (!is_object($node)) return;
+ _comment_vb_ensure_forumid($node);
+ if (_comment_vb_create_thread($node, true)) {
+ if ($node->threadid) {
+ db_query('REPLACE INTO {vbthreads} (nid, threadid, autogen) VALUES (%d, %d, %d)', $node->nid, $node->threadid, $node->threadid_autogen);
+ watchdog('cron', "Created thread". intval($node->threadid) ." for node ". intval($node->nid), WATCHDOG_NOTICE);
+ }
+ }
+ unset($node);
+}
+
+/**
+ * Makes sure that the forumid field of a node is set to an appropiate id
+ * @param $node
+ */
+function _comment_vb_ensure_forumid(&$node) {
+ if (isset($node->forumid)) return;
$userinfo = fetch_userinfo($node->uid);
cache_permissions($userinfo);
$forums = array();
global $vbulletin;
- foreach (variable_get('comment_vb_forums_' . $node->type, array()) AS $id) {
+ foreach (variable_get('comment_vb_forums', array()) AS $id) {
if (!($userinfo['forumpermissions'][$id] & $vbulletin->bf_ugp_forumpermissions['canview']) AND !$vbulletin->options['showprivateforums']) {
continue;
}
$forum = fetch_foruminfo($id);
$forums[$forum['forumid']] = $forum['title_clean'];
}
- $fid = variable_get('comment_vb_forum__' . $node->type. $node->type, -1);
+ $fid = variable_get('comment_vb_forum_'. $node->type, -1);
if ($fid == -1) {
+ // if no default set, pick the first forumid
reset($forums);
$fid = key($forums);
}
if ($fid == null) return;
$node->forumid = $fid;
- if (_comment_vb_create_thread($node, true)) {
- if ($node->threadid) {
- db_query('REPLACE INTO {vbthreads} (nid, threadid, autogen) VALUES (%d, %d, %d)', $node->nid, $node->threadid, $node->threadid_autogen);
- watchdog('cron', "Created thread". intval($node->threadid) ." for node ". intval($node->nid), WATCHDOG_NOTICE);
- }
- }
- unset($node);
}
/**
@@ -454,7 +465,6 @@
return false;
}
if ($node->status == 0) return false; // only for published threads
- //echo $node->forumid;
if (intval($node->forumid) == 0) return false;
$foruminfo = fetch_foruminfo($node->forumid);
@@ -523,7 +533,17 @@
build_thread_rating(0, $foruminfo, $dataman->thread);
build_forum_counters($node->forumid);
- if (!$silent) drupal_set_message(t('vBulletin thread created in the forum: %forum', array("%forum" => $foruminfo['title'])));
+ if (!$silent) {
+ $link = l($node->title, $vbulletin->options['bburl'] ."/showthread.php", array(
+ 'query' => drupal_query_string_encode(array('t' => $node->threadid)),
+ 'absolute' => true,
+ ));
+ drupal_set_message(t('vBulletin thread !thread created in the forum: %forum',
+ array("%forum" => $foruminfo['title'],
+ '!thread' => $link
+ ))
+ );
+ }
return true;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-23 09:15:19
|
Revision: 879
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=879&view=rev
Author: elmuerte
Date: 2009-07-23 09:15:10 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
- comment thread deletion did not work
Modified Paths:
--------------
branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt
branches/vbdrupal-5/drupal/modules/comment_vb/comment_vb.module
Modified: branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt
===================================================================
--- branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt 2009-07-22 20:52:00 UTC (rev 878)
+++ branches/vbdrupal-5/CHANGELOG.VBDRUPAL.txt 2009-07-23 09:15:10 UTC (rev 879)
@@ -5,6 +5,7 @@
- fixed an issue where user logins from vBulletin were not properly logged in
drupal
- improved caching of vblist
+- comment thread deletion did not work
vbDrupal 5.19.0, 2009-07-02
---------------------------
Modified: branches/vbdrupal-5/drupal/modules/comment_vb/comment_vb.module
===================================================================
--- branches/vbdrupal-5/drupal/modules/comment_vb/comment_vb.module 2009-07-22 20:52:00 UTC (rev 878)
+++ branches/vbdrupal-5/drupal/modules/comment_vb/comment_vb.module 2009-07-23 09:15:10 UTC (rev 879)
@@ -336,7 +336,7 @@
if ($node->threadid && variable_get('comment_vb_deletethread', false)) {
global $vbulletin;
$thread = fetch_threadinfo($node->threadid);
- if (!$thread) { // the thread might already have been deleted
+ if ($thread) { // the thread might already have been deleted
$delinfo = array(
'userid' => $vbulletin->userinfo['userid'],
'username' => $vbulletin->userinfo['username'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-22 20:52:02
|
Revision: 878
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=878&view=rev
Author: elmuerte
Date: 2009-07-22 20:52:00 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
forgot a theme function
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module
Modified: trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module 2009-07-22 20:49:56 UTC (rev 877)
+++ trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module 2009-07-22 20:52:00 UTC (rev 878)
@@ -617,6 +617,9 @@
'comment_view' => array(
'arguments' => array('comment' => NULL, 'node' => NULL, 'links' => array(), 'visible' => 1),
),
+ 'comment_submitted' => array(
+ 'arguments' => array('comment' => NULL),
+ ),
);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-22 20:50:02
|
Revision: 877
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=877&view=rev
Author: elmuerte
Date: 2009-07-22 20:49:56 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
more fixes to the comment_vb module:
- fixed rendering of the comments, and worked around some caching issues
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module
Added Paths:
-----------
trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb_solomode.inc
Modified: trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module 2009-07-22 20:10:28 UTC (rev 876)
+++ trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.module 2009-07-22 20:49:56 UTC (rev 877)
@@ -598,9 +598,28 @@
function comment_vb_theme() {
$ext = array();
- if (function_exists('_comment_vb_theme_additional')) {
- $ext = _comment_vb_theme_additional();
+ if (!comment_vb_dualmode()) {
+ $ext = array(
+ 'comment_flat_expanded' => array(
+ 'arguments' => array('comment' => NULL, 'node' => NULL),
+ ),
+ 'comment_thread_expanded' => array(
+ 'arguments' => array('comment' => NULL, 'node' => NULL),
+ ),
+ 'comment' => array(
+ 'template' => 'comment',
+ 'arguments' => array('comment' => NULL, 'node' => NULL, 'links' => array()),
+ ),
+ 'comment_wrapper' => array(
+ 'template' => 'comment-wrapper',
+ 'arguments' => array('content' => NULL, 'node' => NULL),
+ ),
+ 'comment_view' => array(
+ 'arguments' => array('comment' => NULL, 'node' => NULL, 'links' => array(), 'visible' => 1),
+ ),
+ );
}
+
$base = array(
'comment_vb_thread' => array(
'arguments' => array('node' => NULL),
@@ -751,219 +770,53 @@
return $links;
}
-function comment_vb_render($node, $cid = 0) {
- global $vbulletin;
-
- if (!$node->comment) return '';
- if (!$node->nid) return '';
- $threadid = $node->threadid;
- if (!$threadid) return ''; // no associated thread
-
- $threadinfo = verify_id('thread', $threadid, 0, 1);
- if (!$threadinfo) return ''; // invalid thread
- $foruminfo = verify_id('forum', $threadinfo['forumid'], 0, 1);
- $forumperms = fetch_permissions($foruminfo['forumid']);
-
- // check read permission
- if (!($forumperms & $vbulletin->bf_ugp_forumpermissions['canview']) OR !($forumperms & $vbulletin->bf_ugp_forumpermissions['canviewthreads'])) {
- return '';
- }
- if (!($forumperms & $vbulletin->bf_ugp_forumpermissions['canviewothers']) AND ($thread['postuserid'] != $vbulletin->userinfo['userid'] OR $vbulletin->userinfo['userid'] == 0)) {
- return '';
- }
-
- drupal_add_css(drupal_get_path('module', 'comment') .'/comment.css');
-
- $mode = COMMENT_MODE_FLAT_EXPANDED;
- if ($mode == COMMENT_MODE_THREADED_EXPANDED || $mode == COMMENT_MODE_THREADED_COLLAPSED) {
- // threaded doesn't work well, to complex, doesn't scale
- $order = "post.parentid, post.dateline";
- }
- else {
- $order = "post.dateline";
- }
-
- $result = $vbulletin->db->query("SELECT post.username AS name, post.title as subject, post.dateline AS timestamp, post.postid AS cid, post.pagetext AS comment,
- user.userid AS uid, IF(post.visible = 2, 1, 0) AS isdeleted, post.threadid AS threadid, post.parentid AS pid,
- user.email AS mail, user.homepage AS homepage, user.username AS registered_name
- FROM ". TABLE_PREFIX ."post AS post
- LEFT JOIN ". TABLE_PREFIX ."user AS user ON (user.userid = post.userid)
- WHERE post.threadid = ". intval($threadinfo['threadid']) ." AND visible = 1
- ORDER BY ". $order ." LIMIT 1,". intval(variable_get('comment_vb_max_' . $node->type, 10))); // note: skip first
-
- $cnt = 0;
- $lastnew = 0;
- while ($comment = db_fetch_object($result)) {
- $cnt++;
- $comment->nid = $node->nid;
- $comment->name = unhtmlspecialchars(vbdr_import_string($comment->name), true);
- $comment->subject = unhtmlspecialchars(vbdr_import_string($comment->subject), true);
- $comment->comment = vbdr_import_string($comment->comment);
- $comment->status = COMMENT_PUBLISHED;
- $comment->new = $comment->timestamp > vbcore_get_threadview($threadinfo);
- if ($comment->new) {
- $lastnew = $comment->timestamp;
- }
- $comment->comment = vbcore_parsecode($comment->comment, $threadinfo['forumid'], $threadinfo['attach'], $comment->cid);
- $comment->canreply = $canreply;
-
- if (($mode == COMMENT_MODE_THREADED_EXPANDED) || ($mode == COMMENT_MODE_THREADED_COLLAPSED)) {
- $output .= theme('comment_thread_expanded', $comment);
- }
- else {
- $output .= theme('comment_flat_expanded', $comment);
- }
- }
-
- $links = array();
- if ($cnt > 0) {
- if ($lastnew > 0) {
- require_once VBULLETIN_PATH .'/includes/functions_bigthree.php';
- mark_thread_read($threadinfo, $foruminfo, $vbulletin->userinfo['userid'], $lastnew);
- }
-
- $links['full_thread'] = array(
- 'title' => t('Read full thread'),
- 'href' => $vbulletin->options['bburl'] .'/showthread.php',
- 'query' => drupal_query_string_encode(array('t' => $node->threadid)),
- 'attributes' => array('title' => t('Jump to the first comment of this posting.')),
- 'absolute' => true,
- );
- if (_comment_vb_can_reply($threadinfo)) {
- $links['add_new_comment'] = array(
- 'title' => t('Add new comment'),
- 'href' => $vbulletin->options['bburl'] .'/newreply.php',
- 'query' => drupal_query_string_encode(array('do' => 'newreply', 'noquote' => 1, 't' => $node->threadid)),
- 'attributes' => array('title' => t('Add a new comment to this page.')),
- 'absolute' => true,
- );
- }
- else {
- // we cannot use drupal_get_destination() because these links sometimes appear on /node and taxo listing pages
- if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
- $destination = "destination=". drupal_urlencode("comment/reply/$nid#comment-form");
- }
- else {
- $destination = "destination=". drupal_urlencode("node/$nid#comment-form");
- }
-
- if (variable_get('user_register', 1)) {
- $lnk['title'] = t('<a href="@login">Login</a> or <a href="@register">register</a> to post comments', array('@login' => url('user/login', array('query' => $destination)), '@register' => url('user/register', array('query' => $destination))));
- }
- else {
- $lnk['title'] = t('<a href="@login">Login</a> to post comments', array('@login' => url('user/login', array('query' => $destination))));
- }
- $lnk['html'] = true;
- $links['login_to_post'] = $lnk;
- }
- }
- $output .= theme('links', $links);
- $output = theme('comment_wrapper', $output, $node);
-
- return $output;
-}
-
/**
* Drupal sort of lacks a nice module based approach for comments, so we have to use this approach
*/
if (!function_exists('comment_menu') && (strpos($_GET['q'], 'admin/build/modules') === false) && !is_drupal_mode(DRUPAL_MODE_UPDATE) && ($_GET['q'] != 'admin/simpletest')) {
+ require_once dirname(__FILE__). '/comment_vb_solomode.inc';
+}
- /*
- * Constants to define a comment's published state
- */
- define('COMMENT_PUBLISHED', 0);
- define('COMMENT_NOT_PUBLISHED', 1);
-
- define('COMMENT_NODE_DISABLED', 0);
- define('COMMENT_NODE_READ_ONLY', 1);
- define('COMMENT_NODE_READ_WRITE', 2);
-
- define('COMMENT_MODE_FLAT_COLLAPSED', 1);
- define('COMMENT_MODE_FLAT_EXPANDED', 2);
- define('COMMENT_MODE_THREADED_COLLAPSED', 3);
- define('COMMENT_MODE_THREADED_EXPANDED', 4);
-
- function comment_render($node, $cid = 0) {
- return comment_vb_render($node, $cid);
+/**
+ * Process variables for comment.tpl.php.
+ *
+ * @see comment.tpl.php
+ * @see theme_comment()
+ */
+function comment_vb_preprocess_comment(&$variables) {
+ if (comment_vb_dualmode()) return; // ignore this stuff in dual mode
+ $comment = $variables['comment'];
+ $node = $variables['node'];
+ $variables['author'] = theme('username', $comment);
+ $variables['content'] = $comment->comment;
+ $variables['date'] = format_date($comment->timestamp);
+ $variables['links'] = isset($variables['links']) ? theme('links', $variables['links']) : '';
+ $variables['new'] = $comment->new ? t('new') : '';
+ $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : '';
+ $variables['signature'] = $comment->signature;
+ $variables['submitted'] = theme('comment_submitted', $comment);
+ $variables['title'] = l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid"));
+ $variables['template_files'][] = 'comment-'. $node->type;
+ // set status to a string representation of comment->status.
+ if (isset($comment->preview)) {
+ $variables['status'] = 'comment-preview';
}
-
- if (!function_exists('comment_theme')) {
- function comment_theme() {
- return comment_vb_theme();
- }
+ else {
+ $variables['status'] = ($comment->status == COMMENT_NOT_PUBLISHED) ? 'comment-unpublished' : 'comment-published';
}
-
- function _comment_vb_theme_additional() {
- return array(
- 'comment_flat_expanded' => array(
- 'arguments' => array('comment' => NULL),
- ),
- 'comment_thread_expanded' => array(
- 'arguments' => array('comment' => NULL),
- ),
- 'comment' => array(
- 'arguments' => array('comment' => NULL, 'links' => array()),
- ),
- 'comment_wrapper' => array(
- 'arguments' => array('content' => NULL, 'node' => NULL),
- ),
- 'comment_view' => array(
- 'arguments' => array('comment' => NULL, 'links' => array(), '$visible' => 1),
- ),
- );
- }
-
- function theme_comment_flat_expanded($comment) {
- return theme('comment_view', $comment, module_invoke_all('link', 'comment', $comment, 0));
- }
-
- function theme_comment_thread_expanded($comment) {
- return theme('comment_view', $comment, module_invoke_all('link', 'comment', $comment, 0));
- }
-
- function theme_comment_view($comment, $links = array(), $visible = 1) {
-
- static $first_new = TRUE;
-
- $output = '';
- $comment->new = node_mark($comment->nid, $comment->timestamp);
- if ($first_new && $comment->new != MARK_READ) {
- // Assign the anchor only for the first new comment. This avoids duplicate
- // id attributes on a page.
- $first_new = FALSE;
- $output .= "<a id=\"new\"></a>\n";
- }
-
- $output .= "<a id=\"comment-$comment->cid\"></a>\n";
-
- // Switch to folded/unfolded view of the comment
- if ($visible) {
- // Comment API hook
- comment_invoke_comment($comment, 'view');
- $output .= theme('comment', $comment, $links);
- }
- else {
- return '';
- }
-
- return $output;
- }
-
- function theme_comment($comment, $links = array()) {
- $output = '<div class="comment'. ($comment->status == COMMENT_NOT_PUBLISHED ? ' comment-unpublished' : '') .'">';
- $output .= '<div class="subject">'. l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")) .' '. theme('mark', $comment->new) ."</div>\n";
- $output .= '<div class="credit">'. t('by %a on %b', array('%a' => theme('username', $comment->name), '%b' => format_date($comment->timestamp))) ."</div>\n";
- $output .= '<div class="body">'. $comment->comment .'</div>';
- $output .= '<div class="links">'. theme('links', $links) .'</div>';
- $output .= '</div>';
- return $output;
- }
-
- function theme_comment_wrapper($content, $node) {
- return '<div id="comments">'. $content .'</div>';
- }
-
- function comment_invoke_comment(&$comment, $op) {
- return comment_vb_invoke_comment($comment, $op);
- }
}
+
+/**
+ * Process variables for comment-wrapper.tpl.php.
+ *
+ * @see comment-wrapper.tpl.php
+ * @see theme_comment_wrapper()
+ */
+function comment_vb_preprocess_comment_wrapper(&$variables) {
+ if (comment_vb_dualmode()) return; // ignore this stuff in dual mode
+ // Provide contextual information.
+ $variables['display_mode'] = _comment_get_display_setting('mode', $variables['node']);
+ $variables['display_order'] = _comment_get_display_setting('sort', $variables['node']);
+ $variables['comment_controls_state'] = variable_get('comment_controls_'. $variables['node']->type, COMMENT_CONTROLS_HIDDEN);
+ $variables['template_files'][] = 'comment-wrapper-'. $variables['node']->type;
+}
\ No newline at end of file
Added: trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb_solomode.inc
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb_solomode.inc (rev 0)
+++ trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb_solomode.inc 2009-07-22 20:49:56 UTC (rev 877)
@@ -0,0 +1,206 @@
+<?php
+
+// $Id: comment_vb.module 875 2009-07-21 22:05:26Z elmuerte $
+
+/**
+ * @file
+ * Clones of certain code from the comment module, used to mimic the comment
+ * module when only comment_vb is enabled. This is place to add stuff that would
+ * otherwise collide with the comment module. Note: watch out for certain functions
+ * which are cached by Drupal, the might not work.
+ */
+
+
+/*
+ * Constants to define a comment's published state
+ */
+define('COMMENT_PUBLISHED', 0);
+define('COMMENT_NOT_PUBLISHED', 1);
+
+define('COMMENT_NODE_DISABLED', 0);
+define('COMMENT_NODE_READ_ONLY', 1);
+define('COMMENT_NODE_READ_WRITE', 2);
+
+define('COMMENT_MODE_FLAT_COLLAPSED', 1);
+define('COMMENT_MODE_FLAT_EXPANDED', 2);
+define('COMMENT_MODE_THREADED_COLLAPSED', 3);
+define('COMMENT_MODE_THREADED_EXPANDED', 4);
+
+
+function comment_vb_render($node, $cid = 0) {
+ global $vbulletin;
+
+ if (!$node->comment) return '';
+ if (!$node->nid) return '';
+ $threadid = $node->threadid;
+ if (!$threadid) return ''; // no associated thread
+
+ $threadinfo = verify_id('thread', $threadid, 0, 1);
+ if (!$threadinfo) return ''; // invalid thread
+ $foruminfo = verify_id('forum', $threadinfo['forumid'], 0, 1);
+ $forumperms = fetch_permissions($foruminfo['forumid']);
+
+ // check read permission
+ if (!($forumperms & $vbulletin->bf_ugp_forumpermissions['canview']) OR !($forumperms & $vbulletin->bf_ugp_forumpermissions['canviewthreads'])) {
+ return '';
+ }
+ if (!($forumperms & $vbulletin->bf_ugp_forumpermissions['canviewothers']) AND ($thread['postuserid'] != $vbulletin->userinfo['userid'] OR $vbulletin->userinfo['userid'] == 0)) {
+ return '';
+ }
+
+ drupal_add_css(drupal_get_path('module', 'comment') .'/comment.css');
+
+ $mode = COMMENT_MODE_FLAT_EXPANDED;
+ if ($mode == COMMENT_MODE_THREADED_EXPANDED || $mode == COMMENT_MODE_THREADED_COLLAPSED) {
+ // threaded doesn't work well, to complex, doesn't scale
+ $order = "post.parentid, post.dateline";
+ }
+ else {
+ $order = "post.dateline";
+ }
+
+ $result = $vbulletin->db->query("SELECT post.username AS name, post.title as subject, post.dateline AS timestamp, post.postid AS cid, post.pagetext AS comment,
+ user.userid AS uid, IF(post.visible = 2, 1, 0) AS isdeleted, post.threadid AS threadid, post.parentid AS pid,
+ user.email AS mail, user.homepage AS homepage, user.username AS registered_name
+ FROM ". TABLE_PREFIX ."post AS post
+ LEFT JOIN ". TABLE_PREFIX ."user AS user ON (user.userid = post.userid)
+ WHERE post.threadid = ". intval($threadinfo['threadid']) ." AND visible = 1
+ ORDER BY ". $order ." LIMIT 1,". intval(variable_get('comment_vb_max_' . $node->type, variable_get('comment_vb_max', 10)))); // note: skip first
+
+ $cnt = 0;
+ $lastnew = 0;
+ while ($comment = db_fetch_object($result)) {
+ $cnt++;
+ $comment->nid = $node->nid;
+ $comment->name = unhtmlspecialchars(vbdr_import_string($comment->name), true);
+ $comment->subject = unhtmlspecialchars(vbdr_import_string($comment->subject), true);
+ $comment->comment = vbdr_import_string($comment->comment);
+ $comment->status = COMMENT_PUBLISHED;
+ $comment->new = $comment->timestamp > vbcore_get_threadview($threadinfo);
+ if ($comment->new) {
+ $lastnew = $comment->timestamp;
+ }
+ $comment->comment = vbcore_parsecode($comment->comment, $threadinfo['forumid'], $threadinfo['attach'], $comment->cid);
+ $comment->canreply = $canreply;
+
+ if (($mode == COMMENT_MODE_THREADED_EXPANDED) || ($mode == COMMENT_MODE_THREADED_COLLAPSED)) {
+ $output .= theme('comment_thread_expanded', $comment, $node);
+ }
+ else {
+ $output .= theme('comment_flat_expanded', $comment, $node);
+ }
+ }
+
+ $links = array();
+ if ($cnt > 0) {
+ if ($lastnew > 0) {
+ require_once VBULLETIN_PATH .'/includes/functions_bigthree.php';
+ mark_thread_read($threadinfo, $foruminfo, $vbulletin->userinfo['userid'], $lastnew);
+ }
+
+ $links['full_thread'] = array(
+ 'title' => t('Read full thread'),
+ 'href' => $vbulletin->options['bburl'] .'/showthread.php',
+ 'query' => drupal_query_string_encode(array('t' => $node->threadid)),
+ 'attributes' => array('title' => t('Jump to the first comment of this posting.')),
+ 'absolute' => true,
+ );
+ if (_comment_vb_can_reply($threadinfo)) {
+ $links['add_new_comment'] = array(
+ 'title' => t('Add new comment'),
+ 'href' => $vbulletin->options['bburl'] .'/newreply.php',
+ 'query' => drupal_query_string_encode(array('do' => 'newreply', 'noquote' => 1, 't' => $node->threadid)),
+ 'attributes' => array('title' => t('Add a new comment to this page.')),
+ 'absolute' => true,
+ );
+ }
+ else {
+ // we cannot use drupal_get_destination() because these links sometimes appear on /node and taxo listing pages
+ if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
+ $destination = "destination=". drupal_urlencode("comment/reply/$nid#comment-form");
+ }
+ else {
+ $destination = "destination=". drupal_urlencode("node/$nid#comment-form");
+ }
+
+ if (variable_get('user_register', 1)) {
+ $lnk['title'] = t('<a href="@login">Login</a> or <a href="@register">register</a> to post comments', array('@login' => url('user/login', array('query' => $destination)), '@register' => url('user/register', array('query' => $destination))));
+ }
+ else {
+ $lnk['title'] = t('<a href="@login">Login</a> to post comments', array('@login' => url('user/login', array('query' => $destination))));
+ }
+ $lnk['html'] = true;
+ $links['login_to_post'] = $lnk;
+ }
+ }
+ $output .= theme('links', $links);
+ $output = theme('comment_wrapper', $output, $node);
+
+ return $output;
+}
+
+function comment_render($node, $cid = 0) {
+ return comment_vb_render($node, $cid);
+}
+
+/*
+if (!function_exists('comment_theme')) {
+ function comment_theme() {
+ return comment_vb_theme();
+ }
+}
+*/
+
+function theme_comment_flat_expanded($comment, $node) {
+ return theme('comment_view', $comment, $node, module_invoke_all('link', 'comment', $comment, 0));
+}
+
+function theme_comment_thread_expanded($comment, $node) {
+ return theme('comment_view', $comment, $node, module_invoke_all('link', 'comment', $comment, 0));
+}
+
+function theme_comment_view($comment, $node, $links = array(), $visible = true) {
+ static $first_new = TRUE;
+
+ $output = '';
+ $comment->new = node_mark($comment->nid, $comment->timestamp);
+ if ($first_new && $comment->new != MARK_READ) {
+ // Assign the anchor only for the first new comment. This avoids duplicate
+ // id attributes on a page.
+ $first_new = FALSE;
+ $output .= "<a id=\"new\"></a>\n";
+ }
+
+ $output .= "<a id=\"comment-$comment->cid\"></a>\n";
+
+ // Switch to folded/unfolded view of the comment
+ if ($visible) {
+ // Comment API hook
+ comment_invoke_comment($comment, 'view');
+ $output .= theme('comment', $comment, $node, $links);
+ }
+ else {
+ return '';
+ }
+
+ return $output;
+}
+
+/**
+ * Theme a "Submitted by ..." notice.
+ *
+ * @param $comment
+ * The comment.
+ * @ingroup themeable
+ */
+function theme_comment_submitted($comment) {
+ return t('Submitted by !username on @datetime.',
+ array(
+ '!username' => theme('username', $comment),
+ '@datetime' => format_date($comment->timestamp)
+ ));
+}
+
+function comment_invoke_comment(&$comment, $op) {
+ return comment_vb_invoke_comment($comment, $op);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <elm...@us...> - 2009-07-22 20:10:34
|
Revision: 876
http://vbdrupal.svn.sourceforge.net/vbdrupal/?rev=876&view=rev
Author: elmuerte
Date: 2009-07-22 20:10:28 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.install
Modified: trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.install
===================================================================
--- trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.install 2009-07-21 22:05:26 UTC (rev 875)
+++ trunk/vbdrupal-ng/drupal/modules/comment_vb/comment_vb.install 2009-07-22 20:10:28 UTC (rev 876)
@@ -16,12 +16,12 @@
*/
function comment_vb_schema() {
$schema['vbthreads'] = array(
- 'fields' => array(
- 'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
- 'threadid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
- 'autogen' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)
- ),
- 'unique key' => array('nid'),
+ 'fields' => array(
+ 'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+ 'threadid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+ 'autogen' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)
+ ),
+ 'unique key' => array('nid'),
);
return $schema;
@@ -30,6 +30,10 @@
function comment_vb_uninstall() {
// Remove tables.
drupal_uninstall_schema('comment_vb');
-
}
+function comment_vb_update_1() {
+ $ret = array();
+ db_add_field($ret, 'vbthreads', 'autogen', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0));
+ return $ret;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
