Project

General

Profile

« Previous | Next » 

Revision 9587

Added by Chris Jones over 8 years ago

Merge minor registry changes from the 2.6 branch back to the trunk.

refs https://github.nceas.ucsb.edu/KNB/arctic-data/issues/107

View differences:

register-dataset.cgi
2418 2418
		|| hasContent($FORM::useConstraintsOther) )
2419 2419
	{
2420 2420
		$dist .= "<intellectualRights>\n";
2421
		if ( hasContent($FORM::useConstraints) ) {
2422
			$dist .= "<para>" . normalize($FORM::useConstraints) . "</para>\n";
2423
		}
2424
		if ( hasContent($FORM::useConstraintsOther) ) {
2425
			$dist .=
2426
			  "<para>" . normalize($FORM::useConstraintsOther) . "</para>\n";
2427
		}
2428
		$dist .= "</intellectualRights>\n";
2421
        
2422
        if ( $show->{cclicenses} eq 'true' ) {
2423
            # Creative Commons license statements
2424
            if ( $FORM::useConstraints =~ /CC-0/ ) {
2425
                
2426
                $dist .= "<para>\n";
2427
                $dist .= "This work is dedicated to the public domain under the Creative Commons Universal 1.0 Public Domain Dedication.\n";
2428
                $dist .= "To view a copy of this dedication, visit https://creativecommons.org/publicdomain/zero/1.0/.\n";
2429
                $dist .= "</para>\n";
2430
                                
2431
            } else {
2432
                $dist .= "<para>\n";
2433
                $dist .= "This work is licensed under the Creative Commons Attribution 4.0 International License.\n";
2434
                $dist .= "To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/.\n";
2435
                $dist .= "</para>\n";
2436
                
2437
            }
2438
            
2439
        } else {
2440
            # Custom license statements
2441
            if ( hasContent($FORM::useConstraints) ) {
2442
            	$dist .= "<para>" . normalize($FORM::useConstraints) . "</para>\n";
2443
            }
2444
            if ( hasContent($FORM::useConstraintsOther) ) {
2445
            	$dist .=
2446
            	  "<para>" . normalize($FORM::useConstraintsOther) . "</para>\n";
2447
            }            
2448
        }
2449
        
2450
        $dist .= "</intellectualRights>\n";
2429 2451
	}
2430 2452

  
2431 2453
	if ( hasContent($FORM::url) ) {
......
5080 5102
	$$templateVars{'docid'}            = $FORM::docid;
5081 5103

  
5082 5104
	# Check if the session exists
5083
	my $session = CGI::Session->load();
5084
	if ( !( $session->is_empty || $session->is_expired ) ) {
5105
	if ( validateSession() ) {
5085 5106
		$$templateVars{'userLoggedIn'} = 'true';
5086 5107
	}
5087 5108

  

Also available in: Unified diff