| [vhffs-dev] [2025] API code cleaning, sed and grep powered :-) |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 2025
Author: gradator
Date: 2012-02-19 17:11:44 +0100 (Sun, 19 Feb 2012)
Log Message:
-----------
API code cleaning, sed and grep powered :-)
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Acl.pm
trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
trunk/vhffs-api/src/Vhffs/Panel/Auth.pm
trunk/vhffs-api/src/Vhffs/Panel/Avatar.pm
trunk/vhffs-api/src/Vhffs/Panel/Bazaar.pm
trunk/vhffs-api/src/Vhffs/Panel/Broadcast.pm
trunk/vhffs-api/src/Vhffs/Panel/Commons.pm
trunk/vhffs-api/src/Vhffs/Panel/Cron.pm
trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
trunk/vhffs-api/src/Vhffs/Panel/Git.pm
trunk/vhffs-api/src/Vhffs/Panel/Group.pm
trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm
trunk/vhffs-api/src/Vhffs/Panel/Main.pm
trunk/vhffs-api/src/Vhffs/Panel/Mercurial.pm
trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
trunk/vhffs-api/src/Vhffs/Panel/Public.pm
trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
trunk/vhffs-api/src/Vhffs/Panel/Subscribe.pm
trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
trunk/vhffs-api/src/Vhffs/Panel/Tag.pm
trunk/vhffs-api/src/Vhffs/Panel/User.pm
trunk/vhffs-api/src/Vhffs/Panel/Web.pm
trunk/vhffs-api/src/Vhffs/Robots/Bazaar.pm
trunk/vhffs-api/src/Vhffs/Robots/Cron.pm
trunk/vhffs-api/src/Vhffs/Robots/Cvs.pm
trunk/vhffs-api/src/Vhffs/Robots/Git.pm
trunk/vhffs-api/src/Vhffs/Robots/Group.pm
trunk/vhffs-api/src/Vhffs/Robots/Mail.pm
trunk/vhffs-api/src/Vhffs/Robots/Mailing.pm
trunk/vhffs-api/src/Vhffs/Robots/Mercurial.pm
trunk/vhffs-api/src/Vhffs/Robots/Mysql.pm
trunk/vhffs-api/src/Vhffs/Robots/Pgsql.pm
trunk/vhffs-api/src/Vhffs/Robots/Repository.pm
trunk/vhffs-api/src/Vhffs/Robots/Svn.pm
trunk/vhffs-api/src/Vhffs/Robots/User.pm
trunk/vhffs-api/src/Vhffs/Robots/Web.pm
trunk/vhffs-api/src/Vhffs/Services/Cvs.pm
trunk/vhffs-api/src/Vhffs/Services/Mail.pm
trunk/vhffs-api/src/Vhffs/Services/MailGroup.pm
trunk/vhffs-api/src/Vhffs/Services/MailUser.pm
trunk/vhffs-api/src/Vhffs/Services/MailingList.pm
trunk/vhffs-api/src/Vhffs/Tag/Category.pm
trunk/vhffs-api/src/Vhffs/Tag/Request.pm
trunk/vhffs-api/src/Vhffs/Tag.pm
trunk/vhffs-api/src/Vhffs/User.pm
Modified: trunk/vhffs-api/src/Vhffs/Acl.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Acl.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Acl.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -215,13 +215,13 @@
A NULL name is the default ACL.
Example:
- granted_oid | name | perm
--------------+----------+------
- 3 | | 0 <== default ACL
- 1 | user1 | 10
- 25 | user2 | 10
- 72 | user3 | <== user without ACL
-(4 rows)
+ granted_oid | name | perm
+ -------------+----------+------
+ 3 | | 0 <== default ACL
+ 1 | user1 | 10
+ 25 | user2 | 10
+ 72 | user3 | <== user without ACL
+ (4 rows)
=cut
sub get_object_acl {
Modified: trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Admin.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Admin.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -150,7 +150,7 @@
=head2 get_tag_category
Vhffs::Panel::Admin::get_tag_cagtegory
-
+
Returns a hashref (name, ITEM, type) containing tags'
administration items
@@ -456,11 +456,11 @@
my $cgi = $panel->{'cgi'};
my $session = $panel->{'session'};
my $user = $panel->{'user'};
-
+
$panel->set_title(gettext('Administration'));
my $categories = [];
- if( $user->is_moderator ) {
+ if( $user->is_moderator ) {
$categories = Vhffs::Panel::Admin::get_all_modo_categories($panel->{vhffs});
} else {
$categories = Vhffs::Panel::Admin::get_all_admin_categories($panel->{vhffs});
Modified: trunk/vhffs-api/src/Vhffs/Panel/Auth.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Auth.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Auth.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -40,8 +40,7 @@
use Vhffs::Constants;
-sub display_login
-{
+sub display_login {
my $panel = shift;
my $vhffs = $panel->{'vhffs'};
@@ -84,11 +83,11 @@
my $oldsession = new CGI::Session(undef, $oldsid, {Directory=>'/tmp'});
$oldsession->delete() if defined $oldsession;
}
-
+
my $username = $cgi->param('username');
my $password = $cgi->param('password');
my $user = Vhffs::User::get_by_username($vhffs, $username) if defined $username;
-
+
#Incomplete input
unless( defined $username && defined $password && defined $user && $user->check_password( $password ) ) {
$panel->add_error( gettext('Login failed !') );
@@ -105,13 +104,13 @@
$session->expires('+1h');
$session->param('username', $user->get_username);
$session->param('uid', $user->get_uid);
-
+
my $sessioncookie = new CGI::Cookie(-name => $session->name, -value => $session->id);
-
+
# Refresh cookies (avoid theme and language loss when user deletes cookies).
my $themecookie = new CGI::Cookie( -name=> 'theme', -value=>$user->get_theme, -expires=>'+10y' );
my $langcookie = new CGI::Cookie( -name=>'language', -value=>$user->get_lang, -expires=>'+10y' );
-
+
# Set last login panel to current time
$user->update_lastloginpanel;
$user->commit;
@@ -119,7 +118,7 @@
$panel->redirect('?do=home', [$sessioncookie, $themecookie, $langcookie]);
}
}
-
+
display_login( $panel ) if not $loginsubmitted or $panel->has_errors;
}
@@ -168,12 +167,12 @@
my $mu = new Vhffs::Services::MailUser( $vhffs, $user );
$mu->changepassword( $password ) if defined $mu and $mu->exists_box;
-
+
# Send a mail with plain text password inside
my $subject = sprintf('Password changed on %s', $vhffs->get_config->get_host_name );
my $content = sprintf("Hello %s %s,\n\nYou asked for a new password, here are your new login information:\nUser: %s\nPassword: %s\n\n%s Administrators\n", $user->get_firstname, $user->get_lastname, $user->get_username, $password , $vhffs->get_config->get_host_name );
$user->send_mail_user( $subject, $content );
-
+
$panel->render('anonymous/lost-password-ack.tt',
{ message => sprintf( gettext('Please wait %s, a new password will be sent to you in a few minutes...'), $username ) },
'anonymous.tt' );
Modified: trunk/vhffs-api/src/Vhffs/Panel/Avatar.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Avatar.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Avatar.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -136,7 +136,7 @@
my $wp = GD::Text::Wrap->new($gd,
width => 70,
line_space => 0,
- color => $black,
+ color => $black,
text => 'No avatar',
);
$wp->set_font(GD::Font->Large, 14);
@@ -265,7 +265,7 @@
use Vhffs::Panel::Avatar;
my $vhffs = init Vhffs::Main;
-
+
....
(considers that you create or handle an object in $object var)
....
Modified: trunk/vhffs-api/src/Vhffs/Panel/Bazaar.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Bazaar.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Bazaar.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -47,7 +47,7 @@
=head2 getall_per_group
- $bazaar = Vhffs::Panel::Bazaar::getall_per_group($vhffs, $gid);
+ $bazaar = Vhffs::Panel::Bazaar::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all bazaar repos owned by
a given group.
@@ -107,13 +107,13 @@
my ($main, $repo, $description, $user, $group) = @_;
return -1 unless defined $user;
return -2 unless defined $group;
-
+
my $bazaar = Vhffs::Services::Bazaar::create( $main, $repo, $description, $user, $group );
return -1 unless defined $bazaar;
-
+
return -3 if Vhffs::Acl::add_acl( $main, $user, $bazaar, Vhffs::Constants::ACL_DELETE ) < 0;
return -3 if Vhffs::Acl::add_acl( $main, $group, $bazaar, Vhffs::Constants::ACL_VIEW ) < 0;
- return $bazaar;
+ return $bazaar;
}
sub create {
Modified: trunk/vhffs-api/src/Vhffs/Panel/Broadcast.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Broadcast.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Broadcast.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-# 3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+# 3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Commons.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Commons.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Commons.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -42,7 +42,7 @@
=head2 paginate
- Vhffs::Panel::Commons::paginate($template, $current_page, $total_count, $items_per_page, $url_params);
+ Vhffs::Panel::Commons::paginate($template, $current_page, $total_count, $items_per_page, $url_params);
C<$url_param> is a reference to a hash containing parameters to append to the URL and their values. Empty
parameters won't be appended.
@@ -50,37 +50,37 @@
=cut
sub paginate($$$$$) {
- my ($template, $current_page, $total_count, $items_per_page, $url_params) = @_;
- die('Attempted to paginate without pagination template') unless($template->query(name => 'PAGINATION'));
- my $max_pages = int( ($total_count + ($items_per_page - 1)) / $items_per_page );
- if($max_pages > 1) {
- my @params;
- $template->param(PAGINATION => 1);
- foreach my $key (keys %$url_params) {
- my $value = $url_params->{$key};
- push @params, $key.'='.$value unless($value =~ /^\s*$/);
- }
- $template->param( SEARCH_CRITERIA => join(';', @params) );
- $template->param( CURRENT_PAGE => $current_page );
- my $pages = [];
- if($current_page > 1) {
- for(($current_page - $items_per_page < 1 ? 1 : $current_page - $items_per_page)..($current_page - 1)) {
- push @$pages, { PAGE => $_ };
- }
- }
- $template->param( PREVIOUS_PAGES => \@$pages );
- $pages = [];
+ my ($template, $current_page, $total_count, $items_per_page, $url_params) = @_;
+ die('Attempted to paginate without pagination template') unless($template->query(name => 'PAGINATION'));
+ my $max_pages = int( ($total_count + ($items_per_page - 1)) / $items_per_page );
+ if($max_pages > 1) {
+ my @params;
+ $template->param(PAGINATION => 1);
+ foreach my $key (keys %$url_params) {
+ my $value = $url_params->{$key};
+ push @params, $key.'='.$value unless($value =~ /^\s*$/);
+ }
+ $template->param( SEARCH_CRITERIA => join(';', @params) );
+ $template->param( CURRENT_PAGE => $current_page );
+ my $pages = [];
+ if($current_page > 1) {
+ for(($current_page - $items_per_page < 1 ? 1 : $current_page - $items_per_page)..($current_page - 1)) {
+ push @$pages, { PAGE => $_ };
+ }
+ }
+ $template->param( PREVIOUS_PAGES => \@$pages );
+ $pages = [];
- if($current_page < $max_pages) {
- for(($current_page + 1)..($current_page + $items_per_page > $max_pages ? $max_pages : $current_page + $items_per_page)) {
- push @$pages, { PAGE => $_ };
- }
- }
- $template->param( NEXT_PAGES => $pages );
+ if($current_page < $max_pages) {
+ for(($current_page + 1)..($current_page + $items_per_page > $max_pages ? $max_pages : $current_page + $items_per_page)) {
+ push @$pages, { PAGE => $_ };
+ }
+ }
+ $template->param( NEXT_PAGES => $pages );
- $template->param( PREVIOUS_PAGE => ($current_page - 1 < 1 ? 0 : $current_page - 1 ) );
- $template->param( NEXT_PAGE => ($current_page + 1 > $max_pages ? 0 : $current_page + 1 ) );
- }
+ $template->param( PREVIOUS_PAGE => ($current_page - 1 < 1 ? 0 : $current_page - 1 ) );
+ $template->param( NEXT_PAGE => ($current_page + 1 > $max_pages ? 0 : $current_page + 1 ) );
+ }
}
=head2 get_pager
@@ -91,41 +91,41 @@
my ($current_page, $total, $ipp, $slider_size, $url, $url_params) = @_;
my $last_page = int( ($total + $ipp - 1 ) / $ipp);
my $pager = {};
-
+
if($last_page > 1) {
$pager->{last_page} = $last_page;
$pager->{current_page} = $current_page;
$pager->{url} = $url;
-
+
my @params = ();
foreach my $key (keys %$url_params) {
- my $value = $url_params->{$key};
- if(ref($value) eq 'ARRAY') {
- push @params, $key.'='.$_ foreach(@$value);
- } else {
- push @params, $key.'='.$value;
- }
- }
- $pager->{query_string} = join(';', @params);
- my $pages = [];
- for( ( ($current_page - $slider_size > 0) ? $current_page - $slider_size : 1 )..($current_page - 1) ) {
- push @$pages, $_;
- }
- $pager->{previous_pages} = $pages;
-
- $pages = [];
- for( ($current_page + 1)..(($current_page + $slider_size <= $last_page) ? $current_page + $slider_size : $last_page ) ) {
- push @$pages, $_;
- }
- $pager->{next_pages} = $pages;
+ my $value = $url_params->{$key};
+ if(ref($value) eq 'ARRAY') {
+ push @params, $key.'='.$_ foreach(@$value);
+ } else {
+ push @params, $key.'='.$value;
+ }
+ }
+ $pager->{query_string} = join(';', @params);
+ my $pages = [];
+ for( ( ($current_page - $slider_size > 0) ? $current_page - $slider_size : 1 )..($current_page - 1) ) {
+ push @$pages, $_;
+ }
+ $pager->{previous_pages} = $pages;
+
+ $pages = [];
+ for( ($current_page + 1)..(($current_page + $slider_size <= $last_page) ? $current_page + $slider_size : $last_page ) ) {
+ push @$pages, $_;
+ }
+ $pager->{next_pages} = $pages;
}
-
+
return $pager;
}
=head2
- fetch_slice_and_count($main, $select, $conditions, $order, $start, $count, $params, $select_callback);
+ fetch_slice_and_count($main, $select, $conditions, $order, $start, $count, $params, $select_callback);
Helper function for pagination. Fetches a slice of result (using C<"LIMIT"> and C<"OFFSET"> clauses)
and the total count of items (if there was no slice).
@@ -135,10 +135,10 @@
=item C<$main>: Vhffs::Main instance;
=item C<$select>: C<"SELECT"> clause of the query, will be replaced with C<"SELECT COUNT(*)"> to
- get the total count;
+ get the total count;
=item C<$conditions>: conditions applied to the SELECT clausse. Includes all the query
- begining at C<"FROM"> and ending right befor C<"ORDER BY">;
+ begining at C<"FROM"> and ending right befor C<"ORDER BY">;
=item C<$order>: C<"ORDER BY"> clause of the query;
@@ -149,24 +149,24 @@
=item C<$params>: array ref containing parameters of the query when using placeholders;
=item C<$select_callback>: optional sub reference which will be used to fetch results instead
- of C<DBI::selectall_arrayref>. Its protorype must be ($main, $sql, @params).
+ of C<DBI::selectall_arrayref>. Its protorype must be ($main, $sql, @params).
=back
=cut
sub fetch_slice_and_count($$$$$$$;$) {
- my ($main, $select, $conditions, $order, $start, $count, $params, $select_callback) = @_;
-
- my $dbh = $main->get_db_object;
- my $result = {};
- my $sql = $select.$conditions.$order." LIMIT $count OFFSET $start";
- if(defined $select_callback) {
- $result->{data} = $select_callback->($main, $sql, @{$params});
- } else {
- $result->{data} = $dbh->selectall_arrayref($sql, { Slice => {} }, @{$params});
- }
- ($result->{total_count}) = @{$dbh->selectrow_arrayref('SELECT COUNT(*) '.$conditions, undef, @$params)};
- return $result;
+ my ($main, $select, $conditions, $order, $start, $count, $params, $select_callback) = @_;
+
+ my $dbh = $main->get_db_object;
+ my $result = {};
+ my $sql = $select.$conditions.$order.' LIMIT '.$count.' OFFSET '.$start;
+ if(defined $select_callback) {
+ $result->{data} = $select_callback->($main, $sql, @{$params});
+ } else {
+ $result->{data} = $dbh->selectall_arrayref($sql, { Slice => {} }, @{$params});
+ }
+ ($result->{total_count}) = @{$dbh->selectrow_arrayref('SELECT COUNT(*) '.$conditions, undef, @$params)};
+ return $result;
}
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Cron.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Cron.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Cron.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -50,7 +50,7 @@
'INNER JOIN vhffs_object o ON (o.object_id = cvs.object_id) '.
'INNER JOIN vhffs_groups g ON (g.gid = o.owner_gid) '.
'INNER JOIN vhffs_users u ON (u.uid = o.owner_uid) ';
-
+
if( defined $name ) {
$sql .= 'WHERE cvs.cvsroot LIKE ? ';
push(@params, '%'.lc($name).'%');
@@ -81,7 +81,7 @@
=head2 getall_per_group
- $cvs = Vhffs::Panel::Cvs::getall_per_group($vhffs, $gid);
+ $cvs = Vhffs::Panel::Cvs::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all CVS repos owned by
a given group.
Modified: trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/DNS.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/DNS.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -96,14 +96,12 @@
=head2 getall_per_group
- $dns = Vhffs::Panel::Dns::getall_per_group($vhffs, $gid);
+ dns = Vhffs::Panel::Dns::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all DNS owned by
a given group.
=cut
-
-
sub getall_per_group {
my ( $main, $gid ) = @_;
@@ -125,15 +123,14 @@
=head2 delete_record
- eval { Vhffs::Panel::DNS::delete_record($dns, $id, $type); };
- if($@) {
- print "An error occured: $@\n";
- } else {
- print "$type Record deleted\n";
- }
+ eval { Vhffs::Panel::DNS::delete_record($dns, $id, $type); };
+ if($@) {
+ print "An error occured: $@\n";
+ } else {
+ print "$type Record deleted\n";
+ }
=cut
-
sub delete_record {
my ($dns, $id, $type) = @_;
die() unless defined $dns and defined $id and defined $type;
@@ -153,12 +150,12 @@
=head2 add_a
- eval { Vhffs::Panel::DNS::add_a($dns, $redirect, $name, $ip); };
- if($@) {
- print "An error occured: $@\n";
- } else {
- print "A Record added\n";
- }
+ eval { Vhffs::Panel::DNS::add_a($dns, $redirect, $name, $ip); };
+ if($@) {
+ print "An error occured: $@\n";
+ } else {
+ print "A Record added\n";
+ }
Add a new A resource record to $dns. If $redirect is true, $name points
to default address defined in configuration, else, it points on $ip.
Modified: trunk/vhffs-api/src/Vhffs/Panel/Git.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Git.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Git.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -3,31 +3,31 @@
# Copyright (c) 2007 Julien Danjou <julien@xxxxxxxxxxx>
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -48,7 +48,7 @@
=head2 getall_per_group
- $git = Vhffs::Panel::Git::getall_per_group($vhffs, $gid);
+ $git = Vhffs::Panel::Git::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all git repos owned by
a given group.
@@ -83,7 +83,6 @@
return $dbh->selectall_arrayref($sql, { Slice => {} }, $gid, Vhffs::Constants::ACTIVATED);
}
-
sub search_git {
my ($main, $name) = @_;
@@ -105,19 +104,17 @@
return $dbh->selectall_arrayref($sql, { Slice => {} }, @params);
}
-
-
sub create_git {
my ($main, $repo, $description, $user, $group) = @_;
return -1 unless defined $user;
return -2 unless defined $group;
-
+
my $git = Vhffs::Services::Git::create( $main, $repo, $description, $user, $group );
return -1 unless defined $git;
-
+
return -3 if Vhffs::Acl::add_acl( $main, $user, $git, Vhffs::Constants::ACL_DELETE ) < 0;
return -3 if Vhffs::Acl::add_acl( $main, $group, $git, Vhffs::Constants::ACL_VIEW ) < 0;
-
+
return $git;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Group.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Group.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -55,15 +55,13 @@
=head2 getall_users
- $users = Vhffs::Panel::Group::getall_users( $vhffs, $gid );
+ $users = Vhffs::Panel::Group::getall_users( $vhffs, $gid );
Returns an array of hashes {uid, username, state} containing all users of
the given group (C<state> is a descriptive string).
=cut
-
-sub getall_users
-{
+sub getall_users {
my ($main, $gid) = @_;
my $sql = 'SELECT u.uid, u.username, u.firstname, u.lastname, u.mail, ug.state FROM vhffs_users u INNER JOIN vhffs_user_group ug ON ug.uid = u.uid WHERE ug.gid = ?';
my $dbh = $main->get_db_object;
@@ -87,8 +85,7 @@
return fetch_groups_and_users($main, $sql, Vhffs::Constants::ACTIVATED);
}
-sub search_group
-{
+sub search_group {
my ($main, $name) = @_;
my @params;
@@ -114,7 +111,7 @@
sub public_search {
my ($main, $groupname, $description, $included_tags, $excluded_tags, $start) = @_;
- my $sql = ' FROM vhffs_groups g
+ my $sql = ' FROM vhffs_groups g
LEFT OUTER JOIN vhffs_users u ON u.username=g.groupname
INNER JOIN vhffs_object o ON o.object_id=g.object_id
INNER JOIN vhffs_users owner ON owner.uid = o.owner_uid
@@ -122,49 +119,48 @@
my @params;
push @params, Vhffs::Constants::ACTIVATED;
-
+
if($groupname =~ /\S/) {
$sql .= ' AND g.groupname ILIKE ?';
push @params, '%'.$groupname.'%';
}
-
+
if($description =~ /\S/) {
$sql .= ' AND o.description ILIKE ? ';
push @params, '%'.$description.'%';
}
-
+
if(scalar(@$included_tags)) {
$sql .= ' AND o.object_id IN (SELECT ot.object_id from vhffs_object_tag ot WHERE ot.tag_id IN(?';
$sql .= ', ?' x (scalar(@$included_tags) - 1);
$sql .= '))';
push @params, @$included_tags;
}
-
+
if(scalar(@$excluded_tags)) {
$sql .= ' AND o.object_id NOT IN (SELECT ot.object_id from vhffs_object_tag ot WHERE ot.tag_id IN(?';
$sql .= ', ?' x (scalar(@$excluded_tags) - 1);
$sql .= '))';
push @params, @$excluded_tags;
}
-
+
my $limit = ' LIMIT 10';
$limit .= ' OFFSET '.($start * 10) if(defined $start);
-
+
my $select = 'SELECT g.gid, g.groupname, g.realname, o.description, owner.username AS owner_name, o.object_id'.$sql.' ORDER BY groupname '.$limit;
- my $groups = fetch_groups_and_users($main, $select, @params);
+ my $groups = fetch_groups_and_users($main, $select, @params);
my $dbh = $main->get_db_object();
-
+
my $sth = $dbh->prepare('SELECT COUNT(*)'.$sql);
return undef unless ( $sth->execute(@params) );
-
+
my ($count) = $sth->fetchrow_array();
-
+
return ($groups, $count);
}
-sub getall_groups_per_user
-{
+sub getall_groups_per_user {
my ( $user , $main ) = @_;
return undef if ( ! defined $user );
@@ -208,7 +204,7 @@
return undef if ($group->add_user( $user->get_uid ) < 0 );
- return undef if ( Vhffs::Acl::add_acl( $main, $user, $group, Vhffs::Constants::ACL_DELETE ) < 0 );
+ return undef if ( Vhffs::Acl::add_acl( $main, $user, $group, Vhffs::Constants::ACL_DELETE ) < 0 );
return undef if ( Vhffs::Acl::add_acl( $main, $group, $group, Vhffs::Constants::ACL_VIEW ) < 0 );
return $group;
@@ -229,7 +225,7 @@
$sql .= ' AND SUBSTR(g.groupname, 1, 1) = ?';
push @params, $letter;
}
-
+
my $order_clause = ' ORDER BY g.groupname LIMIT '.$count.' OFFSET '.$starting;
return Vhffs::Panel::Commons::fetch_slice_and_count($main, $select_clause, $sql, ' ORDER BY groupname', $starting, $count, \@params, \&Vhffs::Panel::Group::fetch_groups_and_users);
}
@@ -335,12 +331,12 @@
$vars->{realname} = $realname;
$vars->{description} = $description;
- require Vhffs::Tag::Category;
+ require Vhffs::Tag::Category;
my $categories = Vhffs::Tag::Category::get_all($vhffs, Vhffs::Constants::TAG_VISIBILITY_GROUP_CREATION);
foreach my $c (@{$categories}) {
$c->{tags} = Vhffs::Tag::get_by_category_id($vhffs, $c->{category_id});
}
-
+
$vars->{tag_categories} = $categories;
$panel->render('group/create.tt', $vars);
@@ -514,7 +510,7 @@
$vars->{add_user_info} = gettext('User will be added as soon as possible');
} else {
$vars->{add_user_error} = gettext('Unable to add user, he might already be in the group (waiting for addition or deletion)');
- }
+ }
}
}
@@ -602,7 +598,7 @@
my $visibility = ($user->is_admin() ? Vhffs::Constants::TAG_VISIBILITY_ADMINS :
($user->is_moderator() ? Vhffs::Constants::TAG_VISIBILITY_MODERATORS :
- Vhffs::Constants::TAG_VISIBILITY_PUBLIC) );
+ Vhffs::Constants::TAG_VISIBILITY_PUBLIC) );
my $categories = Vhffs::Tag::Category::get_all($vhffs, $visibility);
foreach my $c (@{$categories}) {
@@ -624,27 +620,27 @@
$panel->add_error( gettext( 'You\'re not allowed to do this (ACL rights)' ) );
return 0;
}
-
+
my $tag_id = $cgi->param('tag_id');
-
+
unless(defined $tag_id) {
$panel->add_error( gettext('CGI error') );
return 0;
}
-
+
my $tag = Vhffs::Tag::get_by_tag_id($vhffs, $tag_id);
-
+
unless(defined $tag) {
$panel->add_error( gettext('Tag not found') );
return 0;
}
-
+
if( ($tag->{visibility} >= Vhffs::Constants::TAG_VISIBILITY_ADMINS && !$user->is_admin()) ||
($tag->{visibility} >= Vhffs::Constants::TAG_VISIBILITY_MODERATORS && !$user->is_moderator())) {
$panel->add_error( gettext('You don\'t have enough privileges to add this tag') );
return 0;
}
-
+
if($group->add_tag($tag, $user)) {
$panel->add_info( gettext('Tag added') );
} else {
@@ -663,27 +659,27 @@
$panel->add_error( gettext( 'You\'re not allowed to do this (ACL rights)' ) );
return 0;
}
-
+
my $tag_id = $cgi->param('tag_id');
-
+
unless(defined $tag_id) {
$panel->add_error( gettext('CGI error') );
return 0;
}
-
+
my $tag = Vhffs::Tag::get_by_tag_id($vhffs, $tag_id);
-
+
unless(defined $tag) {
$panel->add_error( gettext('Tag not found') );
return 0;
}
-
+
if( ($tag->{visibility} >= Vhffs::Constants::TAG_VISIBILITY_ADMINS && !$user->is_admin()) ||
($tag->{visibility} >= Vhffs::Constants::TAG_VISIBILITY_MODERATORS && !$user->is_moderator())) {
$panel->add_error( gettext('You don\'t have enough privileges to delete this tag') );
return 0;
}
-
+
if($group->delete_tag($tag, $user)) {
$panel->add_info( gettext('Tag deleted') );
} else {
@@ -702,30 +698,30 @@
$panel->add_error( gettext( 'You\'re not allowed to do this (ACL rights)' ) );
return 0;
}
-
+
my $category_label = $cgi->param('category');
my $tag_label = $cgi->param('tag');
-
+
unless(defined $category_label && defined $tag_label) {
$panel->add_error( gettext('CGI error') );
return 0;
}
-
+
if($category_label =~ /^\s*$/) {
$panel->add_error( gettext('Category can\'t be empty') );
return 0;
}
-
+
if($tag_label =~ /^\s*$/) {
$panel->add_error( gettext('Tag name can\'t be empty') );
return 0;
}
-
+
unless( defined(Vhffs::Tag::Request::create($vhffs, $category_label, $tag_label, $user, $group) ) ) {
$panel->add_error( gettext('An error occured while saving your request') );
return;
}
-
+
$panel->add_info( gettext('Tag request saved, please wait while a moderator approve it') );
}
@@ -740,23 +736,23 @@
$panel->add_error( gettext( 'You\'re not allowed to do this (ACL rights)' ) );
return 0;
}
-
+
my $request_id = $cgi->param('request_id');
-
+
my $request = Vhffs::Tag::Request::get_by_request_id($vhffs, $request_id);
-
+
unless(defined $request) {
$panel->add_error( gettext('Request not found') );
return 0;
}
-
+
if($request->{tagged_id} != $group->get_oid()) {
$panel->add_error( gettext('You can only delete requests attached to your group') );
return 0;
}
-
+
$request->delete();
-
+
$panel->add_info( gettext('Request canceled') );
return 1;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mail.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mail.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -64,14 +64,12 @@
=head2 getall_per_group
- $dns = Vhffs::Panel::Mail::getall_per_group($vhffs, $gid);
+ $dns = Vhffs::Panel::Mail::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all mail domains by
a given group.
=cut
-
-
sub getall_per_group {
my ( $main, $gid ) = @_;
@@ -93,7 +91,7 @@
=head2 is_owned_by_group
- print "Group #$gid owns mail domain $domain\n" if(Vhffs::Panel::Mail::is_owned_by_group( $vhffs, $domain, $gid );
+ print "Group #$gid owns mail domain $domain\n" if(Vhffs::Panel::Mail::is_owned_by_group( $vhffs, $domain, $gid );
Returns true if a given mail domain is owned by a given group (GID), false otherwise.
C<$domain> is a string containing the mail domain name.
@@ -115,7 +113,7 @@
my( $main , $domain , $description, $user , $group ) = @_;
return undef unless defined $user;
return undef unless defined $group;
-
+
my $mail = Vhffs::Services::Mail::create($main, $domain, $description, $user, $group);
return undef unless defined $mail;
@@ -169,7 +167,7 @@
$vars->{domain} = $domain;
$vars->{description} = $description;
}
-
+
$vars->{group} = $group;
$panel->set_title( gettext('Create a mail space') );
$panel->render('mail/create.tt', $vars);
@@ -331,7 +329,7 @@
my $use_antispam = $cgi->param('use_antispam');
my $use_antivirus = $cgi->param('use_antivirus');
my $mail_config = $vhffs->get_config->get_service('mail');
- unless( defined $box and defined $passwd
+ unless( defined $box and defined $passwd
and (not $mail_config->{'use_novirus'} or defined $use_antivirus)
and (not $mail_config->{'use_nospam'} or defined $use_antispam) ) {
$panel->add_error( gettext('CGI Error !') );
Modified: trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -66,14 +66,12 @@
=head2 getall_per_group
- $ml = Vhffs::Panel::MailingList::getall_per_group($vhffs, $gid);
+ $ml = Vhffs::Panel::MailingList::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all mailing lists owned by
a given group.
=cut
-
-
sub getall_per_group {
my ( $main, $gid ) = @_;
@@ -103,7 +101,7 @@
=head2 getall_mdomains_per_group
- $domains = Vhffs::Panel::MailingList::getall_mdomains_per_group($vhffs, $gid);
+ $domains = Vhffs::Panel::MailingList::getall_mdomains_per_group($vhffs, $gid);
Returns an array of hashref (domain) of all active mail domains for
a given group.
@@ -118,18 +116,17 @@
return ($dbh->selectall_arrayref($sql, { Slice => {} }, $gid, Vhffs::Constants::ACTIVATED) );
}
-sub create_list
-{
+sub create_list {
my ($main, $lpart, $domain, $description, $user, $group) = @_;
return undef unless defined $user;
- return undef unless defined $group;
-
+ return undef unless defined $group;
+
my $list = Vhffs::Services::MailingList::create( $main , $lpart , $domain, $description, $user, $group );
return undef unless defined $list;
-
+
return undef if Vhffs::Acl::add_acl( $main, $user, $list, Vhffs::Constants::ACL_DELETE ) < 0;
- return undef if Vhffs::Acl::add_acl( $main, $group, $list, Vhffs::Constants::ACL_VIEW ) < 0;
-
+ return undef if Vhffs::Acl::add_acl( $main, $group, $list, Vhffs::Constants::ACL_VIEW ) < 0;
+
return $list;
}
@@ -160,7 +157,7 @@
my $domain = '';
my $description = '';
my $vars = {};
-
+
if( $submitted ) {
$localpart = $cgi->param( 'localpart' );
$domain = $cgi->param( 'domain' );
@@ -242,7 +239,7 @@
} elsif(defined $cgi->param('add_members_submit')) {
add_members($panel, $list);
}
-
+
my $vars = { list => $list };
$vars->{group_emails} = join("\n", map { $_->{mail} } @{$group->get_users});
Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -42,7 +42,7 @@
=head2 check_public
- $panel->check_public;
+ $panel->check_public;
Checks that public area is available, if it's not the case show a message and returns.
@@ -56,7 +56,7 @@
=head2 is_open
- $panel->is_open;
+ $panel->is_open;
Return 1 if panel is open, else return 0
@@ -70,7 +70,7 @@
=head2 is_public
- $panel->is_public;
+ $panel->is_public;
Return 1 if public part is enabled, else return 0
@@ -84,7 +84,7 @@
=head2 use_avatars
- $panel->use_avatars;
+ $panel->use_avatars;
Return 1 if either or both users or groups avatars are enabled, else return 0
@@ -98,7 +98,7 @@
=head2 use_users_avatars
- $panel->use_users_avatars;
+ $panel->use_users_avatars;
Return 1 if users avatars are enabled, else return 0
@@ -112,7 +112,7 @@
=head2 use_groups_avatars
- $panel->use_groups_avatars;
+ $panel->use_groups_avatars;
Return 1 if groups avatars are enabled, else return 0
@@ -127,7 +127,7 @@
=head2 check_modo
- $panel->check_modo
+ $panel->check_modo
Checks that logged in user is admin or moderator. If it is
not the case, show a message and returns.
@@ -148,7 +148,7 @@
=head2
- $panel->check_admin
+ $panel->check_admin
Check that logged in user is an admin. If it is not
the case, show a message and returns.
@@ -172,7 +172,7 @@
return -1 unless defined $vhffs;
my @themes;
-
+
my $dir = $vhffs->get_config->get_panel->{'themesdir'};
return undef unless defined $dir;
@@ -493,7 +493,7 @@
};
}
}
-
+
my $template = new Template($create_vars);
my $http_accept = ( $cgi->http('HTTP_ACCEPT') or '' );
@@ -512,7 +512,7 @@
=head2 redirect
- $panel->redirect($page, $cookies);
+ $panel->redirect($page, $cookies);
Issues a redirection header sending to $page
(you can specify additional cookies to be sent).
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mercurial.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mercurial.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mercurial.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -48,14 +48,12 @@
=head2 getall_per_group
- $mercurial = Vhffs::Panel::Mercurial::getall_per_group($vhffs, $gid);
+ $mercurial = Vhffs::Panel::Mercurial::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all mercurial repos owned by
a given group.
=cut
-
-
sub getall_per_group {
my ( $main, $gid ) = @_;
@@ -80,7 +78,7 @@
my $dbh = $main->get_db_object;
my $sql = 'SELECT g.reponame, o.description FROM vhffs_mercurial g INNER JOIN vhffs_object o ON o.object_id = g.object_id '.
'WHERE '.($public_only ? 'public = 1 AND ' : '').'o.owner_gid = ? AND o.state = ?';
- return $dbh->selectall_arrayref($sql, { Slice => {} }, $gid, Vhffs::Constants::ACTIVATED);
+ return $dbh->selectall_arrayref($sql, { Slice => {} }, $gid, Vhffs::Constants::ACTIVATED);
}
@@ -111,13 +109,13 @@
my ($main, $repo, $description, $user, $group) = @_;
return -1 unless defined $user;
return -2 unless defined $group;
-
- my $mercurial = Vhffs::Services::Mercurial::create( $main, $repo, $description, $user, $group );
+
+ my $mercurial = Vhffs::Services::Mercurial::create( $main, $repo, $description, $user, $group );
return -1 unless defined $mercurial;
return -3 if Vhffs::Acl::add_acl( $main, $user, $mercurial, Vhffs::Constants::ACL_DELETE ) < 0;
return -3 if Vhffs::Acl::add_acl( $main, $group, $mercurial, Vhffs::Constants::ACL_VIEW ) < 0;
-
+
return $mercurial;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -53,8 +53,8 @@
sub search_mysql {
- my ($main, $name) = @_;
-
+ my ($main, $name) = @_;
+
my @params;
my $sql = 'SELECT m.dbname as label, g.groupname as owner_group, o.state, u.username as owner_user '.
'FROM vhffs_mysql m '.
@@ -76,7 +76,7 @@
sub create_mysql($$$$$$$) {
my( $main , $dbname , $user , $group , $dbuser, $dbpass, $description ) = @_;
return undef unless defined $user and defined $group;
-
+
my $mysql = Vhffs::Services::Mysql::create($main, $dbname, $dbuser, $dbpass, $description, $user, $group);
return undef unless defined $mysql;
@@ -90,7 +90,7 @@
=head2 getall_per_group
- $mysql = Vhffs::Panel::Mysql::getall_per_group($vhffs, $gid);
+ $mysql = Vhffs::Panel::Mysql::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all MySQL DBs owned by
a given group.
@@ -195,7 +195,7 @@
$panel->render('misc/message.tt', { message => gettext( 'You\'re not allowed to do this, object is not in active state or you don\'t have enough ACL rights' ) } );
return;
}
-
+
if(defined $cgi->param('save_prefs_submit')) {
return if save_prefs($panel, $mysql);
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -68,7 +68,7 @@
=head2 getall_per_group
- $pgsql = Vhffs::Panel::Postgres::getall_per_group($vhffs, $gid);
+ $pgsql = Vhffs::Panel::Postgres::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all PgSQL DBs owned by
a given group.
@@ -97,10 +97,10 @@
my( $main , $dbname , $user , $group , $dbuser , $dbpass, $description ) = @_;
return -1 unless defined $user;
return -2 unless defined $group;
-
+
my $pgsql = Vhffs::Services::Pgsql::create($main, $dbname, $dbuser, $dbpass, $description, $user, $group);
return undef unless defined $pgsql;
-
+
return undef if Vhffs::Acl::add_acl( $main, $user, $pgsql, Vhffs::Constants::ACL_DELETE ) < 0;
return undef if Vhffs::Acl::add_acl( $main, $group, $pgsql, Vhffs::Constants::ACL_VIEW ) < 0;
return $pgsql;
@@ -185,7 +185,7 @@
$panel->render('misc/message.tt', { message => gettext( 'You\'re not allowed to do this, object is not in active state or you don\'t have enough ACL rights' ) } );
return;
}
-
+
if(defined $cgi->param('save_prefs_submit')) {
return if save_prefs($panel, $pgsql);
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Public.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Public.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Public.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -70,9 +70,9 @@
my ($self, $file, $vars) = @_;
my $vhffs = $self->{vhffs};
my $conf = $vhffs->get_config;
-
+
$vars = {} unless(defined $vars);
-
+
$vars->{left} = 'parts/left-menu.tt' unless(defined $vars->{left});
$vars->{right} = 'parts/tags-cloud.tt' unless(defined $vars->{right});
$vars->{top} = 'parts/top-menu.tt' unless(defined $vars->{top});
@@ -87,7 +87,7 @@
$vars->{random_tags} = Vhffs::Tag::get_random_tags($self->{vhffs});
}
}
-
+
$self->SUPER::render($file, $vars, 'public.tt', 'public');
}
@@ -187,29 +187,29 @@
});
exit(0);
}
-
+
my $group = Vhffs::Group::get_by_groupname($panel->{vhffs}, $groupname);
-
+
unless(defined $group) {
$panel->render('common/error.tt', {
message => gettext('Group not found')
});
exit(0);
}
-
- my $tag_categories = $group->get_tags(Vhffs::Constants::TAG_VISIBILITY_PUBLIC);
-
+
+ my $tag_categories = $group->get_tags(Vhffs::Constants::TAG_VISIBILITY_PUBLIC);
+
my $vars = {
group => $group,
tag_categories => $tag_categories
};
-
+
# Services filling... Really boring
if( $config->get_service_availability('web') == 1 ) {
use Vhffs::Panel::Web;
$vars->{websites} = Vhffs::Panel::Web::get_websites_per_group($vhffs, $group->get_gid);
}
-
+
if( $vhffs->get_config->get_service_availability('cvs') == 1 ) {
use Vhffs::Panel::Cvs;
$vars->{cvs} = {
@@ -217,7 +217,7 @@
repositories => Vhffs::Panel::Cvs::get_repos_per_group($vhffs, $group->get_gid )
};
}
-
+
if( $vhffs->get_config->get_service_availability('svn') == 1 ) {
use Vhffs::Panel::Svn;
$vars->{svn} = {
@@ -225,7 +225,7 @@
repositories => Vhffs::Panel::Svn::get_repos_per_group($vhffs, $group->get_gid )
};
}
-
+
if( $vhffs->get_config->get_service_availability('git') == 1 ) {
use Vhffs::Panel::Git;
$vars->{git} = {
@@ -233,7 +233,7 @@
repositories => Vhffs::Panel::Git::get_repos_per_group($vhffs, $group->get_gid )
};
}
-
+
if( $vhffs->get_config->get_service_availability('mercurial') == 1 ) {
use Vhffs::Panel::Mercurial;
$vars->{mercurial} = {
@@ -241,8 +241,7 @@
repositories => Vhffs::Panel::Mercurial::get_repos_per_group($vhffs, $group->get_gid )
};
}
-
-
+
if( $vhffs->get_config->get_service_availability('mailinglist') == 1 ) {
use Vhffs::Panel::MailingList;;
$vars->{ml} = {
@@ -250,7 +249,7 @@
lists => Vhffs::Panel::MailingList::get_lists_per_group($vhffs, $group->get_gid )
};
}
-
+
$panel->render('content/group-details.tt', $vars);
}
@@ -404,84 +403,84 @@
sub externstats {
my $panel = shift;
my $vhffs = $panel->{vhffs};
-
+
my $stats = $vhffs->get_stats;
return unless defined $stats;
-
+
my $output = '';
-
+
$output .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
$output .= '<stats>'."\n";
-
+
$output .= '<users>'."\n";
$output .= ' <total>'.$stats->get_user_total.'</total>'."\n";
$output .= '</users>'."\n";
-
+
$output .= '<groups>'."\n";
$output .= ' <total>'.$stats->get_groups_total.'</total>'."\n";
$output .= ' <activated>'.$stats->get_groups_activated.'</activated>'."\n";
$output .= '</groups>'."\n";
-
+
$output .= '<service name="web">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_web_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_web_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="mysql">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_mysql_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_mysql_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="pgsql">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_pgsql_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_pgsql_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="cvs">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_cvs_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_cvs_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="svn">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_svn_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_svn_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="git">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_git_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_git_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="mercurial">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_mercurial_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_mercurial_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="bazaar">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_bazaar_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_bazaar_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="mail">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_mail_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_mail_activated.'</activated>'."\n";
$output .= ' <boxes>'.$stats->get_mail_total_boxes.'</boxes>'."\n";
$output .= ' <forwards>'.$stats->get_mail_total_forwards.'</forwards>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="mailinglist">'."\n";
$output .= ' <total>'.$stats->get_lists_total.'</total>'."\n";
$output .= ' <activated>'.$stats->get_lists_activated.'</activated>'."\n";
$output .= ' <subscriptions>'.$stats->get_lists_totalsubs.'</subscriptions>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '<service name="dns">'."\n";
$output .= ' <awaitingmoderation>'.$stats->get_dns_in_moderation.'</awaitingmoderation>'."\n";
$output .= ' <activated>'.$stats->get_dns_activated.'</activated>'."\n";
$output .= '</service>'."\n";
-
+
$output .= '</stats>'."\n";
-
+
print Encode::encode_utf8( 'Content-Type: text/xml; charset=utf-8'."\n\n".$output );
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Repository.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Repository.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -45,7 +45,7 @@
=head2 getall_per_group
- $repos = Vhffs::Panel::Repository::getall_per_group($vhffs, $gid);
+ $repos = Vhffs::Panel::Repository::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all download
repositories owned by a given group.
@@ -202,7 +202,7 @@
$panel->add_error( gettext('Invalid quota') );
return;
}
-
+
$repo->set_quota($quota);
if($repo->commit < 0) {
Modified: trunk/vhffs-api/src/Vhffs/Panel/Subscribe.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Subscribe.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Subscribe.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -80,7 +80,7 @@
my $address = Encode::decode_utf8( $cgi->param('address') );
my $newslettercheckbox = $cgi->param('newsletter');
$newslettercheckbox = ( defined $newslettercheckbox and $newslettercheckbox eq 'on' );
-
+
if( $usecaptcha ) {
my $captcha = new Captcha::reCAPTCHA();
my $challenge = $cgi->param('recaptcha_challenge_field');
@@ -89,7 +89,7 @@
my $result = $captcha->check_answer( $captcha_privkey, $ENV{REMOTE_ADDR}, $challenge, $response);
$panel->add_error( gettext('Codes do not match')) unless $result->{is_valid};
}
-
+
$panel->add_error( gettext('You must declare your username') ) unless defined $username;
$panel->add_error( gettext('Invalid username, it must contain between 3 and 12 alphanumeric characters, all in lowercase') ) unless Vhffs::User::check_username($username);
$panel->add_error( gettext('You must declare your country') ) unless defined $country;
@@ -104,30 +104,30 @@
$panel->add_error( gettext('Please enter a correct lastname') ) unless defined $lastname and $lastname =~ /^[^<>"]+$/;
$panel->add_error( gettext('Please enter a correct city') ) unless defined $city and $city =~ /^[^<>"]+$/;
$panel->add_error( gettext('Please enter a correct country') ) unless defined $country and $country !~ /^[<>"]+$/;
-
+
unless( $panel->has_errors ) {
- my $user = Vhffs::User::create( $vhffs, $username, Vhffs::Functions::generate_random_password(),
+ my $user = Vhffs::User::create( $vhffs, $username, Vhffs::Functions::generate_random_password(),
0, $mail, $firstname, $lastname, $city, $zipcode, $country, $address, '');
-
+
unless( defined $user ) {
$panel->add_error( gettext('Cannot create user, the username you entered already exists') );
}
else {
#We set informations user fill in the form
$user->set_status( Vhffs::Constants::WAITING_FOR_CREATION );
-
+
#Commit all the changes for the current user
if( $user->commit < 0 ) {
$panel->add_error( gettext('Cannot apply changes to the user') );
}
else {
Vhffs::Acl::add_acl( $vhffs, $user, $user, Vhffs::Constants::ACL_DELETE );
-
+
# Newsletter
if( $vhffs->get_config->get_service_availability('newsletter') ) {
require Vhffs::Services::Newsletter;
my $newsletter = new Vhffs::Services::Newsletter( $vhffs , $user );
- if( defined $newsletter and (
+ if( defined $newsletter and (
( $newsletter->get_collectmode == Vhffs::Services::Newsletter::ACTIVE_OPTIN && $newslettercheckbox )
or ( $newsletter->get_collectmode == Vhffs::Services::Newsletter::PASSIVE_OPTIN && $newslettercheckbox )
or ( $newsletter->get_collectmode == Vhffs::Services::Newsletter::ACTIVE_OPTOUT && !$newslettercheckbox )
@@ -155,16 +155,16 @@
$vars->{newsletter_checked} = $newslettercheckbox;
}
}
-
+
if( not defined $submitted or $panel->has_errors ) {
$vars->{captcha_pubkey} = $captcha_pubkey if $usecaptcha;
-
+
if( $vhffs->get_config->get_service_availability('newsletter') ) {
my $conf = $vhffs->get_config->get_service('newsletter');
$vars->{newsletter} = { prompt => ($conf->{'collectmode'} eq 'active_optout' ? gettext('Don\'t subscribe to the newsletter') : gettext('Subscribe to the newsletter') ) } if $conf->{'collectmode'} ne 'passive_optout' and $conf->{'collectmode'} ne 'permanent';
$vars->{newsletter_checked} = 1 if $conf->{'collectmode'} eq 'passive_optin' and not defined $submitted;
}
-
+
$panel->render('anonymous/subscribe.tt', $vars, 'anonymous.tt');
}
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Svn.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Svn.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -48,16 +48,13 @@
=head2 getall_per_group
- $svn = Vhffs::Panel::Svn::getall_per_group($vhffs, $gid);
+ $svn = Vhffs::Panel::Svn::getall_per_group($vhffs, $gid);
Returns an array of hashrefs (oid, displayname, active, state (localized string)) of all SVN repos owned by
a given group.
=cut
-
-
-sub getall_per_group
-{
+sub getall_per_group {
my ( $main, $gid ) = @_;
my $dbh = $main->get_db_object;
@@ -111,13 +108,13 @@
my ($main, $repo, $description, $user, $group) = @_;
return -1 unless defined $user;
return -2 unless defined $group;
-
+
my $svn = Vhffs::Services::Svn::create( $main, $repo, $description, $user, $group );
return -1 unless defined $svn;
-
+
return -3 if Vhffs::Acl::add_acl( $main, $user, $svn, Vhffs::Constants::ACL_DELETE ) < 0;
return -3 if Vhffs::Acl::add_acl( $main, $group, $svn, Vhffs::Constants::ACL_VIEW ) < 0;
-
+
return $svn;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Tag.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Tag.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Tag.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -40,7 +40,7 @@
use Vhffs::Constants;
use Vhffs::Panel::Group;
require Vhffs::Tag;
-require Vhffs::Tag::Category;
+require Vhffs::Tag::Category;
require Vhffs::Tag::Request;
=head1 NAME
@@ -89,7 +89,7 @@
return undef unless ( $sth->execute(@params) );
my ($count) = $sth->fetchrow_array();
-
+
return ($groups, $count);
}
@@ -102,7 +102,6 @@
=cut
sub get_by_tag_ids {
-
my $main = shift;
my @ids = @_;
return _get_by_tag_ids($main, 0, @ids);
@@ -118,16 +117,16 @@
my $main = shift;
my $exclude = shift;
my @ids = @_;
-
+
# There can be no ID if we are in exclude mode (meaning
# that we want all tags)
-
+
return undef unless($exclude || scalar(@ids) > 0);
-
+
my $sql = 'SELECT c.tag_category_id AS category_id, c.label AS category_label, t.tag_id, t.label AS tag_label '.
'FROM vhffs_tag t INNER JOIN vhffs_tag_category c ON c.tag_category_id = t.category_id '.
'WHERE c.visibility = '.Vhffs::Constants::TAG_VISIBILITY_PUBLIC;
-
+
if(scalar(@ids)) {
$sql .= ' AND tag_id '.($exclude ? 'NOT ' : '').'IN(?';
$sql .= ', ?' x (scalar(@ids) - 1);
@@ -177,34 +176,34 @@
$panel->add_error( gettext('CGI Error!') );
return 0;
}
-
+
if($category_id !~ /^\d+$/) {
$panel->add_error( gettext('Invalid category') );
return 0;
}
-
+
if($label =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a label') );
return 0;
}
-
+
if($description =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a description') );
return 0;
}
-
+
my $category = Vhffs::Tag::Category::get_by_category_id($main, $category_id);
-
+
unless(defined $category) {
$panel->add_error( gettext('Category does not exists') );
return 0;
}
-
+
unless(defined Vhffs::Tag::create($main, $label, $description, $panel->{user}, $category)) {
$panel->add_error( gettext('Unable to create tag') );
return 0;
}
-
+
return 1;
}
@@ -249,17 +248,17 @@
$vars->{label} = $label;
$vars->{description} = $description;
$vars->{visibility} = $visibility;
-
+
unless( defined $label and defined $description and defined $visibility ) {
$panel->add_error( gettext('CGI error') );
return 0;
}
-
+
if($label =~ /^\s*$/ || $description =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a label and a description for the category') );
return 0;
}
-
+
if(!defined Vhffs::Tag::Category::create($vhffs, $label, $description, $visibility, $panel->{user})) {
$panel->add_error( gettext('Unable to create category') );
return 0;
@@ -299,7 +298,7 @@
my $tag_id = $cgi->param('tag_id');
my $tag = Vhffs::Tag::get_by_tag_id($vhffs, $tag_id);
return 0 unless defined $tag;
-
+
return $tag->delete();
}
@@ -335,7 +334,7 @@
my $category_id = $cgi->param('category_id');
my $category = Vhffs::Tag::Category::get_by_category_id($panel->{vhffs}, $category_id);
return 0 unless defined $category;
-
+
return $category->delete();
}
@@ -413,28 +412,28 @@
my $label = $cgi->param('label');
my $description = $cgi->param('description');
my $category_id = $cgi->param('category_id');
-
+
unless( defined $tag_id and defined $label and defined $description and defined $category_id ) {
$panel->add_error( gettext('CGI error') );
return 0;
}
-
+
if($label =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a label') );
}
-
+
if($description =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a description') );
}
-
+
if($category_id !~ /^\d+$/) {
$panel->add_error( gettext('Invalid category') );
}
-
+
if($panel->has_errors()) {
return 0;
}
-
+
$tag->{label} = $label;
$tag->{description} = $description;
$tag->{category_id} = $category_id;
@@ -493,28 +492,28 @@
my $label = $cgi->param('label');
my $description = $cgi->param('description');
my $visibility = $cgi->param('visibility');
-
- if(!(defined $label && defined $description && defined $visibility)) {
+
+ unless( defined $label and defined $description and defined $visibility ) {
$panel->add_error( gettext('CGI error') );
return 0;
}
-
+
if($label =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a label') );
}
-
+
if($description =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a description') );
}
-
+
if($visibility !~ /^\d+$/) {
$panel->add_error( gettext('Invalid visibility') );
}
-
+
if($panel->has_errors()) {
return 0;
}
-
+
$category->{label} = $label;
$category->{description} = $description;
$category->{visibility} = $visibility;
@@ -534,7 +533,7 @@
my $request_id;
my $vars = {};
-
+
unless(defined ($request_id = $cgi->param('request_id'))) {
$panel->render('misc/message.tt', {
message => gettext('CGI Error'),
@@ -542,9 +541,9 @@
});
return;
}
-
+
my $request;
-
+
unless(defined ($request = Vhffs::Tag::Request::get_by_request_id($vhffs, $request_id))) {
$panel->render('misc/message.tt', {
message => gettext('Tag request not found'),
@@ -552,7 +551,7 @@
});
return;
}
-
+
if(defined $cgi->param('accept_request_submit')) {
if(_accept_request( $panel, $request )) {
$panel->render('misc/message.tt', {
@@ -576,22 +575,21 @@
});
return;
}
-
+
$panel->set_title( gettext('Tag request details') );
-
+
my $category_id = $cgi->param('category');
-
+
if(defined $category_id) {
$vars->{category_tags} = Vhffs::Tag::get_by_category_id($vhffs, $category_id);
$vars->{selected_category} = $category_id;
}
$vars->{categories} = Vhffs::Tag::Category::get_all($vhffs);
$vars->{request} = $request;
-
+
$panel->render('admin/tag/request/details.tt', $vars);
}
-
sub _accept_request {
my $panel = shift;
my $request = shift;
@@ -604,37 +602,37 @@
my $tag_label = $cgi->param('tag_label');
my $category_description = $cgi->param('category_description');
my $tag_description = $cgi->param('tag_description');
-
- unless(defined $category_id && defined $category_label && defined $category_description
- && defined $tag_id && defined $tag_label && defined $tag_description) {
+
+ unless(defined $category_id and defined $category_label and defined $category_description
+ and defined $tag_id and defined $tag_label and defined $tag_description) {
$panel->add_error(gettext('CGI Error'));
return 0;
}
-
+
my $category;
my $tag;
-
+
if($category_id < 0) {
if($tag_id > 0) {
$panel->add_error( gettext('If you want to create a new category, you have to create a new tag too') );
return 0;
}
-
+
if($category_label =~ /^\s*$/ || $category_description =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a label and a description for the category') );
return 0;
}
-
+
if($tag_label =~ /^\s*$/ || $tag_description =~ /^\s*$/) {
$panel->add_error( gettext('You have to enter a label and a description for the tag') );
return 0;
}
-
+
unless(defined ($category = Vhffs::Tag::Category::create($vhffs, $category_label, $category_description, Vhffs::Constants::TAG_VISIBILITY_PUBLIC, $panel->{user}) ) ) {
$panel->add_error( gettext('Unable to create category') );
return 0;
}
-
+
unless(defined ($tag = Vhffs::Tag::create($vhffs, $tag_label, $tag_description, $panel->{user}, $category) ) ) {
$panel->add_error( gettext('Unable to create tag') );
$category->delete();
@@ -646,7 +644,7 @@
$panel->add_error( gettext('Category not found') );
return 0;
}
-
+
if($tag_id > 0) {
$tag = Vhffs::Tag::get_by_tag_id($vhffs, $tag_id);
unless( defined($tag) ) {
@@ -658,28 +656,28 @@
$panel->add_error( gettext('You have to enter a label and a description for the tag') );
return 0;
}
-
+
$tag = Vhffs::Tag::create($vhffs, $tag_label, $tag_description, $panel->{user}, $category);
-
+
unless(defined $tag) {
$panel->add_error( gettext('Unable to create tag') );
return 0;
}
}
}
-
+
# Adds the tag to the object for which it has
# been requested.
-
+
my $object = $request->get_tagged();
if(defined $object) {
my $user = $request->get_requester();
$user = $panel->{user} unless(defined $user);
$object->add_tag($tag, $user);
}
-
+
$request->delete();
-
+
return 1;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/User.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/User.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/User.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -94,15 +94,15 @@
'FROM vhffs_users u '.
'INNER JOIN vhffs_object o ON o.object_id=u.object_id '.
'WHERE o.state=? ORDER BY o.date_creation DESC LIMIT 10';
-
+
my $dbh = $main->get_db_object();
-
+
my $users = $dbh->selectall_hashref($sql, 'uid', undef, Vhffs::Constants::ACTIVATED);
-
+
fill_groups($main, $users);
-
+
my @val = values(%$users);
-
+
return \@val;
}
@@ -127,7 +127,7 @@
=head2 public_search
- $users = Vhffs::Panel::User::public_search($vhffs, $username, $start);
+ $users = Vhffs::Panel::User::public_search($vhffs, $username, $start);
Returns all users whose username contains C<$username>.
@@ -138,7 +138,7 @@
my $result = {};
my $select_clause = 'SELECT u.uid, u.username, u.firstname, u.lastname ';
- my $sql =
+ my $sql =
'FROM vhffs_users u '.
'INNER JOIN vhffs_object o ON o.object_id = u.object_id '.
'WHERE o.state = ? ';
@@ -152,21 +152,21 @@
}
my $limit = ' LIMIT 10';
- $limit .= ' OFFSET '.($start * 10) if(defined $start);
-
+ $limit .= ' OFFSET '.($start * 10) if(defined $start);
+
my $dbh = $main->get_db_object();
-
+
my $users = $dbh->selectall_hashref($select_clause.$sql.' ORDER BY u.username '.$limit, 'uid', undef, @params);
-
+
my ($count) = $dbh->selectrow_array('SELECT COUNT(*) '.$sql, undef, @params);
-
+
fill_groups($main, $users);
-
+
my @val = values(%$users);
-
+
# We've to sort manualy since we use a hash
@val = sort { $a->{username} cmp $b->{username}} @val;
-
+
return (\@val, $count);
}
@@ -179,28 +179,27 @@
C<groups> containing the names of the groups the user belongs
to.
-=cut
-
+=cut
sub fill_groups {
my ($main, $users) =@_;
-
+
my $dbh = $main->get_db_object();
my @uids = ();
-
+
foreach my $uid(keys(%$users)) {
push @uids, $uid;
}
-
+
# Fetch all groups in one shot
my $sql = 'SELECT g.groupname, u.uid FROM vhffs_groups g '.
'INNER JOIN vhffs_user_group ug ON ug.gid = g.gid '.
'INNER JOIN vhffs_users u ON u.uid = ug.uid '.
'WHERE g.groupname != u.username AND u.uid IN ( '.join(', ', @uids).') '.
'ORDER BY g.groupname';
-
+
my $groups = $dbh->selectall_arrayref($sql, { Slice => {}});
my $i = 0;
-
+
foreach my $g(@$groups) {
$users->{$g->{uid}}{groups} = [] unless exists $users->{$g->{uid}}{groups};
push(@{$users->{$g->{uid}}{groups}}, $g->{groupname});
@@ -298,8 +297,8 @@
=head2 get_groups
- my $groups = Vhffs::Panel::User::get_groups($user);
- print $groups->[0]->{project};
+ my $groups = Vhffs::Panel::User::get_groups($user);
+ rint $groups->[0]->{project};
Returns an array reference which contains all the groupname for
a given user whose uid is C<$uid>.
@@ -313,7 +312,7 @@
my $user = shift;
my $relation = shift;
my @params;
-
+
my $groups = [];
my $sql;
push @params, $user->get_uid;
@@ -435,7 +434,7 @@
$userp->set_address( $address );
$userp->set_shell( $shell );
- if( length( $pass1 ) > 1 and $pass1 eq $pass2 ) {
+ if( length( $pass1 ) > 1 and $pass1 eq $pass2 ) {
$pwd_change = 1;
$userp->set_password( $pass1 );
$panel->add_info( gettext('Password changed') );
@@ -466,13 +465,13 @@
# -- Mail User
my $mu = new Vhffs::Services::MailUser( $vhffs , $userp );
if( defined $mu ) {
-
+
my $mail_activate = $cgi->param( 'mail_activate' );
my $nospam = $cgi->param( 'mail_nospam' );
my $novirus = $cgi->param( 'mail_novirus' );
$nospam = ( defined $nospam and $nospam eq 'on' );
$novirus = ( defined $novirus and $novirus eq 'on' );
-
+
if( defined $mail_activate and $mail_activate eq 'on' ) {
my $usage = $cgi->param( 'mail_usage' );
unless( defined $usage ) {
@@ -625,7 +624,7 @@
if( $userp->have_activegroups ) {
my @shells = Vhffs::Panel::User::list_shells( $vhffs );
$vars->{shells} = \@shells;
- $vars->{current_shell} = Vhffs::Panel::User::get_shell( $userp );
+ $vars->{current_shell} = Vhffs::Panel::User::get_shell( $userp );
} else {
$vars->{shells} = [ Vhffs::Panel::User::default_shell( $vhffs ) ];
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Web.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Panel/Web.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -53,7 +53,7 @@
=head2 get_all_per_group
- my $areas = Vhffs::Panel::Web::getall_per_group($vhffs, $main);
+ my $areas = Vhffs::Panel::Web::getall_per_group($vhffs, $main);
Returns an array of hashrefs (oid, display, active, state) of all webareas owned by
a given group.
@@ -97,7 +97,7 @@
my @params;
my $webs = [];
- my $sql = 'SELECT w.servername as label, o.state, g.groupname as owner_group, u.username as owner_user '.
+ my $sql = 'SELECT w.servername as label, o.state, g.groupname as owner_group, u.username as owner_user '.
'FROM vhffs_httpd w '.
'INNER JOIN vhffs_object o ON o.object_id = w.object_id '.
'INNER JOIN vhffs_groups g ON g.gid = o.owner_gid '.
@@ -136,18 +136,18 @@
sub create_web {
- my( $main, $servername, $description, $user, $group ) = @_;
+ my( $main, $servername, $description, $user, $group ) = @_;
- return undef unless defined $user;
- return undef unless defined $group;
+ return undef unless defined $user;
+ return undef unless defined $group;
- my $web = Vhffs::Services::Web::create($main, $servername, $description, $user, $group);
+ my $web = Vhffs::Services::Web::create($main, $servername, $description, $user, $group);
return undef unless defined $web;
- return undef if Vhffs::Acl::add_acl( $main, $user, $web, Vhffs::Constants::ACL_DELETE ) < 0;
- return undef if Vhffs::Acl::add_acl( $main, $group, $web, Vhffs::Constants::ACL_VIEW ) < 0;
+ return undef if Vhffs::Acl::add_acl( $main, $user, $web, Vhffs::Constants::ACL_DELETE ) < 0;
+ return undef if Vhffs::Acl::add_acl( $main, $group, $web, Vhffs::Constants::ACL_VIEW ) < 0;
- return $web;
+ return $web;
}
sub get_websites_starting_with {
@@ -205,7 +205,7 @@
$description = Encode::decode_utf8( $cgi->param('description') );
unless( defined $servername and defined $description ) {
$panel->add_error( gettext('CGI Error !') );
- } else {
+ } else {
$panel->add_error( gettext('Invalid servername (doesn\'t conform to domain names rules)') ) unless Vhffs::Functions::check_domain_name($servername);
$panel->add_error( gettext('You must enter a description') ) unless defined $description and $description !~ /^\s*$/;
}
@@ -333,7 +333,7 @@
$panel->render( 'misc/message.tt', { message => gettext('Unable to get webareas') } );
return;
}
-
+
$panel->render( 'misc/service-index.tt', {
label => 'Webareas',
group => $group,
Modified: trunk/vhffs-api/src/Vhffs/Robots/Bazaar.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Bazaar.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Bazaar.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Cron.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Cron.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Cron.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Cvs.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Cvs.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
package Vhffs::Robots::Cvs;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Git.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Git.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Git.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -3,31 +3,31 @@
# Copyright (c) 2007 Julien Danjou <julien@xxxxxxxxxxx>
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Group.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Group.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -83,7 +83,7 @@
=head2 getall_user_group_to_delete
- my $quits = Vhffs::Robots::Group::getall_user_group_to_delete($main);
+ my $quits = Vhffs::Robots::Group::getall_user_group_to_delete($main);
Returns an array ref containing all users to delete from a group. Each rows is
itself an array ref wich contains group id from which user should be deleted
@@ -107,7 +107,7 @@
=head2 getall_user_group_to_delete
- my $joins = Vhffs::Robots::Group::getall_user_group_to_create($main);
+ my $joins = Vhffs::Robots::Group::getall_user_group_to_create($main);
Returns an array ref containing all users to add to a group. Each rows is
itself an array ref wich contains group id to which user should be added
@@ -153,7 +153,7 @@
my $user = shift;
my $group = shift;
my $main = shift;
-
+
return -1 if( ! defined $user );
return -1 if( ! defined $group );
@@ -168,7 +168,7 @@
my $query = "UPDATE vhffs_user_group SET state='".Vhffs::Constants::ACTIVATED."' WHERE uid='".$user->get_uid."' AND gid='".$group->get_gid."'";
my $request = $main->{'db'}->prepare( $query ) or return -2;
$request->execute;
-
+
return 1;
}
Modified: trunk/vhffs-api/src/Vhffs/Robots/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Mail.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Mail.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Mailing.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Mailing.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Mailing.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Mercurial.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Mercurial.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Mercurial.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -115,15 +115,15 @@
$mercurial->add_history("Can't read the configuration template file. This is wrong, very wrong.");
return -1;
}
-
+
while( my $line = <$rcfilein> )
{
$line =~ s/MY_MLADDRESS/$mladdress/g;
$line =~ s/MY_FROMADDRESS/$mail_from/g;
-
+
print $rcfileout $line;
}
-
+
close( $rcfilein );
}
Modified: trunk/vhffs-api/src/Vhffs/Robots/Mysql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Mysql.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Mysql.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
@@ -44,8 +44,7 @@
use Vhffs::Robots;
-sub mysql_admin_db_connect
-{
+sub mysql_admin_db_connect {
use DBI;
my $vhffs = shift;
my $mysqlconfig = $vhffs->get_config->get_service('mysql');
@@ -57,8 +56,7 @@
}
# TODO - rework that ...
-sub delete_db
-{
+sub delete_db {
my $main = shift;
my $db = shift;
return unless defined $db;
@@ -102,10 +100,7 @@
$db->delete;
}
-
-
-sub create_db
-{
+sub create_db {
my $main = shift;
my $db = shift;
return unless defined $db;
@@ -133,10 +128,7 @@
$db->blank_password;
}
-
-
-sub update_db
-{
+sub update_db {
my $main = shift;
my $db = shift;
return unless defined $db;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Pgsql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Pgsql.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Pgsql.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -62,7 +62,7 @@
my $pg = shift;
my $db = pgsql_admin_db_connect( $main );
-
+
if( defined $pg )
{
$db->do('CREATE USER '.$pg->get_dbusername.' WITH PASSWORD ?', undef, $pg->get_dbpassword);
@@ -83,7 +83,7 @@
my $db = pgsql_admin_db_connect( $main );
return unless $db;
-
+
if( ( defined $pg ) && ( $pg->get_status == Vhffs::Constants::TO_DELETE ) )
{
$pg->add_history("Ok, robots will erase all data");
@@ -114,24 +114,22 @@
sub pgsql_admin_db_connect
{
- use DBI;
- my $vhffs = shift;
- my $pgsqlconfig = $vhffs->get_config->get_service('pgsql');
- my $dbuser = $pgsqlconfig->{'username'};
- my $dbpass = $pgsqlconfig->{'password'};
- my $dbhost = $pgsqlconfig->{'host'};
+ use DBI;
+ my $vhffs = shift;
+ my $pgsqlconfig = $vhffs->get_config->get_service('pgsql');
+ my $dbuser = $pgsqlconfig->{'username'};
+ my $dbpass = $pgsqlconfig->{'password'};
+ my $dbhost = $pgsqlconfig->{'host'};
- my $dbi;
- if( $dbhost eq "localhost" )
- {
- $dbi = DBI->connect( "DBI:Pg:dbname=postgres",$dbuser,$dbpass ) or return -1;
- }
- else
- {
- $dbi = DBI->connect( "DBI:Pg:dbname=postgres;host=$dbhost",$dbuser,$dbpass ) or return -1;
- }
+ my $dbi;
+ if( $dbhost eq "localhost" ) {
+ $dbi = DBI->connect( "DBI:Pg:dbname=postgres",$dbuser,$dbpass ) or return -1;
+ }
+ else {
+ $dbi = DBI->connect( "DBI:Pg:dbname=postgres;host=$dbhost",$dbuser,$dbpass ) or return -1;
+ }
- return $dbi;
+ return $dbi;
}
sub _dump {
@@ -142,7 +140,7 @@
# create the postgres password file
my ( $pgpassfile, $pgpasspath ) = Vhffs::Robots::tmpfile( $pg->{main} );
return undef unless defined $pgpassfile;
- chmod( 0400, $pgpasspath );
+ chmod( 0400, $pgpasspath );
print $pgpassfile '*:*:*:*:'.$pgsqlconf->{'password'}."\n";
close $pgpassfile;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Repository.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Repository.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Repository.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -93,7 +93,7 @@
my $vhffs = $repo->{'main'};
my $datadir = $vhffs->get_config->get_datadir;
-
+
my $repodir = $repo->get_dir;
return -1 if( $repodir =~ /\./ );
Modified: trunk/vhffs-api/src/Vhffs/Robots/Svn.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Svn.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Svn.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
package Vhffs::Robots::Svn;
@@ -107,7 +107,7 @@
close ( POSTCOMMIT );
chmod 0755 , $svn->get_dir().'/hooks/post-commit';
}
-
+
$svn->add_history( 'Changed configuration of SVN repository' );
return 0;
@@ -149,7 +149,7 @@
# './hooks' directory must be owned by root to prevent abuse of servers
Vhffs::Robots::chmod_recur( $dir.'/hooks' , 0644 , 0755 );
Vhffs::Robots::chown_recur( $dir.'/hooks' , 0 , 0 );
-
+
change_conf( $svn );
$svn->add_history('The Robots created the subversion repository');
@@ -175,7 +175,7 @@
File::Path::rmtree($dir);
my $group_dir = dirname($dir);
rmdir $group_dir;
-
+
return 0;
}
Modified: trunk/vhffs-api/src/Vhffs/Robots/User.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/User.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/User.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -86,11 +86,11 @@
return -1 unless defined $user;
my $homedir = $user->get_home;
-
+
unless( Vhffs::Functions::create_dir( $homedir ) ) {
chown $user->get_uid , $user->get_gid , $homedir;
chmod 0700, $homedir;
-
+
$user->add_history( 'homedir created' );
$user->set_status( Vhffs::Constants::ACTIVATED );
return -1 if( $user->commit < 0 );
Modified: trunk/vhffs-api/src/Vhffs/Robots/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Web.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Robots/Web.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -2,31 +2,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
use strict;
@@ -46,7 +46,7 @@
my $main = shift;
my $web = shift;
- if( defined $web )
+ if( defined $web )
{
$web->add_history( "Ok, the robot take the creation of this object. Web directory will be created");
my $webdir = $web->get_dir;
@@ -54,17 +54,17 @@
Vhffs::Functions::create_dir( $webdir );
Vhffs::Functions::create_dir( $webdir . "/htdocs");
- chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/htdocs" );
+ chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/htdocs" );
chmod( 02775 , $webdir . "/htdocs" );
Vhffs::Functions::create_dir( $webdir . "/php-include");
- chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/php-include" );
+ chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/php-include" );
chmod( 02775 , $webdir . "/php-include" );
Vhffs::Functions::create_dir( $webdir . "/tmp");
- chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/tmp" );
+ chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/tmp" );
chmod( 02775 , $webdir . "/tmp" );
-
+
my $group = Vhffs::Group::get_by_gid( $main , $web->get_owner_gid );
if(Vhffs::Robots::link_to_group( $group, $web->get_servername.'-web', $webdir ) < 0) {
$web->add_history( "Can't link the webdirectory to the specified group");
Modified: trunk/vhffs-api/src/Vhffs/Services/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Cvs.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Services/Cvs.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -72,10 +72,10 @@
sub _new {
my ($class, $main, $cvs_id, $cvsroot, $owner_uid, $owner_gid, $public, $oid, $date_creation, $description, $state) = @_;
-
+
my $self = $class->SUPER::_new($main, $oid, $owner_uid, $owner_gid, $date_creation, $description, '', $state, Vhffs::Constants::TYPE_CVS);
return undef unless(defined $self);
-
+
$self->{cvsroot} = $cvsroot;
$self->{cvs_id} = $cvs_id;
$self->{public} = $public;
Modified: trunk/vhffs-api/src/Vhffs/Services/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Mail.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Services/Mail.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -90,14 +90,14 @@
my ($class, $main, $mxdomain_id, $owner_gid, $domain, $boxes_path, $catchall, $oid, $owner_uid, $date_creation, $state, $description, $boxes, $forwards) = @_;
my $self = $class->SUPER::_new($main, $oid, $owner_uid, $owner_gid, $date_creation, $description, '', $state, Vhffs::Constants::TYPE_MAIL);
return undef unless defined($self);
-
+
$self->{mxdomain_id} = $mxdomain_id;
$self->{domain} = $domain;
$self->{boxes_path} = $boxes_path;
$self->{catchall} = $catchall;
$self->{boxes} = $boxes;
$self->{forward} = $forwards;
-
+
return $self;
}
@@ -347,7 +347,7 @@
=cut
sub set_spam_status {
my ($self, $boxname, $status) = @_;
-
+
return -1 unless(defined $self->{boxes}{$boxname});
$self->{boxes}{$boxname}{nospam} = $status;
@@ -503,7 +503,7 @@
$self->{'forward'}{$name}{'domain'} = $self->{'domain'};
$self->{'forward'}{$name}{'remote_name'} = $remote;
$self->{forward}{$name}{password} = 'x';
-
+
return 1;
}
@@ -537,7 +537,7 @@
$self->{boxes}{$name}{nospam} = 0;
$self->{boxes}{$name}{mbox_name} = $userhash;
$self->{boxes}{$name}{state} = Vhffs::Constants::WAITING_FOR_CREATION;
-
+
my $sql = 'INSERT INTO vhffs_boxes(domain, local_part, domain_hash, password, mbox_name, nospam, novirus, allowpop, allowimap, state) VALUES(?, ?, ?, ?, ?, FALSE, FALSE, TRUE, TRUE, ?)';
my $dbh = $self->{db};
my $sth = $dbh->prepare($sql);
Modified: trunk/vhffs-api/src/Vhffs/Services/MailGroup.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/MailGroup.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Services/MailGroup.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -112,7 +112,7 @@
sub addforward {
my $self = shift;
my $remote = shift;
-
+
$self->{mail_service}->delforward( $self->{localpart} ) if $self->exists_forward;
$self->{mail_service}->set_box_status( $self->{localpart}, Vhffs::Constants::TO_DELETE ) if $self->exists_box;
return $self->{mail_service}->addforward( $self->{localpart}, $remote );
Modified: trunk/vhffs-api/src/Vhffs/Services/MailUser.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/MailUser.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Services/MailUser.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -120,7 +120,7 @@
sub addforward {
my $self = shift;
my $remote = shift;
-
+
$self->{mail_service}->delforward( $self->{localpart} ) if $self->exists_forward;
$self->{mail_service}->set_box_status( $self->{localpart}, Vhffs::Constants::TO_DELETE ) if $self->exists_box;
return $self->{mail_service}->addforward( $self->{localpart}, $remote );
Modified: trunk/vhffs-api/src/Vhffs/Services/MailingList.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/MailingList.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Services/MailingList.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -89,7 +89,7 @@
=cut
sub create {
my ($main, $local, $domain, $description, $user, $group) = @_;
-
+
return undef unless(defined $user && defined $group);
return undef unless($local =~ /^[a-z0-9\_\-]+$/);
return undef unless(Vhffs::Functions::check_domain_name($domain));
@@ -192,7 +192,7 @@
=cut
sub get_by_mladdress {
my ($main, $local, $domain) = @_;
-
+
my $dbh = $main->get_db_object();
my $sql = 'SELECT ml.ml_id, ml.local_part, ml.domain, ml.prefix, o.owner_gid, ml.open_archive, ml.reply_to, ml.sub_ctrl, ml.post_ctrl, ml.signature, o.object_id, o.owner_uid, o.date_creation, o.state, o.description FROM vhffs_ml ml INNER JOIN vhffs_object o ON o.object_id = ml.object_id WHERE domain = ? and local_part = ?';
my $sth = $dbh->prepare($sql);
@@ -320,7 +320,7 @@
my $sql = 'UPDATE vhffs_ml_subscribers SET hash = ? WHERE ml_id = ? AND member = ?';
return undef unless($self->get_main->get_db_object->do($sql, undef, $pass, $self->{ml_id}, $subscriber) > 0);
-
+
$self->{subs}->{$subscriber}->{hash} = $pass;
return $pass;
}
@@ -332,7 +332,7 @@
my $sql = 'UPDATE vhffs_ml_subscribers SET hash = NULL WHERE ml_id = ? AND member = ?';
# FIXME we should return a boolean
return -1 unless($self->get_main->get_db_object->do($sql, undef, $self->{ml_id}, $subscriber) > 0);
-
+
$self->{subs}->{$subscriber}->{hash} = undef;
return 1;
}
@@ -360,7 +360,6 @@
my $self = shift;
my $subscriber = shift;
-
my $hash = Digest::MD5::md5_hex( Vhffs::Functions::generate_random_password() );
my $sql = 'UPDATE vhffs_ml_subscribers SET perm = ?, hash = ? WHERE ml_id = ? AND member = ? AND perm IN (?, ?)';
Modified: trunk/vhffs-api/src/Vhffs/Tag/Category.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Tag/Category.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Tag/Category.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -1,31 +1,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
=head1 Vhffs::Tag::Category
@@ -51,58 +51,58 @@
sub create {
my ($main, $label, $description, $visibility, $creator, $updated) = @_;
$updated = time() unless(defined $updated);
-
+
my $dbh = $main->get_db_object();
my $sql = q{INSERT INTO vhffs_tag_category(label, description, visibility, updated, updater_id) VALUES (?, ?, ?, ?, ?)};
$dbh->do($sql, undef, $label, $description, $visibility, $updated, $creator->get_uid);
-
+
my $category_id = $dbh->last_insert_id(undef, undef, 'vhffs_tag_category', undef);
return get_by_category_id($main, $category_id);
}
sub get_by_category_id {
my ($main, $category_id) = @_;
-
+
my $dbh = $main->get_db_object();
-
+
my $sql = q{SELECT tag_category_id, label, description, visibility, updated, updater_id
FROM vhffs_tag_category WHERE tag_category_id = ?};
-
+
my $sth = $dbh->prepare($sql);
$sth->execute($category_id) or return undef;
my @results = $sth->fetchrow_array();
return undef unless @results;
-
+
my $category = _new Vhffs::Tag::Category($main, @results);
-
+
return $category;
}
sub get_by_label {
my ($main, $label) = @_;
-
+
my $dbh = $main->get_db_object();
-
+
my $sql = q{SELECT tag_category_id, label, description, visibility, updated, updater_id
FROM vhffs_tag_category WHERE label = ?};
-
+
my $sth = $dbh->prepare($sql);
$sth->execute($label) or return undef;
my @results = $sth->fetchrow_array();
return undef unless @results;
-
+
my $category = _new Vhffs::Tag::Category($main, @results);
-
+
return $category;
}
sub get_all {
my ($main, $visibility) = @_;
-
+
my @params = ();
my $cats = [];
-
+
my $sql = q{SELECT tag_category_id, label, description, visibility, updated, updater_id
FROM vhffs_tag_category};
if(defined $visibility) {
@@ -110,26 +110,26 @@
push @params, $visibility;
}
$sql .= q{ ORDER BY label};
-
+
my $dbh = $main->get_db_object();
-
+
my $sth = $dbh->prepare($sql);
$sth->execute(@params) or return undef;
-
+
while(my $c = $sth->fetchrow_arrayref()) {
push @$cats, _new Vhffs::Tag::Category($main, @$c);
}
-
+
return $cats;
}
sub _new {
my($class, $main, $category_id, $label, $description, $visibility, $updated, $updater_id) = @_;
-
+
my $self = {};
-
+
bless($self, $class);
-
+
$self->{main} = $main;
$self->{category_id} = $category_id;
$self->{label} = $label;
@@ -137,7 +137,7 @@
$self->{visibility} = $visibility;
$self->{updated} = $updated;
$self->{updater_id} = $updater_id;
-
+
return $self;
}
@@ -157,7 +157,7 @@
sub get_updater {
my ($self) = @_;
-
+
unless( defined $self->{updater} ) {
$self->{updater} = Vhffs::User::get_by_uid($self->{main}, $self->{updater_id});
}
Modified: trunk/vhffs-api/src/Vhffs/Tag/Request.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Tag/Request.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Tag/Request.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -1,31 +1,31 @@
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
# are met:
#
-# 1. Redistributions of source code must retain the above copyright
+# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
=head1 Vhffs::Tag::Request
@@ -44,24 +44,24 @@
sub create {
my ($main, $category, $tag, $requester, $tagged) = @_;
-
+
my $dbh = $main->get_db_object();
my $sql = q{INSERT INTO vhffs_tag_request(category_label, tag_label, created, requester_id, tagged_id) VALUES (?, ?, ?, ?, ?)};
$dbh->do($sql, undef, $category, $tag, time(), $requester->get_uid, $tagged->get_oid);
-
+
my $request_id = $dbh->last_insert_id(undef, undef, 'vhffs_tag_request', undef);
-
+
return get_by_request_id($main, $request_id);
}
sub _new {
my($class, $main, $request_id, $category_label, $tag_label, $created, $requester_id, $tagged_id) = @_;
-
+
my $self = {};
-
+
bless($self, $class);
-
+
$self->{main} = $main;
$self->{request_id} = $request_id;
$self->{category_label} = $category_label;
@@ -69,51 +69,51 @@
$self->{created} = $created;
$self->{requester_id} = $requester_id;
$self->{tagged_id} = $tagged_id;
-
+
return $self;
}
sub get_by_request_id {
my ($main, $request_id) = @_;
-
+
my $dbh = $main->get_db_object();
-
+
my $sql = q{SELECT tag_request_id, category_label, tag_label, created, requester_id, tagged_id
FROM vhffs_tag_request WHERE tag_request_id = ?};
-
+
my $sth = $dbh->prepare($sql);
$sth->execute($request_id) or return undef;
my @results = $sth->fetchrow_array();
return undef unless @results;
-
+
my $request = _new Vhffs::Tag::Request($main, @results);
-
+
return $request;
}
sub get_all {
my ($main) = @_;
-
+
my $requests = [];
-
+
my $sql = q{SELECT tag_request_id, category_label, tag_label, created, requester_id, tagged_id
FROM vhffs_tag_request ORDER BY created};
-
- my $dbh = $main->get_db_object();
-
+
+ my $dbh = $main->get_db_object();
+
my $sth = $dbh->prepare($sql);
$sth->execute() or return undef;
-
+
while(my $c = $sth->fetchrow_arrayref()) {
push @$requests, _new Vhffs::Tag::Request($main, @$c);
}
-
+
return $requests;
}
sub get_requester {
my ($self) = @_;
-
+
unless( defined $self->{requester} ) {
$self->{requester} = Vhffs::User::get_by_uid($self->{main}, $self->{requester_id});
}
@@ -122,7 +122,7 @@
sub get_tagged {
my ($self) = @_;
-
+
unless( defined $self->{tagged} ) {
$self->{tagged} = Vhffs::ObjectFactory::fetch_object($self->{main}, $self->{tagged_id});
}
@@ -141,21 +141,21 @@
sub get_tag_requests {
my ($self) = @_;
-
+
my $requests = [];
-
+
my $dbh = $self->get_db_object();
my $sql = q{SELECT tag_request_id, category_label, tag_label, created, requester_id, tagged_id
FROM vhffs_tag_request WHERE tagged_id = ? ORDER BY created};
-
+
my $sth = $dbh->prepare($sql);
-
+
$sth->execute($self->get_oid()) or return undef;
-
+
while(my $c = $sth->fetchrow_arrayref()) {
push @$requests, _new Vhffs::Tag::Request($self->get_main(), @$c);
}
-
+
return $requests;
}
Modified: trunk/vhffs-api/src/Vhffs/Tag.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Tag.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/Tag.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -57,7 +57,7 @@
=cut
sub _new {
my ($class, $main, $tag_id, $label, $description, $updated, $updater_id, $category_id) = @_;
-
+
my $self = {};
bless($self, $class);
@@ -404,12 +404,12 @@
FROM vhffs_tag t INNER JOIN vhffs_tag_category c ON c.tag_category_id = t.category_id
INNER JOIN vhffs_object_tag ot ON ot.tag_id = t.tag_id
WHERE ot.object_id = ? AND visibility <= ? ORDER BY c.label, t.label};
-
+
my $sth = $dbh->prepare($sql);
$sth->execute($o->get_oid(), $visibility) or return undef;
my $cat = undef;
-
+
while(my $t = $sth->fetchrow_hashref()) {
if( (!defined $cat) || ($cat->{label} ne $t->{cat_label}) ) {
$cat = {
Modified: trunk/vhffs-api/src/Vhffs/User.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/User.pm 2012-02-19 15:14:31 UTC (rev 2024)
+++ trunk/vhffs-api/src/Vhffs/User.pm 2012-02-19 16:11:44 UTC (rev 2025)
@@ -156,10 +156,10 @@
# so we have to tell pg that constraints shouldn't be checked before the end
# of transaction
$dbh->do('SET CONSTRAINTS ALL DEFERRED');
-
+
my ($uid) = $dbh->selectrow_array('SELECT nextval(\'vhffs_users_uid_seq\')');
my ($gid) = $dbh->selectrow_array('SELECT nextval(\'vhffs_groups_gid_seq\')');
-
+
# Create corresponding object
# -- TODO, user moderation (easy to do now)
my $parent = Vhffs::Object::create($main, $uid, $gid, '', Vhffs::Constants::WAITING_FOR_CREATION, Vhffs::Constants::TYPE_USER);
@@ -172,7 +172,7 @@
my $sth = $dbh->prepare('INSERT INTO vhffs_users (uid, gid, username, shell, passwd, homedir, admin, firstname, lastname, address, zipcode, city, country, mail, gpg_key, note, language, theme, lastloginpanel, object_id) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, NULL, NULL, ?)');
$sth->execute($uid, $gid, $username, $userconf->{'default_shell'}, Vhffs::Functions::password_encrypt($password), $homedir, $admin, $firstname, $lastname, $address, $zipcode, $city, $country, $mail, $gpg_key, $main->get_config->get_default_language, $parent->get_oid);
-
+
my $group = Vhffs::Group::create($main, $username, undef, $uid, $gid);
die('Error creating group') unless (defined $group);
$group->set_status(Vhffs::Constants::ACTIVATED);