remove pm_user_info

szabgab · Mar 30, 2024 · 60512a5 · 60512a5
1 parent a0b1ff4
commit 60512a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 99 deletions.
diff --git a/lib/Perl/Maven.pm b/lib/Perl/Maven.pm
@@ -32,9 +32,7 @@ use Perl::Maven::Config;
 use Perl::Maven::Page;
 use Perl::Maven::Tools;
 use Perl::Maven::WebTools
-	qw(logged_in get_ip mymaven pm_error pm_template read_tt pm_show_abstract pm_show_page authors pm_message pm_user_info);
-
-prefix '/';
+	qw(get_ip mymaven pm_error pm_template read_tt pm_show_abstract pm_show_page authors pm_message);
 
 require Perl::Maven::Consultants;
 
@@ -293,9 +291,6 @@ hook before_template => sub {
 	$t->{angular_cdn}   = 'https://ajax.googleapis.com/ajax/libs';
 	$t->{bootstrap_cdn} = 'https://maxcdn.bootstrapcdn.com';
 
-	$t->{user_info}      = pm_user_info();
-	$t->{user_info_json} = to_json $t->{user_info};
-
 	#die Dumper $t;
 
 	return;
@@ -827,11 +822,6 @@ get qr{^/media/(.+)} => sub {
 	my ($item) = splat;
 	error if $item =~ /\.\./;
 
-	if ( $item =~ m{^pro/} and not is_special( 'free', "/$item" ) ) {
-		my $product = 'code_maven_pro';
-		return 'error: not logged in' if not logged_in();
-	}
-
 	push_response_header 'X-Accel-Redirect' => "/send/$item";
 
 	if ( $item =~ /\.(mp4|webm|avi|ogv)$/ ) {
@@ -1080,11 +1070,6 @@ sub log_request {
 		$details{elapsed_time} = Time::HiRes::time - $start_time;
 	}
 
-	# TODO if there are entries in the session, move them to the database
-	if (logged_in) {
-		$details{uid} = session('uid');
-	}
-
 	return if response->status != 200;
 	return if $uri =~ m{^/atom};
 	return if $uri =~ m{^/robots.txt};

diff --git a/lib/Perl/Maven/WebTools.pm b/lib/Perl/Maven/WebTools.pm
@@ -81,7 +81,7 @@ my %RESOURCES = (
 
 use Exporter qw(import);
 our @EXPORT_OK
-	= qw(logged_in is_admin get_ip mymaven valid_ip _generate_code _registration_form pm_template read_tt pm_show_abstract pm_show_page authors pm_error pm_message pm_user_info);
+	= qw(logged_in is_admin get_ip mymaven valid_ip _generate_code _registration_form pm_template read_tt pm_show_abstract pm_show_page authors pm_error pm_message);
 
 sub myhost {
 	my $host = request->host;
@@ -369,87 +369,5 @@ sub _read_authors {
 	return;
 }
 
-sub pm_user_info {
-	my %data = ( logged_in => logged_in(), );
-	my $uid  = session('uid');
-	if ($uid) {
-		my $db = setting('db');
-		$data{code_maven_pro} = $db->is_subscribed( $uid, 'code_maven_pro' );
-		my $user = $db->get_user_by_id($uid);
-		$data{admin} = $user->{admin} ? 1 : 0;
-	}
-
-	# adding popups:
-
-	#my @popups = (
-	#	{
-	#		logged_in => 1,
-	#		what => 'popup_logged_in',
-	#		when => 1000,
-	#	 	frequency => 60*60*24,   # not more than
-	# } );
-	my $referrer = request->referer || '';
-	my $url      = request->base    || '';
-	my $path     = request->path    || '';
-
-	$referrer =~ s{^(https?://[^/]*/).*}{$1};
-
-	#debug("referrer = '$referrer'");
-	#debug("url = '$url'");
-	return \%data if $path =~ m{^/pm/};
-
-	if ( mymaven->{conf}{enable_popups} ) {
-		foreach my $code ( keys %{ mymaven->{popups} } ) {
-			my $pop = mymaven->{popups}{$code};
-			next if not $pop->{on};
-			if ( $pop->{incoming_only} and $url eq $referrer ) {
-				next;
-			}
-			if ( $pop->{logged_in} and not logged_in() ) {
-				next;
-			}
-			if ( $pop->{logged_out} and logged_in() ) {
-				next;
-			}
-			my $frequency = 0;
-			if ( $pop->{frequency} =~ /^(\d+)([dhms]?)$/ ) {
-				my ( $m, $t ) = ( $1, $2 );
-				$t //= 's';
-				my %sec = (
-					s => 1,
-					m => 60,
-					h => 60 * 60,
-					d => 60 * 60 * 24,
-				);
-				$frequency = $m * $sec{$t};
-			}
-			my $seen = session($code);
-			if ( $seen and $seen > time - $frequency ) {
-				next;
-			}
-			session( $code, time );
-			$data{delayed} = {
-				what => $code,
-				when => $pop->{delay},
-			};
-		}
-
-		# TODO: only if not a pro subscriber yet
-		# code_maven_pro_logged_in:
-		#   incoming_only: 1
-		#   logged_in: 1
-		#   logged_out: 0
-		#   frequency: '1d'
-		#   delay: 1000
-		# code_maven_pro_logged_out:
-		#   incoming_only: 1
-		#   logged_in: 0
-		#   logged_out: 1
-		#   frequency: '1d'
-		#   delay: 1000
-	}
-	return \%data;
-}
-
 true;