This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit cd1d378f452cf460d163b8c11f96da6e3ce2321c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 11:14:03 2018 +0100 Massive white-space cleanup (at EOLs). --- INSTALL | 10 ++++----- README.i18n | 8 +++---- X2Go/Server/DB.pm | 6 +++--- X2Go/Server/DB/PostgreSQL.pm | 32 ++++++++++++++-------------- X2Go/Server/DB/SQLite3.pm | 8 +++---- X2Go/SupeReNicer.pm | 6 +++--- X2Go/Utils.pm | 2 +- debian/changelog | 1 + debian/control | 1 - x2goserver-fmbindings/README.md | 2 +- x2goserver-printing/README.md | 4 ++-- x2goserver-printing/bin/x2goprint | 2 +- x2goserver-xsession/etc/Xsession | 2 +- x2goserver/README.md | 2 +- x2goserver/bin/x2gogetapps | 6 +++--- x2goserver/bin/x2gogetservers | 2 +- x2goserver/bin/x2golistdesktops | 2 +- x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2golistsessions | 2 +- x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2gosessionlimit | 2 +- x2goserver/bin/x2gosuspend-session | 2 +- x2goserver/bin/x2goterminate-session | 2 +- x2goserver/bin/x2goumount-session | 2 +- x2goserver/bin/x2goversion | 2 +- x2goserver/doc/README.upgrade-pgsql-database | 4 ++-- x2goserver/lib/x2gochangestatus | 2 +- x2goserver/lib/x2gocreatesession | 2 +- x2goserver/lib/x2gocreateshadowsession | 2 +- x2goserver/lib/x2gogetagent | 2 +- x2goserver/lib/x2gogetdisplays | 2 +- x2goserver/lib/x2gogetports | 2 +- x2goserver/lib/x2gogetstatus | 2 +- x2goserver/lib/x2goinsertport | 2 +- x2goserver/lib/x2goinsertsession | 2 +- x2goserver/lib/x2goinsertshadowsession | 2 +- x2goserver/lib/x2golistsessions_sql | 4 ++-- x2goserver/lib/x2goresume | 2 +- x2goserver/lib/x2gormport | 2 +- x2goserver/lib/x2gosuspend-agent | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 10 ++++----- 42 files changed, 79 insertions(+), 79 deletions(-) diff --git a/INSTALL b/INSTALL index fa48ab8..f530afb 100644 --- a/INSTALL +++ b/INSTALL @@ -21,11 +21,11 @@ already: 2.) BUILD + INSTALL x2goserver FILES ----------------------------- -Extract tarball and run +Extract tarball and run $ make && sudo make install -in base folder of the extracted tarball. +in base folder of the extracted tarball. 3.) SGID GROUP @@ -33,7 +33,7 @@ in base folder of the extracted tarball. Configure ownership, permissions and setgid group bits of libx2go-server-db-sqlite3-wrapper and x2goprint: - NOTE: The described actions have already been performed by the Makefile + NOTE: The described actions have already been performed by the Makefile run, leaving this here for documentation only. $ chown root:x2gouser /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper @@ -47,7 +47,7 @@ libx2go-server-db-sqlite3-wrapper and x2goprint: 4.) INIT SCRIPT --------------- Create a simple init script that starts $PREFIX/sbin/x2gocleansessions on system start -(runlevel 2-3-4-5). +(runlevel 2-3-4-5). Alternatively, you can add a single line to /etc/rc.local: @@ -67,7 +67,7 @@ have to be members of your server system's ,,fuse'' group Also users that shall be able to send print jobs to client-side printers have to be members of the server-side ,,fuse'' group (see above). -As X2Go printing setups can be rather versatile, details on X2Go printing are explained in +As X2Go printing setups can be rather versatile, details on X2Go printing are explained in the project's wiki: http://www.x2go.org/doku.php/wiki:components:printing http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-printing diff --git a/README.i18n b/README.i18n index 8133502..cf15ae2 100644 --- a/README.i18n +++ b/README.i18n @@ -21,7 +21,7 @@ THANKS!!! for the time you give to the X2Go project. And, if you are new to the team and language files for the language you want to feel responsible for do not yet exist, please subscribe to this mailing list first: - http://lists.x2go.org/listinfo/x2go-i18n + http://lists.x2go.org/listinfo/x2go-i18n Once you are subscribed, send an email to @@ -53,7 +53,7 @@ you do this by typing the following commands: 1. cd x2goserver/debian/po -2. sudo cp templates.pot da.po +2. sudo cp templates.pot da.po (or whatever langauge you are going to work on) Now the file is ready for translating it into the language you are going to work on. @@ -78,7 +78,7 @@ NOTE: Make sure you translate all boldly marked items: non-translated as well as Sending in the Translation File ------------------------------- -When done, please send the complete translation file +When done, please send the complete translation file <current_dir>/x2goserver/debian/po/<lang>.po @@ -92,7 +92,7 @@ You will get informed on x2go-i18n if a translation update is necessary. So chec your mails there regularly. For updating a translation, either keep the X2Go Server source project folder and -read more on Git by your self. +read more on Git by your self. Alternatively, just remove the folder (once you have sent in the translation file) and start with this documentation all over again. diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index faa0867..7d893a3 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -70,9 +70,9 @@ if ($backend eq 'mysql') use base 'Exporter'; -our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', - 'db_getdisplays', 'db_insertsession', 'db_insertshadowsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_createshadowsession', 'db_insertmount', - 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', +our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', + 'db_getdisplays', 'db_insertsession', 'db_insertshadowsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_createshadowsession', 'db_insertmount', + 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts', 'db_listshadowsessions','db_listshadowsessions_all'); sub dbsys_rmsessionsroot diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index e04f6c4..bb84cf9 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -141,7 +141,7 @@ sub dbsys_rmsessionsroot { init_db(); my $sid=shift or die "argument \"session_id\" missed"; - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("delete from sessions where session_id='$sid'"); $sth->execute() or die; @@ -169,7 +169,7 @@ sub dbsys_listsessionsroot init_db(); my $server=shift or die "argument \"server\" missed"; my @strings; - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth; if ($with_TeKi) { @@ -188,7 +188,7 @@ sub dbsys_listsessionsroot $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @strings[$i++]=join('|',@data); } @@ -219,7 +219,7 @@ sub dbsys_listsessionsroot_all $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @strings[$i++]=join('|',@data); } @@ -239,7 +239,7 @@ sub dbsys_getmounts $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @mounts[$i++]=join("|",@data); } @@ -259,7 +259,7 @@ sub db_getmounts $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @mounts[$i++]=join("|",@data); } @@ -460,7 +460,7 @@ sub db_getstatus my $sth=$dbh->prepare("select status from sessions_view where session_id = '$sid'"); $sth->execute($sid) or die; my @data; - if (@data = $sth->fetchrow_array) + if (@data = $sth->fetchrow_array) { $status=@data[0]; } @@ -480,7 +480,7 @@ sub db_getdisplays $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @displays[$i++]='|'.@data[0].'|'; } @@ -500,7 +500,7 @@ sub db_getports $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @ports[$i++]='|'.@data[0].'|'; } @@ -518,7 +518,7 @@ sub db_getservers $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @servers[$i++]=@data[0]." ".@data[1]; } @@ -539,7 +539,7 @@ sub db_getagent $sth->execute()or die; my @data; my $i=0; - if (@data = $sth->fetchrow_array) + if (@data = $sth->fetchrow_array) { $agent=@data[0]; } @@ -560,7 +560,7 @@ sub db_getdisplay $sth->execute() or die; my @data; my $i=0; - if (@data = $sth->fetchrow_array) + if (@data = $sth->fetchrow_array) { $display=@data[0]; } @@ -594,7 +594,7 @@ sub db_listsessions $sth->execute() or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @sessions[$i++]=join('|',@data); } @@ -627,7 +627,7 @@ sub db_listsessions_all $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @sessions[$i++]=join('|',@data); } @@ -651,7 +651,7 @@ sub db_listshadowsessions $sth->execute() or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @sessions[$i++]=join('|',@data); } @@ -674,7 +674,7 @@ sub db_listshadowsessions_all $sth->execute()or die; my @data; my $i=0; - while (@data = $sth->fetchrow_array) + while (@data = $sth->fetchrow_array) { @sessions[$i++]=join('|',@data); } diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm index ba3cfee..29f68c4 100644 --- a/X2Go/Server/DB/SQLite3.pm +++ b/X2Go/Server/DB/SQLite3.pm @@ -35,7 +35,7 @@ use strict; use DBI; use POSIX; -#### NOTE: the default X2Go server setups runs the code in this package +#### NOTE: the default X2Go server setups runs the code in this package #### via a setgid <group> wrapper (where <group> is group ,,x2gouser''). #### It is intended that the code in this package cannot do system() calls. @@ -597,7 +597,7 @@ sub db_listsessions_all strftime('%s','now','localtime') - strftime('%s',init_time),fs_port, tekictrl_port,tekidata_port from sessions where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc"); - + $sth->execute($realuser); if ($sth->err()) { @@ -644,9 +644,9 @@ sub db_listshadowsessions_all cookie,client,gr_port,sound_port, strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions + strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and uname=? and ( session_id like '%XSHAD%') order by status desc"); - + $sth->execute($realuser); if ($sth->err()) { diff --git a/X2Go/SupeReNicer.pm b/X2Go/SupeReNicer.pm index 681f852..622f1c2 100644 --- a/X2Go/SupeReNicer.pm +++ b/X2Go/SupeReNicer.pm @@ -171,7 +171,7 @@ sub superenice { } else { ########################################################################################### - # Oh no.... No "/proc"? Lets do this on a per user basis instead then... + # Oh no.... No "/proc"? Lets do this on a per user basis instead then... # If a user have more than one session, both need to be suspended before we renice.... # Resuming any of that users sessions would return them all to normal priority. @@ -195,7 +195,7 @@ sub superenice { foreach my $nUser (keys %niceUsers) { $nUser = sanitizer("pnixusername",$nUser); - # We're only working with "portable" unix usernames.. + # We're only working with "portable" unix usernames.. if ($nUser) { # So if the sanitizer return something we'll do this.... @@ -226,7 +226,7 @@ sub superenice { } } } - # Oh no.... No "/proc"? Lets do this on a per user basis instead then... + # Oh no.... No "/proc"? Lets do this on a per user basis instead then... ########################################################################################### } } diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm index 003c11e..1439770 100644 --- a/X2Go/Utils.pm +++ b/X2Go/Utils.pm @@ -118,7 +118,7 @@ sub sanitizer { if ($string =~ /^([a-zA-Z0-9\_\-]*)$/) { $string = $1; return $string; - } else {return 0;} + } else {return 0;} } elsif ($type eq "pnixusername") { $string =~ s/[^a-zA-Z0-9\.\_\-\@]//g; if ($string =~ /^([a-zA-Z0-9\.\_][a-zA-Z0-9\.\_\-\@]*)$/) { diff --git a/debian/changelog b/debian/changelog index 910d4df..2baffe4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium - Don't rely on "ln -sf" to remove a symlink before recreating it. If the target is non-writable, this may fail (observed on a Debian stretch system). Thus, removing the symlink file first and then recreating it. + - Massive white-space cleanup (at EOLs). * debian/x2goserver*.dirs: + Let dirs have a trailing slash in their path (for the human eye merely). * debian/copyright: diff --git a/debian/control b/debian/control index 9d6dc8d..c6e507e 100644 --- a/debian/control +++ b/debian/control @@ -360,4 +360,3 @@ Description: Share X11 desktops with other users via X2Go . This package contains all the integration and configuration logics of a system-wide manageable desktop sharing setup. - diff --git a/x2goserver-fmbindings/README.md b/x2goserver-fmbindings/README.md index 2c61c4d..8074aee 100644 --- a/x2goserver-fmbindings/README.md +++ b/x2goserver-fmbindings/README.md @@ -5,7 +5,7 @@ This folder contains all scripts and helpers for the ssh mounted Shared Folders contains the script to open a shared folder with x2go - * man + * man man page documentation diff --git a/x2goserver-printing/README.md b/x2goserver-printing/README.md index 9a88829..0182e7d 100644 --- a/x2goserver-printing/README.md +++ b/x2goserver-printing/README.md @@ -1,7 +1,7 @@ # x2goserver-printing This folder contains the x2go printing service feature. - * bin + * bin contains the script that lets you run the print job remotely at your client side. @@ -9,7 +9,7 @@ This folder contains the x2go printing service feature. man page documentations - * share + * share contains the feature definition itself. diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index c1ea0b6..5c07e8c 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -161,5 +161,5 @@ if ( $mounts=~m/$spooldir/) unlink("$printdir/$pdfFile"); } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 346d004..ebee0c5 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -216,7 +216,7 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE- # At the time of integrating X2Go Xsession support for RHEL6 / Fedora # the Xsession stuff in Fedora/RHEL6 seems to be a little mess. - # The proposed strategy is to have Xclients.$WM.sh files in + # The proposed strategy is to have Xclients.$WM.sh files in # /etc/X11/xinit/Xclients.d. Currently, only wmx uses this mechanism. # As it is a described but rather unused ,,standard'' we will not support it # in X2Go for now, but leave it here as a reminder... diff --git a/x2goserver/README.md b/x2goserver/README.md index ec48bc7..6a16c11 100644 --- a/x2goserver/README.md +++ b/x2goserver/README.md @@ -1,6 +1,6 @@ # x2goserver core component -## x2goserver/bin +## x2goserver/bin This folder contains all the scripts to be used by the server in order to provide functionality to all the clients. The scripts itself are used for various different functions listed below: * x2gobasepath - _todo_ diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index d41ab2f..1a2eb2d 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -100,7 +100,7 @@ sub geticon { my $buf; push(@ret, "<icon>"); - while (read(I, $buf, 60*57)) + while (read(I, $buf, 60*57)) { push(@ret, encode_base64($buf)); } @@ -215,7 +215,7 @@ foreach(@dirs) for my $dirname (grep {-d "$basedir/$_" && ! /^\.{2}$/} readdir($basedh)) { if( opendir(DIR, "$basedir/$dirname")) { - while (defined($file = readdir(DIR))) + while (defined($file = readdir(DIR))) { if($file =~ m/.desktop/) { @@ -228,5 +228,5 @@ foreach(@dirs) } } } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index 1bfce76..278c15f 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -31,5 +31,5 @@ setlogmask( LOG_UPTO(loglevel()) ); my $servers = join("\n", db_getservers); print $servers; -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index d5eb3fd..1be3bb0 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -112,6 +112,6 @@ for(my $i=0;$i<@displays;$i++) { print "@displays[$i]\n"; } } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index 02b1ee6..ce4201b 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -33,5 +33,5 @@ my $session_id=shift || $ENV{'X2GO_SESSION'} or die "no valid session name that my $mounts = join("\n", db_getmounts($session_id)); print "$mounts\n"; -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 17150b9..798bd40 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -93,5 +93,5 @@ for (my $i=0;$i<@outp;$i++) } } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 1f5b47f..00333a8 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -390,5 +390,5 @@ for (my $i=0;$i<@dirs;$i++) unlink($key); unlink("$key.ident"); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 2c15848..6a60ff5 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -105,6 +105,6 @@ if ($maxlimit != -1) { exit 0; } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 2c19262..c822ffa 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -40,7 +40,7 @@ X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` +X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` # workaround for knotify, keep silent in case no knotify is running diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 10b5f17..0eeb345 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -40,7 +40,7 @@ X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` +X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` # stop x2godesktopsharing process gracefully... diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index b74d7a6..dbc291f 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -244,5 +244,5 @@ rmdir ("$spooldir"); rmdir ("$mimeboxdir/C-$session"); rmdir ("$mimeboxdir"); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index 80ccebd..45d6525 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -41,7 +41,7 @@ if [ -n "$1" ]; then fi else cd "${X2GO_VERSIONS_BASEPATH}" - for compfile in `ls "${X2GO_VERSIONS_BASEPATH}"`; do + for compfile in `ls "${X2GO_VERSIONS_BASEPATH}"`; do X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)" X2GO_COMPONENT_VERSION="$(get_version $compfile)" echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}" diff --git a/x2goserver/doc/README.upgrade-pgsql-database b/x2goserver/doc/README.upgrade-pgsql-database index 5e7de9d..145c0db 100644 --- a/x2goserver/doc/README.upgrade-pgsql-database +++ b/x2goserver/doc/README.upgrade-pgsql-database @@ -17,7 +17,7 @@ Upgrading to x2goserver 3.1.0.0 From: x2goserver (<= 3.0.99.10) To: x2goserver (>= 3.1.0.0) -Description: The user (access) permissions on table ,,used_ports'' have been changed. +Description: The user (access) permissions on table ,,used_ports'' have been changed. X2Go users in the PostgreSQL database need access to this new column. . Alternative 1: recreate all X2Go db users @@ -30,7 +30,7 @@ Description: The user (access) permissions on table ,,used_ports'' have been cha Run this SQL command for each x2gouser_<user> in the X2Go PostgreSQL database . $ su - postgres - $ psql + $ psql psql (<YOUR-PSQL-VERSION) Type "help" for help. . diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index 7fbf54a..5f5b3c7 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -34,5 +34,5 @@ my $sid=shift or die; db_changestatus($status, $sid); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index 5e79ddb..d50d275 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -41,5 +41,5 @@ my $tekidata_port=shift or die; db_createsession($sid, $cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $tekictrl_port, $tekidata_port); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gocreateshadowsession b/x2goserver/lib/x2gocreateshadowsession index 1316aee..9f797fa 100755 --- a/x2goserver/lib/x2gocreateshadowsession +++ b/x2goserver/lib/x2gocreateshadowsession @@ -40,5 +40,5 @@ my $shadreq_user=shift or die; db_createshadowsession($sid, $cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $shadreq_user); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 8bd57c5..32245e3 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -32,5 +32,5 @@ my $sid=shift or die; my $agent = db_getagent($sid); print $agent; -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index 7b44779..5ef8b83 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -33,5 +33,5 @@ my $host=shift or die; my $displays = join("\n", db_getdisplays($host)); print $displays; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index 161503b..6c0c68f 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -34,5 +34,5 @@ my $host=shift or die; my $ports = join("\n", db_getports($host)); print $ports; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus index a18f139..c0a27a1 100755 --- a/x2goserver/lib/x2gogetstatus +++ b/x2goserver/lib/x2gogetstatus @@ -34,5 +34,5 @@ my $sid=shift or die; $status = db_getstatus($sid); print "$status"; -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index 76c345c..cd6cd5c 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -36,5 +36,5 @@ my $port=shift or die; db_insertport($server,$sid,$port); print "inserted"; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index ed59682..6f2b107 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -36,5 +36,5 @@ my $sid=shift or die; db_insertsession($display, $server, $sid); print "inserted"; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2goinsertshadowsession b/x2goserver/lib/x2goinsertshadowsession index c8e3829..151d25e 100755 --- a/x2goserver/lib/x2goinsertshadowsession +++ b/x2goserver/lib/x2goinsertshadowsession @@ -37,5 +37,5 @@ my $shadreq_user=shift or die; db_insertshadowsession($display, $server, $sid, $shadreq_user); print "inserted"; -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 54f07ea..b612442 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -54,7 +54,7 @@ else @array=dbsys_listsessionsroot ($serv); } my $i; -for ( $i=0;$i<@array;$i++) +for ( $i=0;$i<@array;$i++) { my @ln=split('\|',@array[$i]); if ((@ln[4] eq "F") && (!check_pid(@ln[0], @ln[1]))) @@ -66,5 +66,5 @@ for ( $i=0;$i<@array;$i++) print "@array[$i]\n"; } -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 58c67f9..39651a7 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -40,5 +40,5 @@ $tekictrl_port=shift or $tekictrl_port=-1; $tekidata_port=shift or $tekidata_port=-1; db_resume($client, $sid, $gr_port, $snd_port, $fs_port, $tekictrl_port, $tekidata_port); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport index 8a5fd05..b3cc45a 100755 --- a/x2goserver/lib/x2gormport +++ b/x2goserver/lib/x2gormport @@ -35,5 +35,5 @@ my $port=shift or die; db_rmport($server,$sid,$port); -# closing syslog +# closing syslog closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index ea5f0d3..79c53e4 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -36,5 +36,5 @@ my @words=split(" ",$capt); system("x2gosuspend-session @words[2] > /dev/null"); -# closing syslog +# closing syslog closelog; diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index 922506f..66bdfa3 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -61,7 +61,7 @@ then that value will override client-side settings. very probably means that the session's X agent has died, so the session \fI<session_id>\fR will be marked as finished in the X2Go session database. .PP -If everything works out well, a list of session attributes is returned after successful session resumption. +If everything works out well, a list of session attributes is returned after successful session resumption. Session attributes will be presented on a line-by-line basis: field 01: \fI<graphics_port>\fR diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 69d25b9..c8d99a5 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -12,12 +12,12 @@ x2gostartagent \- Start a New X2Go Session 'nh .fi .ad l -\fBx2gostartagent\fI \fI<geometry>\fR \ \\ +\fBx2gostartagent\fI \fI<geometry>\fR \ \\ \fI<link_quality>\fR \ \\ - \fI<nx_pack_meth>\fR \ \\ - \fI<cache_type+dpi>\fR \ \\ - \fI<kblayout>\fR \ \\ - \fI<kbtype>\fR \ \\ + \fI<nx_pack_meth>\fR \ \\ + \fI<cache_type+dpi>\fR \ \\ + \fI<kblayout>\fR \ \\ + \fI<kbtype>\fR \ \\ \fI<setkbd>\fR \ \\ \fI<session_type>\fR \ \\ \fI<command>\fR \ \\ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git