[Fusionforge-commits] r13232 - in branches/Branch_5_1/src/plugins/forumml: bin etc packaging/control www
Christian Bayle
cbayle at fusionforge.org
Fri Apr 29 15:49:32 CEST 2011
Author: cbayle
Date: 2011-04-29 15:49:32 +0200 (Fri, 29 Apr 2011)
New Revision: 13232
Added:
branches/Branch_5_1/src/plugins/forumml/etc/forumml.ini
Modified:
branches/Branch_5_1/src/plugins/forumml/bin/db-upgrade.pl
branches/Branch_5_1/src/plugins/forumml/bin/install.sh
branches/Branch_5_1/src/plugins/forumml/bin/ml_arch_2_DBFF.pl
branches/Branch_5_1/src/plugins/forumml/packaging/control/222plugin-forumml
branches/Branch_5_1/src/plugins/forumml/www/forumml_utils.php
Log:
Merge changes from trunk
Modified: branches/Branch_5_1/src/plugins/forumml/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_1/src/plugins/forumml/bin/db-upgrade.pl 2011-04-29 12:44:35 UTC (rev 13231)
+++ branches/Branch_5_1/src/plugins/forumml/bin/db-upgrade.pl 2011-04-29 13:49:32 UTC (rev 13232)
@@ -17,7 +17,7 @@
$sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
$sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
$sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
- $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+ $domain_name $newsadmin_groupid $statsadmin_groupid
$skill_list/ ;
use vars qw/$pluginname/ ;
@@ -69,33 +69,6 @@
$dbh->commit () ;
}
-# $version = &get_db_version ;
-# $target = "0.2" ;
-# if (is_lesser $version, $target) {
-# debug "Adding local data." ;
-#
-# do "/etc/gforge/local.pl" or die "Cannot read /etc/gforge/local.pl" ;
-#
-# my $ip_address = qx/host $domain_name | awk '{print \}'/ ;
-#
-# @reqlist = (
-# "INSERT INTO plugin_".$pluginname."_sample_data (domain, ip_address) VALUES ('$domain_name', '$ip_address')",
-# ) ;
-#
-# foreach my $s (@reqlist) {
-# $query = $s ;
-# # debug $query ;
-# $sth = $dbh->prepare ($query) ;
-# $sth->execute () ;
-# $sth->finish () ;
-# }
-# @reqlist = () ;
-#
-# &update_db_version ($target) ;
-# debug "Committing." ;
-# $dbh->commit () ;
-# }
-
debug "It seems your database install/upgrade went well and smoothly. That's cool." ;
debug "Please enjoy using Debian FusionForge." ;
Modified: branches/Branch_5_1/src/plugins/forumml/bin/install.sh
===================================================================
--- branches/Branch_5_1/src/plugins/forumml/bin/install.sh 2011-04-29 12:44:35 UTC (rev 13231)
+++ branches/Branch_5_1/src/plugins/forumml/bin/install.sh 2011-04-29 13:49:32 UTC (rev 13232)
@@ -1,3 +1,5 @@
#! /bin/sh
/usr/share/gforge/plugins/forumml/bin/installFF.sh
/usr/share/gforge/plugins/forumml/bin/ml_arch_2_DBFF.pl
+invoke-rc.d exim4 restart || true
+invoke-rc.d mailman restart || true
Modified: branches/Branch_5_1/src/plugins/forumml/bin/ml_arch_2_DBFF.pl
===================================================================
--- branches/Branch_5_1/src/plugins/forumml/bin/ml_arch_2_DBFF.pl 2011-04-29 12:44:35 UTC (rev 13231)
+++ branches/Branch_5_1/src/plugins/forumml/bin/ml_arch_2_DBFF.pl 2011-04-29 13:49:32 UTC (rev 13232)
@@ -55,7 +55,7 @@
#use strict;
use DBI;
-require "/etc/gforge/local.pl";
+require ("/usr/share/gforge/lib/include.pl") ;
my $dbh = DBI->connect("DBI:Pg:host=localhost ;dbname=$sys_dbname ; user= $sys_dbuser ; password=$sys_dbpasswd") or die "Couldn't connect to database: " . DBI->errstr;
Added: branches/Branch_5_1/src/plugins/forumml/etc/forumml.ini
===================================================================
--- branches/Branch_5_1/src/plugins/forumml/etc/forumml.ini (rev 0)
+++ branches/Branch_5_1/src/plugins/forumml/etc/forumml.ini 2011-04-29 13:49:32 UTC (rev 13232)
@@ -0,0 +1,8 @@
+[forumml]
+
+; Current forumml is to be validate by developers
+; plugin_status is a string.
+; valid means : production ready.
+; Any other strings means it's under work or broken and plugin
+; is available in installation_environment = development only.
+plugin_status = valid
Modified: branches/Branch_5_1/src/plugins/forumml/packaging/control/222plugin-forumml
===================================================================
--- branches/Branch_5_1/src/plugins/forumml/packaging/control/222plugin-forumml 2011-04-29 12:44:35 UTC (rev 13231)
+++ branches/Branch_5_1/src/plugins/forumml/packaging/control/222plugin-forumml 2011-04-29 13:49:32 UTC (rev 13232)
@@ -1,4 +1,4 @@
Package: @PACKAGE at -plugin-forumml
Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, php5-cli, php-mail, php-mail-mime, php-mail-mbox, php-mail-mimedecode, ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @PACKAGE at -plugin-mailman, php5-cli, php-mail, php-mail-mime, php-mail-mbox, php-mail-mimedecode, python-iniparse, ${misc:Depends}
Description: collaborative development tool - ForumML plugin
Modified: branches/Branch_5_1/src/plugins/forumml/www/forumml_utils.php
===================================================================
--- branches/Branch_5_1/src/plugins/forumml/www/forumml_utils.php 2011-04-29 12:44:35 UTC (rev 13231)
+++ branches/Branch_5_1/src/plugins/forumml/www/forumml_utils.php 2011-04-29 13:49:32 UTC (rev 13232)
@@ -126,7 +126,7 @@
// Total number of threads
$nbThreads = 0;
$res = getForumMLDao()->countAllThreadsFromList($list_id);
- if ($res && !db_error($res)) {
+ if ($res && !db_error()) {
$row = $res->getRow();
$nbThreads = $row['nb'];
}
More information about the Fusionforge-commits
mailing list