diff --git a/Rocksolid_Light/debian-install.sh b/Rocksolid_Light/debian-install.sh index fd4e576..540aed9 100755 --- a/Rocksolid_Light/debian-install.sh +++ b/Rocksolid_Light/debian-install.sh @@ -109,6 +109,7 @@ sed -i '' -e "s||$anonymous_password|" $configpath/rslight.i sed -i '' -e "s||$local_password|" $configpath/rslight.inc.php sed -i '' -e "s||$admin_password|" $configpath/admin.inc.php sed -i '' -e "s||$admin_key|" $configpath/admin.inc.php +sed -i '' -e "s||/var/lib/php/sessions|" $configpath/rslight.inc.php echo "done" echo echo "***************************************************" diff --git a/Rocksolid_Light/freebsd-install.sh b/Rocksolid_Light/freebsd-install.sh index 251716e..99ca126 100755 --- a/Rocksolid_Light/freebsd-install.sh +++ b/Rocksolid_Light/freebsd-install.sh @@ -108,6 +108,7 @@ sed -i '' -e "s||$anonymous_password|" $configpath/rslight.i sed -i '' -e "s||$local_password|" $configpath/rslight.inc.php sed -i '' -e "s||$admin_password|" $configpath/admin.inc.php sed -i '' -e "s||$admin_key|" $configpath/admin.inc.php +sed -i '' -e "s||/tmp|" $configpath/rslight.inc.php echo "done" echo echo "***************************************************" diff --git a/Rocksolid_Light/rocksolid/tail.inc b/Rocksolid_Light/rocksolid/tail.inc index ac35543..4c0667e 100644 --- a/Rocksolid_Light/rocksolid/tail.inc +++ b/Rocksolid_Light/rocksolid/tail.inc @@ -1,10 +1,11 @@ -
- -rocksolid light 0.6.9 -
-clearnet -i2p -tor -
-
- +'; +echo ''; +echo 'rocksolid light 0.6.9'; +echo '
'; +echo 'clearnet'; +echo 'i2p'; +echo 'tor'; +echo '
'; +echo ''; +?> diff --git a/Rocksolid_Light/rocksolid/thread.php b/Rocksolid_Light/rocksolid/thread.php index 3e795cd..ee56d7f 100644 --- a/Rocksolid_Light/rocksolid/thread.php +++ b/Rocksolid_Light/rocksolid/thread.php @@ -137,5 +137,7 @@ if(isset($frames_on) && $frames_on === true) { } else { echo $text_register["no_access_group"]; } +$sessions_data = file_get_contents($spooldir.'/sessions.dat'); +echo '

'.$sessions_data.'

'; include "tail.inc"; ?> diff --git a/Rocksolid_Light/rslight/rslight.inc.php b/Rocksolid_Light/rslight/rslight.inc.php index eeb689e..62d8a53 100644 --- a/Rocksolid_Light/rslight/rslight.inc.php +++ b/Rocksolid_Light/rslight/rslight.inc.php @@ -37,7 +37,7 @@ return [ 'spamc' => 'spamc', 'spamgroup' => 'rocksolid.spam', 'php_exec' => 'php', - 'tac' => 'tac', + 'tac' => '', 'webserver_user' => '', 'enable_nocem' => '', 'nocem_groups' => 'rocksolid.spam', diff --git a/Rocksolid_Light/rslight/scripts/count_users.php b/Rocksolid_Light/rslight/scripts/count_users.php new file mode 100755 index 0000000..eb82bf2 --- /dev/null +++ b/Rocksolid_Light/rslight/scripts/count_users.php @@ -0,0 +1,40 @@ +There '.$are.' currently '.$count.' '. $users.' online'."\r\n"; + file_put_contents($session_save_file, $session_info); +} +?> diff --git a/Rocksolid_Light/rslight/scripts/cron.php b/Rocksolid_Light/rslight/scripts/cron.php index dc84d1d..8325ea5 100755 --- a/Rocksolid_Light/rslight/scripts/cron.php +++ b/Rocksolid_Light/rslight/scripts/cron.php @@ -25,11 +25,14 @@ } } fclose($fp1); - exec($CONFIG['php_exec']." ".$config_dir."scripts/nntp.php > /dev/null 2>&1"); + exec($CONFIG['php_exec']." ".$config_dir."/scripts/nntp.php > /dev/null 2>&1"); if(is_numeric($CONFIG['local_ssl_port'])) { - exec($CONFIG['php_exec']." ".$config_dir."scripts/nntp-ssl.php > /dev/null 2>&1"); + exec($CONFIG['php_exec']." ".$config_dir."/scripts/nntp-ssl.php > /dev/null 2>&1"); } } +# Generate user count file (must be root) + exec($CONFIG['php_exec']." ".$config_dir."/scripts/count_users.php"); + echo "Updated user count\n"; /* Change to non root user */ $uinfo=posix_getpwnam($CONFIG['webserver_user']); change_identity($uinfo["uid"],$uinfo["gid"]); @@ -39,7 +42,7 @@ if(isset($CONFIG['enable_nocem']) && $CONFIG['enable_nocem'] == true) { @mkdir($spooldir."nocem",0755,'recursive'); - exec($CONFIG['php_exec']." ".$config_dir."scripts/nocem.php"); + exec($CONFIG['php_exec']." ".$config_dir."/scripts/nocem.php"); } reset($menulist); @@ -51,14 +54,14 @@ foreach($menulist as $menu) { chdir("../".$menuitem[0]); # Send articles echo "Sending articles\n"; - echo exec($CONFIG['php_exec']." ".$config_dir."scripts/send.php"); + echo exec($CONFIG['php_exec']." ".$config_dir."/scripts/send.php"); # Refresh spool if(isset($spoolnews) && ($spoolnews == true)) { - exec($CONFIG['php_exec']." ".$config_dir."scripts/spoolnews.php"); + exec($CONFIG['php_exec']." ".$config_dir."/scripts/spoolnews.php"); echo "Refreshed spoolnews\n"; } # Expire articles - exec($CONFIG['php_exec']." ".$config_dir."scripts/expire.php"); + exec($CONFIG['php_exec']." ".$config_dir."/scripts/expire.php"); echo "Expired articles\n"; } # Rotate log files diff --git a/Rocksolid_Light/rslight/scripts/setuphelper.php b/Rocksolid_Light/rslight/scripts/setuphelper.php index c5001b9..6c2feb7 100644 --- a/Rocksolid_Light/rslight/scripts/setuphelper.php +++ b/Rocksolid_Light/rslight/scripts/setuphelper.php @@ -51,7 +51,7 @@ return [ # Executables on your system 'php_exec' => 'The path to php, or just php if it is already in your path', -'tac' => 'The shell command to display a file in reverse (Try tac, or tail -r)', +'tac' => 'Path to php session files (leave empty to not display number of users online)', 'webserver_user' => 'The user that your webserver runs as', # NOCEM