This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goadmincenter. from c268d46 Add Danish translation files. new e474bd0 common: update copyright notices, whitespace fixes. Happy new year! new 56b5239 common: whitespace fixes only. new 4a8231b common: change X2go to X2Go where appropriate. Probably needs more work project-wide. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/copyright | 8 +- x2goadmincenter/Makefile.docupload | 2 +- x2goadmincenter/centerinterface.h | 4 +- x2goadmincenter/main.cpp | 4 +- x2goadmincenter/man/man8/x2goadmincenter.8 | 8 +- .../x2gogroupadmingui/x2gogroupadminwindow.cpp | 4 +- .../x2gogroupadmingui/x2gogroupadminwindow.h | 8 +- .../x2gosessionadmingui/x2gosessionadminwindow.cpp | 4 +- .../x2gosessionadmingui/x2gosessionadminwindow.h | 6 +- .../x2gouseradmingui/x2gouseradminwindow.cpp | 4 +- .../modules/x2gouseradmingui/x2gouseradminwindow.h | 4 +- x2goadmincenter/settingsdialog.cpp | 6 +- x2goadmincenter/settingsdialog.h | 6 +- x2goadmincenter/x2goadminInterface.h | 4 +- x2goadmincenter/x2goadmincenter.cpp | 4 +- x2goadmincenter/x2goadmincenter.h | 4 +- x2goadmincenter/x2gosettings.h | 2 +- x2goadminserver/Makefile.docupload | 2 +- x2goadminserver/cgi-bin/x2gorpcserver.cgi | 12 +- x2goadminserver/etc/x2goadminserver.conf | 10 +- x2goadminserver/lib/x2goadminserver.pm | 12 +- .../lib/x2goadminserver_backend_cipux.pm | 26 +-- .../lib/x2goadminserver_backend_ldap.pm | 234 ++++++++++---------- x2goadminserver/man/man5/x2goadminserver.conf.5 | 8 +- x2goadminserver/man/man8/x2gorpcserver.cgi.8 | 8 +- 25 files changed, 197 insertions(+), 197 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit e474bd0807eb77a46170382531a6a0b3797c86e8 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 9 03:00:17 2015 +0100 common: update copyright notices, whitespace fixes. Happy new year! --- debian/copyright | 8 ++++---- x2goadmincenter/Makefile.docupload | 2 +- x2goadmincenter/centerinterface.h | 4 ++-- x2goadmincenter/main.cpp | 4 ++-- .../x2gogroupadmingui/x2gogroupadminwindow.cpp | 4 ++-- .../x2gogroupadmingui/x2gogroupadminwindow.h | 4 ++-- .../x2gosessionadmingui/x2gosessionadminwindow.cpp | 4 ++-- .../x2gosessionadmingui/x2gosessionadminwindow.h | 4 ++-- .../x2gouseradmingui/x2gouseradminwindow.cpp | 4 ++-- .../modules/x2gouseradmingui/x2gouseradminwindow.h | 4 ++-- x2goadmincenter/settingsdialog.cpp | 4 ++-- x2goadmincenter/settingsdialog.h | 4 ++-- x2goadmincenter/x2goadminInterface.h | 4 ++-- x2goadmincenter/x2goadmincenter.cpp | 4 ++-- x2goadmincenter/x2goadmincenter.h | 4 ++-- x2goadmincenter/x2gosettings.h | 2 +- x2goadminserver/Makefile.docupload | 2 +- x2goadminserver/cgi-bin/x2gorpcserver.cgi | 4 ++-- x2goadminserver/etc/x2goadminserver.conf | 4 ++-- x2goadminserver/lib/x2goadminserver.pm | 4 ++-- .../lib/x2goadminserver_backend_cipux.pm | 4 ++-- .../lib/x2goadminserver_backend_ldap.pm | 4 ++-- 22 files changed, 43 insertions(+), 43 deletions(-) diff --git a/debian/copyright b/debian/copyright index 16f21fd..508a705 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Upstream Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the Affero GNU General Public License as published by @@ -17,16 +17,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -Copyright (C) 2007-2011 Oleksandr Shneyder +Copyright (C) 2007-2015 Oleksandr Shneyder oleksandr.shneyder@obviously-nice.de -Copyright (C) 2007-2011 Heinz-Markus Graesing +Copyright (C) 2007-2015 Heinz-Markus Graesing heinz-m.graesing@obviously-nice.de On Debian systems, the complete text of the GNU Affero General Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2007-2011, Mike Gabriel +The Debian packaging is (C) 2007-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> and is licensed under the GPLv3, see /usr/share/common-licenses/GPL. diff --git a/x2goadmincenter/Makefile.docupload b/x2goadmincenter/Makefile.docupload index 354780f..fdd6559 100644 --- a/x2goadmincenter/Makefile.docupload +++ b/x2goadmincenter/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for x2goclient -# Copyright 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright 2010-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/x2goadmincenter/centerinterface.h b/x2goadmincenter/centerinterface.h index afb4155..99578a7 100644 --- a/x2goadmincenter/centerinterface.h +++ b/x2goadmincenter/centerinterface.h @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/main.cpp b/x2goadmincenter/main.cpp index ef2d4fb..9fbb9d6 100644 --- a/x2goadmincenter/main.cpp +++ b/x2goadmincenter/main.cpp @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.cpp b/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.cpp index dc53220..064f69d 100644 --- a/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.cpp +++ b/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.cpp @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.h b/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.h index 8f535ef..4152469 100644 --- a/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.h +++ b/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.h @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.cpp b/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.cpp index 5a9821a..71975cb 100644 --- a/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.cpp +++ b/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.cpp @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.h b/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.h index 13c0fb5..863de15 100644 --- a/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.h +++ b/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.h @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/modules/x2gouseradmingui/x2gouseradminwindow.cpp b/x2goadmincenter/modules/x2gouseradmingui/x2gouseradminwindow.cpp index 148f1b0..c2119da 100644 --- a/x2goadmincenter/modules/x2gouseradmingui/x2gouseradminwindow.cpp +++ b/x2goadmincenter/modules/x2gouseradmingui/x2gouseradminwindow.cpp @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/modules/x2gouseradmingui/x2gouseradminwindow.h b/x2goadmincenter/modules/x2gouseradmingui/x2gouseradminwindow.h index d1d64bc..a046e5a 100644 --- a/x2goadmincenter/modules/x2gouseradmingui/x2gouseradminwindow.h +++ b/x2goadmincenter/modules/x2gouseradmingui/x2gouseradminwindow.h @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder<oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/settingsdialog.cpp b/x2goadmincenter/settingsdialog.cpp index 83dde86..3f62551 100644 --- a/x2goadmincenter/settingsdialog.cpp +++ b/x2goadmincenter/settingsdialog.cpp @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/settingsdialog.h b/x2goadmincenter/settingsdialog.h index 9adc976..80b440f 100644 --- a/x2goadmincenter/settingsdialog.h +++ b/x2goadmincenter/settingsdialog.h @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/x2goadminInterface.h b/x2goadmincenter/x2goadminInterface.h index 9ebb0e2..26ee8cc 100644 --- a/x2goadmincenter/x2goadminInterface.h +++ b/x2goadmincenter/x2goadminInterface.h @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/x2goadmincenter.cpp b/x2goadmincenter/x2goadmincenter.cpp index 6a77027..7eb4764 100644 --- a/x2goadmincenter/x2goadmincenter.cpp +++ b/x2goadmincenter/x2goadmincenter.cpp @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/x2goadmincenter/x2goadmincenter.h b/x2goadmincenter/x2goadmincenter.h index 733ac2c..606a02b 100644 --- a/x2goadmincenter/x2goadmincenter.h +++ b/x2goadmincenter/x2goadmincenter.h @@ -1,6 +1,6 @@ /* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + Part of X2GoAdminCenter. + Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or diff --git a/x2goadmincenter/x2gosettings.h b/x2goadmincenter/x2gosettings.h index 4cb272c..1d6c388 100644 --- a/x2goadmincenter/x2gosettings.h +++ b/x2goadmincenter/x2gosettings.h @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2010 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2010-2015 // // Copyright: See COPYING file that comes with this distribution // diff --git a/x2goadminserver/Makefile.docupload b/x2goadminserver/Makefile.docupload index dbcfa06..554d2e3 100644 --- a/x2goadminserver/Makefile.docupload +++ b/x2goadminserver/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for x2goclient -# Copyright 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright 2010-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3 applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/x2goadminserver/cgi-bin/x2gorpcserver.cgi b/x2goadminserver/cgi-bin/x2gorpcserver.cgi index 4afc4ea..97e99a3 100755 --- a/x2goadminserver/cgi-bin/x2gorpcserver.cgi +++ b/x2goadminserver/cgi-bin/x2gorpcserver.cgi @@ -1,7 +1,7 @@ #!/usr/bin/perl -w -# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> # X2go Admin Server is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published diff --git a/x2goadminserver/etc/x2goadminserver.conf b/x2goadminserver/etc/x2goadminserver.conf index ea5e01b..24832ce 100644 --- a/x2goadminserver/etc/x2goadminserver.conf +++ b/x2goadminserver/etc/x2goadminserver.conf @@ -1,5 +1,5 @@ -# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> # X2go Admin Server is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published diff --git a/x2goadminserver/lib/x2goadminserver.pm b/x2goadminserver/lib/x2goadminserver.pm index 2662356..bc02657 100644 --- a/x2goadminserver/lib/x2goadminserver.pm +++ b/x2goadminserver/lib/x2goadminserver.pm @@ -1,5 +1,5 @@ -# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> # X2go Admin Server is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published diff --git a/x2goadminserver/lib/x2goadminserver_backend_cipux.pm b/x2goadminserver/lib/x2goadminserver_backend_cipux.pm index b175851..6f1df6b 100644 --- a/x2goadminserver/lib/x2goadminserver_backend_cipux.pm +++ b/x2goadminserver/lib/x2goadminserver_backend_cipux.pm @@ -1,5 +1,5 @@ -# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> # X2go Admin Server is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published diff --git a/x2goadminserver/lib/x2goadminserver_backend_ldap.pm b/x2goadminserver/lib/x2goadminserver_backend_ldap.pm index 80379bc..31601c3 100644 --- a/x2goadminserver/lib/x2goadminserver_backend_ldap.pm +++ b/x2goadminserver/lib/x2goadminserver_backend_ldap.pm @@ -1,5 +1,5 @@ -# Copyright (C) 2010-2011 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2010-2011 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> # X2go Admin Server is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit 56b52396b6bf4193042ac7aa784383c84d7d1aea Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 9 03:02:36 2015 +0100 common: whitespace fixes only. --- .../x2gogroupadmingui/x2gogroupadminwindow.h | 4 +- .../x2gosessionadmingui/x2gosessionadminwindow.h | 2 +- x2goadmincenter/settingsdialog.cpp | 2 +- x2goadmincenter/settingsdialog.h | 2 +- x2goadminserver/cgi-bin/x2gorpcserver.cgi | 2 +- x2goadminserver/lib/x2goadminserver.pm | 2 +- .../lib/x2goadminserver_backend_cipux.pm | 16 +- .../lib/x2goadminserver_backend_ldap.pm | 224 ++++++++++---------- 8 files changed, 127 insertions(+), 127 deletions(-) diff --git a/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.h b/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.h index 4152469..076cbcb 100644 --- a/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.h +++ b/x2goadmincenter/modules/x2gogroupadmingui/x2gogroupadminwindow.h @@ -110,8 +110,8 @@ private: QString DEVELOPERS; QString TRANSLATORS; QString ABOUT; - - + + private slots: void slotHandleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors); void slotRpcFault(int, const QString& errMessage); diff --git a/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.h b/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.h index 863de15..3f14953 100644 --- a/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.h +++ b/x2goadmincenter/modules/x2gosessionadmingui/x2gosessionadminwindow.h @@ -86,7 +86,7 @@ private: QString DEVELOPERS; QString TRANSLATORS; QString ABOUT; - + QTimer servTimer; diff --git a/x2goadmincenter/settingsdialog.cpp b/x2goadmincenter/settingsdialog.cpp index 3f62551..ff98f5e 100644 --- a/x2goadmincenter/settingsdialog.cpp +++ b/x2goadmincenter/settingsdialog.cpp @@ -27,7 +27,7 @@ SettingsDialog::SettingsDialog(QWidget* parent, Qt::WindowFlags f): QDialog(pare X2goSettings st("settings"); checkBox->setChecked(st.setting()->value("admin",true).toBool()); leUrl->setText(st.setting()->value("url","http://www/cgi-bin/x2gorpcserver.cgi").toString()); - leLogin->setText(st.setting()->value("login","cipadmin").toString()); + leLogin->setText(st.setting()->value("login","cipadmin").toString()); } diff --git a/x2goadmincenter/settingsdialog.h b/x2goadmincenter/settingsdialog.h index 80b440f..2fee620 100644 --- a/x2goadmincenter/settingsdialog.h +++ b/x2goadmincenter/settingsdialog.h @@ -28,7 +28,7 @@ class SettingsDialog : public QDialog, private Ui_SettingsDialog { Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, Qt::WindowFlags f = 0); + SettingsDialog(QWidget* parent = 0, Qt::WindowFlags f = 0); virtual ~SettingsDialog(); void accept(); }; diff --git a/x2goadminserver/cgi-bin/x2gorpcserver.cgi b/x2goadminserver/cgi-bin/x2gorpcserver.cgi index 97e99a3..94b5416 100755 --- a/x2goadminserver/cgi-bin/x2gorpcserver.cgi +++ b/x2goadminserver/cgi-bin/x2gorpcserver.cgi @@ -67,7 +67,7 @@ sub process_cgi_call ($) { # Fetch our body. my $body; my $count = read STDIN, $body, $length; - http_error(400, "Bad Request") unless $count == $length; + http_error(400, "Bad Request") unless $count == $length; # Serve our request. my $coder = Frontier::RPC2->new; diff --git a/x2goadminserver/lib/x2goadminserver.pm b/x2goadminserver/lib/x2goadminserver.pm index bc02657..0e455fa 100644 --- a/x2goadminserver/lib/x2goadminserver.pm +++ b/x2goadminserver/lib/x2goadminserver.pm @@ -38,7 +38,7 @@ if($backend eq "x2goldap" ) } use base 'Exporter'; -our @EXPORT=('x2goadmin_getUsers','x2goadmin_getGroups', 'x2goadmin_getGroupsOfUser','x2goadmin_getGroupsWithUsers', +our @EXPORT=('x2goadmin_getUsers','x2goadmin_getGroups', 'x2goadmin_getGroupsOfUser','x2goadmin_getGroupsWithUsers', 'x2goadmin_modifyUser', 'x2goadmin_addUser','x2goadmin_modifyGroup', 'x2goadmin_addGroup' ,'x2goadmin_removeUsers','x2goadmin_removeGroups', 'x2goadmin_getSessions', 'x2goadmin_suspendSession', 'x2goadmin_terminateSession'); diff --git a/x2goadminserver/lib/x2goadminserver_backend_cipux.pm b/x2goadminserver/lib/x2goadminserver_backend_cipux.pm index 6f1df6b..132f258 100644 --- a/x2goadminserver/lib/x2goadminserver_backend_cipux.pm +++ b/x2goadminserver/lib/x2goadminserver_backend_cipux.pm @@ -265,7 +265,7 @@ sub getUsers { return $str; } - $str=userAttributes(); + $str=userAttributes(); my $cmdres; my $msg; ($status,$cmdres, $msg)=execCommand('cipux_task_retrieve_all_user_account_lastname_firstname'); @@ -312,7 +312,7 @@ sub getGroups { return $str; } - $str=groupAttributes(); + $str=groupAttributes(); my $cmdres; my $msg; $str=$str."\nBEGIN_USERS"; @@ -322,7 +322,7 @@ sub getGroups return $msg; } $str=$str.$msg."\nEND_USERS"; - $str=$str."\nBEGIN_GROUPS\n"; + $str=$str."\nBEGIN_GROUPS\n"; my $res; ($status,$msg,$res)=getAllGroupsWithUsers(); if(!$status) @@ -330,7 +330,7 @@ sub getGroups return $msg; } $str=$str.$res; - $str=$str."\nEND_GROUPS\n"; + $str=$str."\nEND_GROUPS\n"; $rpc->rpc_logout; return $str; @@ -363,7 +363,7 @@ sub getGroupsWithUsers { return $str; } - $str=userAttributes; + $str=userAttributes; my $cmdres; my $msg; $str=$str."\nBEGIN_USERS"; @@ -381,7 +381,7 @@ sub getGroupsWithUsers return $msg; } $str=$str.$res; - $str=$str."\nEND_GROUPS\n"; + $str=$str."\nEND_GROUPS\n"; $rpc->rpc_logout; return $str; @@ -398,7 +398,7 @@ sub getAllGroupsWithUsers } while( my ($key, $value) = each (%$cmdres_all_tasks)) { - if($key =~ m/list/ && $key =~ m/accounts/ && + if($key =~ m/list/ && $key =~ m/accounts/ && $key ne "cipux_task_list_user_accounts" && $key ne "cipux_task_list_role_accounts" && $key ne "cipux_task_list_skel_accounts") @@ -464,7 +464,7 @@ sub getGroupsOfUser while( my ($key, $value) = each (%$cmdres_all_tasks)) { - if($key =~ m/list/ && $key =~ m/accounts/ && + if($key =~ m/list/ && $key =~ m/accounts/ && $key ne "cipux_task_list_user_accounts" && $key ne "cipux_task_list_role_accounts" && $key ne "cipux_task_list_skel_accounts") diff --git a/x2goadminserver/lib/x2goadminserver_backend_ldap.pm b/x2goadminserver/lib/x2goadminserver_backend_ldap.pm index 31601c3..7b288f6 100644 --- a/x2goadminserver/lib/x2goadminserver_backend_ldap.pm +++ b/x2goadminserver/lib/x2goadminserver_backend_ldap.pm @@ -153,14 +153,14 @@ sub getUserName foreach (@$attr) { my $type=$_->{'type'}; - my $vals=$_->{'vals'}; + my $vals=$_->{'vals'}; if($type eq "givenName") { - $cn=decode("utf-8", @$vals[0]); + $cn=decode("utf-8", @$vals[0]); } if($type eq "sn") { - $sn=decode("utf-8", @$vals[0]); + $sn=decode("utf-8", @$vals[0]); } } } @@ -184,10 +184,10 @@ sub getGid foreach (@$attr) { my $type=$_->{'type'}; - my $vals=$_->{'vals'}; + my $vals=$_->{'vals'}; if($type eq "gidNumber") { - $gid=@$vals[0]; + $gid=@$vals[0]; } } } @@ -221,8 +221,8 @@ sub modifyUser sub addModifyUser -{ - +{ + my ($mode,$login,$password,$user, @args)=@_; my $retmsg="OK"; @@ -314,11 +314,11 @@ sub addModifyUser } if(!$modcn) { - $modcn=$cn; + $modcn=$cn; } if(!$modsn) { - $modsn=$sn; + $modsn=$sn; } } $attr->{'gecos'}=normalized($modcn." ".$modsn); @@ -332,11 +332,11 @@ sub addModifyUser $message=$ldap->modify("uid=$user,ou=People,$basedn", replace => $attr ); } else - { + { my $arr; while( my ($key, $value) = each (%$attr)) { - push(@$arr,$key=>$value); + push(@$arr,$key=>$value); } push(@$arr,uid=>$user); @@ -379,7 +379,7 @@ sub addModifyUser system("/etc/x2go/adduser $user $userUidNumber"); } } - + foreach (@newgrp) { my ($code, $msg)=addUserToGroup("cn=$_,ou=Group,$basedn", $user); @@ -407,7 +407,7 @@ sub getGroupsOfUser { my ($login, $password, $user) = @_; my ($status,$str)=getServerInfo($login, $password); - + if(!$status) { return $str; @@ -434,23 +434,23 @@ sub getGroupsOfUser my $vals=$_->{'vals'}; if($type eq "cn") { - $grp=@$vals[0]; + $grp=@$vals[0]; } if($type eq "gidNumber") { - $gid=@$vals[0]; + $gid=@$vals[0]; } if($type eq "memberUid") { - if(grep { $_ eq $user} @$vals) - { - $exists="1"; - } - } + if(grep { $_ eq $user} @$vals) + { + $exists="1"; + } + } } $str=$str."\n".$grp.":$exists:$gid"; } - + $ldap->unbind(); return $str; } @@ -463,22 +463,22 @@ sub getGroupsWithUsers if(!$status) { return $str; - } + } $str=userAttributes(); - - $str=$str."\nBEGIN_USERS"; + + $str=$str."\nBEGIN_USERS"; my ($code, $desc, $result)=getAllUsers($login); if($code) { - return ("CMDERR "." ".$desc); - } + return ("CMDERR "." ".$desc); + } $str=$str.$result."\nEND_USERS"; - - $str=$str."\nBEGIN_GROUPS\n"; - ($code, $desc, $result)=getAllGroupsWithUser($login); + + $str=$str."\nBEGIN_GROUPS\n"; + ($code, $desc, $result)=getAllGroupsWithUser($login); if($code) { - return ("CMDERR "." ".$desc); + return ("CMDERR "." ".$desc); } $str=$str.$result."\nEND_GROUPS\n"; $ldap->unbind(); @@ -492,7 +492,7 @@ sub getAllGroupsWithUser my $message=$ldap->search( base => "ou=Group,$basedn", filter => '(objectClass=posixGroup)' ); - + if(!$message->code) { foreach ($message->entries) @@ -502,25 +502,25 @@ sub getAllGroupsWithUser my ($name,$gid,$desc,$members); foreach (@$attr) { - my $type=$_->{'type'}; - my $vals=$_->{'vals'}; - - if($type eq "cn") - { - $name=@$vals[0]; - } - if($type eq "gidNumber") - { - $gid=@$vals[0]; - } - if($type eq "description") - { - $desc=@$vals[0]; - } - if($type eq "memberUid") - { - $members=join(";",@$vals); - } + my $type=$_->{'type'}; + my $vals=$_->{'vals'}; + + if($type eq "cn") + { + $name=@$vals[0]; + } + if($type eq "gidNumber") + { + $gid=@$vals[0]; + } + if($type eq "description") + { + $desc=@$vals[0]; + } + if($type eq "memberUid") + { + $members=join(";",@$vals); + } } $str=$str."\nNAME=".$name.":GID=".$gid.":DESC=".$desc.":MEMBERS=".$members; } @@ -536,19 +536,19 @@ sub getUsers { return $str; } - + $str=userAttributes(); $str=$str."\nBEGIN_USERS"; - + my ($code, $desc, $result)=getAllUsers($login); if($code) { return ("CMDERR "." ".$desc); - } + } $str=$str.$result."\nEND_USERS"; - + $ldap->unbind(); - + return $str; } @@ -558,13 +558,13 @@ sub getAllUsers my $message=$ldap->search( base => "ou=People,$basedn", filter => '(objectClass=posixAccount)' ); - - my $str; + + my $str; if($message->code) { return ($message->code, $message->error_desc(),$str); } - + foreach ($message->entries) { my $asn=$_->{'asn'}; @@ -573,38 +573,38 @@ sub getAllUsers foreach (@$attr) { my $type=$_->{'type'}; - my $vals=$_->{'vals'}; + my $vals=$_->{'vals'}; if($type eq "givenName") { - push(@userdata,decode("utf-8", "FNAME=@$vals[0]")); + push(@userdata,decode("utf-8", "FNAME=@$vals[0]")); } if($type eq "sn") { - push(@userdata,decode("utf-8", "LNAME=@$vals[0]")); + push(@userdata,decode("utf-8", "LNAME=@$vals[0]")); } if($type eq "gidNumber") { - push(@userdata,"GID=@$vals[0]"); + push(@userdata,"GID=@$vals[0]"); } if($type eq "homeDirectory") { - push(@userdata,"HOME=@$vals[0]"); + push(@userdata,"HOME=@$vals[0]"); } if($type eq "uid") { - push(@userdata,"UID=@$vals[0]"); + push(@userdata,"UID=@$vals[0]"); } if($type eq "uidNumber") { - push(@userdata,"UIDNUMBER=@$vals[0]"); + push(@userdata,"UIDNUMBER=@$vals[0]"); } if($type eq "loginShell") { - push(@userdata,"SHELL=@$vals[0]"); + push(@userdata,"SHELL=@$vals[0]"); } if($type eq "o") { - push(@userdata,"BIRTHDAY=@$vals[0]"); + push(@userdata,"BIRTHDAY=@$vals[0]"); } } $str=$str."\n".join(":",@userdata); @@ -663,20 +663,20 @@ sub getGroups return $str; } $str=groupAttributes(); - - $str=$str."\nBEGIN_USERS"; + + $str=$str."\nBEGIN_USERS"; my ($code, $desc, $result)=getAllUsers($login); if($code) { - return ("CMDERR "." ".$desc); - } + return ("CMDERR "." ".$desc); + } $str=$str.$result."\nEND_USERS"; - - $str=$str."\nBEGIN_GROUPS\n"; - ($code, $desc, $result)=getAllGroupsWithUser($login); + + $str=$str."\nBEGIN_GROUPS\n"; + ($code, $desc, $result)=getAllGroupsWithUser($login); if($code) { - return ("CMDERR "." ".$desc); + return ("CMDERR "." ".$desc); } $str=$str.$result."\nEND_GROUPS\n"; $ldap->unbind(); @@ -696,7 +696,7 @@ sub removeUsers my $message=$ldap->search( base => "ou=Group,$basedn", filter => '(objectClass=posixGroup)' ); - + if($message->code) { return ("CMDERR "." ".$message->error_desc()); @@ -712,14 +712,14 @@ sub removeUsers my $vals=$_->{'vals'}; if($type eq "cn") { - my $grp=@$vals[0]; - my $message=$ldap->modify("cn=$grp,ou=Group,$basedn", - delete => {memberUid => \@ulist}); + my $grp=@$vals[0]; + my $message=$ldap->modify("cn=$grp,ou=Group,$basedn", + delete => {memberUid => \@ulist}); } } } foreach(@ulist) - { + { my $message=$ldap->delete("uid=$_,ou=People,$basedn"); if($message->code) { @@ -738,15 +738,15 @@ sub removeGroups { return $str; } - my @glist=split(";",$groups); + my @glist=split(";",$groups); foreach(@glist) - { + { my $message=$ldap->delete("cn=$_,ou=Group,$basedn"); if($message->code) { return ("CMDERR "." ".$message->error_desc()); } - } + } return "OK"; } @@ -776,33 +776,33 @@ sub addModifyGroup my $rm=0; my $mod=0; - foreach (@args) - { + foreach (@args) + { $str=$str."\n".$_; - my @cmd=split(":",$_); - if(@cmd[0] eq "description") - { - push(@$attr,'description'=>@cmd[1]); - $mod=1; - } + my @cmd=split(":",$_); + if(@cmd[0] eq "description") + { + push(@$attr,'description'=>@cmd[1]); + $mod=1; + } if(@cmd[0] eq "gid") - { - push(@$attr,'gidNumber'=>@cmd[1]); - $mod=1; - } - if(@cmd[0] eq "newmembers") { - my $arr; + push(@$attr,'gidNumber'=>@cmd[1]); + $mod=1; + } + if(@cmd[0] eq "newmembers") + { + my $arr; @$arr=split(";",@cmd[1]); - push(@$addAttr,'memberUid'=>$arr); - $add=1; - } - if(@cmd[0] eq "obsoletemembers") + push(@$addAttr,'memberUid'=>$arr); + $add=1; + } + if(@cmd[0] eq "obsoletemembers") { - my $arr; + my $arr; @$arr=split(";",@cmd[1]); - push(@$rmAttr,'memberUid'=>$arr); - $rm=1; + push(@$rmAttr,'memberUid'=>$arr); + $rm=1; } } @@ -812,29 +812,29 @@ sub addModifyGroup my $changes; if($mod) { - push(@$changes,'replace'=>$attr); + push(@$changes,'replace'=>$attr); } if($add) { - push(@$changes,'add'=>$addAttr); + push(@$changes,'add'=>$addAttr); } if($rm) { - push(@$changes,'delete'=>$rmAttr); + push(@$changes,'delete'=>$rmAttr); } $message=$ldap->modify("cn=$group,ou=Group,$basedn", - changes => $changes ); + changes => $changes ); } else - { + { push(@$attr,cn=>$group); foreach(@$addAttr) { - push(@$attr, $_); + push(@$attr, $_); } push(@$attr,objectClass=>['top','posixGroup']); $message=$ldap->add("cn=$group,ou=Group,$basedn", - attr => $attr); + attr => $attr); } if($message->code) { @@ -845,4 +845,4 @@ sub addModifyGroup } -return 1; \ No newline at end of file +return 1; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit 4a8231b1c87af837765b39fb0d181076d2bfa5ab Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 9 03:03:33 2015 +0100 common: change X2go to X2Go where appropriate. Probably needs more work project-wide. --- x2goadmincenter/man/man8/x2goadmincenter.8 | 8 ++++---- x2goadminserver/cgi-bin/x2gorpcserver.cgi | 6 +++--- x2goadminserver/etc/x2goadminserver.conf | 6 +++--- x2goadminserver/lib/x2goadminserver.pm | 6 +++--- .../lib/x2goadminserver_backend_cipux.pm | 6 +++--- .../lib/x2goadminserver_backend_ldap.pm | 6 +++--- x2goadminserver/man/man5/x2goadminserver.conf.5 | 8 ++++---- x2goadminserver/man/man8/x2gorpcserver.cgi.8 | 8 ++++---- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/x2goadmincenter/man/man8/x2goadmincenter.8 b/x2goadmincenter/man/man8/x2goadmincenter.8 index 1319b00..1381d52 100644 --- a/x2goadmincenter/man/man8/x2goadmincenter.8 +++ b/x2goadmincenter/man/man8/x2goadmincenter.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goadmincenter 8 "Sep 2011" "Version 0.0.0.x" "X2go Administration Center (Qt4)" +.TH x2goadmincenter 8 "Sep 2011" "Version 0.0.0.x" "X2Go Administration Center (Qt4)" .SH NAME -x2goadmincenter \- X2go Administration Center +x2goadmincenter \- X2Go Administration Center .SH SYNOPSIS 'nh .fi @@ -15,8 +15,8 @@ x2goadmincenter \- X2go Administration Center \fBx2goadmincenter\fR .SH DESCRIPTION -\fBx2goadmincenter\fR is a GUI application for administrating X2go Servers. +\fBx2goadmincenter\fR is a GUI application for administrating X2Go Servers. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2goadminserver/cgi-bin/x2gorpcserver.cgi b/x2goadminserver/cgi-bin/x2gorpcserver.cgi index 94b5416..f9a3f3f 100755 --- a/x2goadminserver/cgi-bin/x2gorpcserver.cgi +++ b/x2goadminserver/cgi-bin/x2gorpcserver.cgi @@ -3,12 +3,12 @@ # Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> -# X2go Admin Server is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published +# X2Go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# X2go Admin Server is distributed in the hope that it will be useful, +# X2Go Admin Server is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. diff --git a/x2goadminserver/etc/x2goadminserver.conf b/x2goadminserver/etc/x2goadminserver.conf index 24832ce..d782423 100644 --- a/x2goadminserver/etc/x2goadminserver.conf +++ b/x2goadminserver/etc/x2goadminserver.conf @@ -1,12 +1,12 @@ # Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> -# X2go Admin Server is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published +# X2Go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# X2go Admin Server is distributed in the hope that it will be useful, +# X2Go Admin Server is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. diff --git a/x2goadminserver/lib/x2goadminserver.pm b/x2goadminserver/lib/x2goadminserver.pm index 0e455fa..1f6120f 100644 --- a/x2goadminserver/lib/x2goadminserver.pm +++ b/x2goadminserver/lib/x2goadminserver.pm @@ -1,12 +1,12 @@ # Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> -# X2go Admin Server is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published +# X2Go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# X2go Admin Server is distributed in the hope that it will be useful, +# X2Go Admin Server is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. diff --git a/x2goadminserver/lib/x2goadminserver_backend_cipux.pm b/x2goadminserver/lib/x2goadminserver_backend_cipux.pm index 132f258..6d34774 100644 --- a/x2goadminserver/lib/x2goadminserver_backend_cipux.pm +++ b/x2goadminserver/lib/x2goadminserver_backend_cipux.pm @@ -1,12 +1,12 @@ # Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> -# X2go Admin Server is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published +# X2Go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# X2go Admin Server is distributed in the hope that it will be useful, +# X2Go Admin Server is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. diff --git a/x2goadminserver/lib/x2goadminserver_backend_ldap.pm b/x2goadminserver/lib/x2goadminserver_backend_ldap.pm index 7b288f6..ac00235 100644 --- a/x2goadminserver/lib/x2goadminserver_backend_ldap.pm +++ b/x2goadminserver/lib/x2goadminserver_backend_ldap.pm @@ -1,12 +1,12 @@ # Copyright (C) 2010-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2010-2015 by Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> -# X2go Admin Server is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published +# X2Go Admin Server is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published # by the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# X2go Admin Server is distributed in the hope that it will be useful, +# X2Go Admin Server is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. diff --git a/x2goadminserver/man/man5/x2goadminserver.conf.5 b/x2goadminserver/man/man5/x2goadminserver.conf.5 index 894a267..eaf728c 100644 --- a/x2goadminserver/man/man5/x2goadminserver.conf.5 +++ b/x2goadminserver/man/man5/x2goadminserver.conf.5 @@ -5,18 +5,18 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goadminserver.conf 5 "Sep 2011" "Version 0.0.0.x" "X2go Administration Server" +.TH x2goadminserver.conf 5 "Sep 2011" "Version 0.0.0.x" "X2Go Administration Server" .SH NAME -x2goadminserver.conf \- X2go Admin Server Configuration File +x2goadminserver.conf \- X2Go Admin Server Configuration File .SH SYNOPSIS 'nh .fi .ad l -\fBx2goadminserver.conf\fR is the configuration file of the X2go Administration Server. +\fBx2goadminserver.conf\fR is the configuration file of the X2Go Administration Server. .SH DESCRIPTION \fBx2goadminserver.conf\fR needs to be documented here. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2goadminserver/man/man8/x2gorpcserver.cgi.8 b/x2goadminserver/man/man8/x2gorpcserver.cgi.8 index fd90110..37f7ce3 100644 --- a/x2goadminserver/man/man8/x2gorpcserver.cgi.8 +++ b/x2goadminserver/man/man8/x2gorpcserver.cgi.8 @@ -5,9 +5,9 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gorpcserver.cgi 8 "Sep 2011" "Version 0.0.0.x" "X2go Administration Server" +.TH x2gorpcserver.cgi 8 "Sep 2011" "Version 0.0.0.x" "X2Go Administration Server" .SH NAME -x2gorpcserver.cgi \- X2go Admin Server / RPC Server Script +x2gorpcserver.cgi \- X2Go Admin Server / RPC Server Script .SH SYNOPSIS 'nh .fi @@ -15,8 +15,8 @@ x2gorpcserver.cgi \- X2go Admin Server / RPC Server Script \fBx2gorpcserver.cgi\fR .SH DESCRIPTION -\fBx2gorpcserver.cgi\fR is a CGI script and a component of the X2go Administration Server. +\fBx2gorpcserver.cgi\fR is a CGI script and a component of the X2Go Administration Server. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
-
git-admin＠x2go.org