mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-12-23 06:09 pm

[dw-nonfree] Remove ljlib-local.pl and dw-nonfree.pl

[commit: http://hg.dwscoalition.org/dw-nonfree/rev/ea2a3f56474d]

http://bugs.dwscoalition.org/show_bug.cgi?id=2247

Now that bug #1440 has been done, we can remove these files as extraneous.

Patch by [staff profile] mark.

Files modified:
  • cgi-bin/dw-nonfree.pl
  • cgi-bin/ljlib-local.pl
--------------------------------------------------------------------------------
diff -r 8dab27b47822 -r ea2a3f56474d cgi-bin/dw-nonfree.pl
--- a/cgi-bin/dw-nonfree.pl	Wed Dec 23 17:32:42 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#!/usr/bin/perl
-#
-# THIS IS NOT LICENSED FOR USE.
-#
-
-LJ::Hooks::register_hook("journal_base", sub {
-    my ($u, $vhost) = @_;
-    return undef unless $LJ::ONLY_USER_VHOSTS;
-    return "#" unless $u;
-
-    # rule format:
-    #    accounttype => [$use_user_vhost_if_no_underscore, $domain_to_use_otherwise]
-
-    my $rules = {
-        'P' => [1, "users.$LJ::DOMAIN"],
-        'Y' => [1, "syndicated.$LJ::DOMAIN"],
-        'C' => [1, "community.$LJ::DOMAIN"],
-    };
-    my $rule = $rules->{$u->{journaltype}} || $rules->{'P'};
-
-    my $use_user_vhost =
-        $rule->[0] && $u->{user} !~ /^\_/ && $u->{user} !~ /\_$/;
-
-    if ($use_user_vhost) {
-        my $udom = $u->{user};
-        $udom =~ s/\_/-/g;
-        return "http://$udom.$LJ::DOMAIN";
-    } else {
-        return "http://$rule->[1]/$u->{user}";
-    }
-});
-
diff -r 8dab27b47822 -r ea2a3f56474d cgi-bin/ljlib-local.pl
--- a/cgi-bin/ljlib-local.pl	Wed Dec 23 17:32:42 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-#
-
-use lib "$ENV{LJHOME}/cgi-bin";
-require "dw-nonfree.pl";
-
-1;
--------------------------------------------------------------------------------