From: Chris Cormack Date: Sun, 13 Jun 2010 21:15:00 +0000 (+1200) Subject: Merge commit 'kc/master' X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=4c14cd317e92cb44aed69f09e99438f694ae32e5;hp=-c;p=koha.git Merge commit 'kc/master' --- 4c14cd317e92cb44aed69f09e99438f694ae32e5 diff --combined C4/Auth.pm index ec16a27ed8,cb52a6647e..86adf88a7b --- a/C4/Auth.pm +++ b/C4/Auth.pm @@@ -84,41 -84,39 +84,39 @@@ C4::Auth - Authenticates Koha user =head1 DESCRIPTION - The main function of this module is to provide - authentification. However the get_template_and_user function has - been provided so that a users login information is passed along - automatically. This gets loaded into the template. + The main function of this module is to provide + authentification. However the get_template_and_user function has + been provided so that a users login information is passed along + automatically. This gets loaded into the template. =head1 FUNCTIONS - =over 2 - - =item get_template_and_user - - my ($template, $borrowernumber, $cookie) - = get_template_and_user( - { - template_name => "opac-main.tmpl", - query => $query, - type => "opac", - authnotrequired => 1, - flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' }, - } - ); - - This call passes the C, C and C - to C<&checkauth> (in this module) to perform authentification. - See C<&checkauth> for an explanation of these parameters. - - The C is then used to find the correct template for - the page. The authenticated users details are loaded onto the - template in the HTML::Template LOOP variable C. Also the - C is passed to the template. This can be used in templates - if cookies are disabled. It needs to be put as and input to every - authenticated page. - - More information on the C sub can be found in the - Output.pm module. + =head2 get_template_and_user + + my ($template, $borrowernumber, $cookie) + = get_template_and_user( + { + template_name => "opac-main.tmpl", + query => $query, + type => "opac", + authnotrequired => 1, + flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' }, + } + ); + + This call passes the C, C and C + to C<&checkauth> (in this module) to perform authentification. + See C<&checkauth> for an explanation of these parameters. + + The C is then used to find the correct template for + the page. The authenticated users details are loaded onto the + template in the HTML::Template LOOP variable C. Also the + C is passed to the template. This can be used in templates + if cookies are disabled. It needs to be put as and input to every + authenticated page. + + More information on the C sub can be found in the + Output.pm module. =cut @@@ -397,15 -395,6 +395,15 @@@ sub get_template_and_user } elsif($mylibraryfirst){ $opac_name = C4::Branch::GetBranchName($mylibraryfirst); } + my $checkstyle = C4::Context->preference("opaccolorstylesheet"); + if ($checkstyle =~ /http/) + { + $template->param( opacexternalsheet => $checkstyle); + } else + { + my $opaccolorstylesheet = C4::Context->preference("opaccolorstylesheet"); + $template->param( opaccolorstylesheet => $opaccolorstylesheet); + } $template->param( AmazonContent => "" . C4::Context->preference("AmazonContent"), AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"), @@@ -445,6 -434,7 +443,6 @@@ hidelostitems => C4::Context->preference("hidelostitems"), mylibraryfirst => (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv) ? C4::Context->userenv->{'branch'} : '', opaclayoutstylesheet => "" . C4::Context->preference("opaclayoutstylesheet"), - opaccolorstylesheet => "" . C4::Context->preference("opaccolorstylesheet"), opacstylesheet => "" . C4::Context->preference("opacstylesheet"), opacbookbag => "" . C4::Context->preference("opacbookbag"), opaccredits => "" . C4::Context->preference("opaccredits"), @@@ -479,7 -469,7 +477,7 @@@ return ( $template, $borrowernumber, $cookie, $flags); } - =item checkauth + =head2 checkauth ($userid, $cookie, $sessionID) = &checkauth($query, $noauth, $flagsrequired, $type); @@@ -518,17 -508,17 +516,17 @@@ If the GranularPermissions system prefe value of each key in the C hash takes on an additional meaning, e.g., - =item 1 + 1 The user must have access to all subfunctions of the module specified by the hash key. - =item * + * The user must have access to at least one subfunction of the module specified by the hash key. - =item specific permission, e.g., 'export_catalog' + specific permission, e.g., 'export_catalog' The user must have access to the specific subfunction list, which must correspond to a row in the permissions table. @@@ -927,15 -917,6 +925,15 @@@ sub checkauth my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tmpl' : 'auth.tmpl'; my $template = gettemplate( $template_name, $type, $query ); $template->param(branchloop => \@branch_loop,); + my $checkstyle = C4::Context->preference("opaccolorstylesheet"); + if ($checkstyle =~ /\//) + { + $template->param( opacexternalsheet => $checkstyle); + } else + { + my $opaccolorstylesheet = C4::Context->preference("opaccolorstylesheet"); + $template->param( opaccolorstylesheet => $opaccolorstylesheet); + } $template->param( login => 1, INPUTS => \@inputs, @@@ -949,6 -930,7 +947,6 @@@ opacreadinghistory => C4::Context->preference("opacreadinghistory"), opacsmallimage => C4::Context->preference("opacsmallimage"), opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"), - opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"), opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"), opacuserjs => C4::Context->preference("opacuserjs"), opacbookbag => "" . C4::Context->preference("opacbookbag"), @@@ -996,7 -978,7 +994,7 @@@ exit; } - =item check_api_auth + =head2 check_api_auth ($status, $cookie, $sessionId) = check_api_auth($query, $userflags); @@@ -1016,7 -998,7 +1014,7 @@@ are OK Possible return values in C<$status> are: - =over 4 + =over =item "ok" -- user authenticated; C<$cookie> and C<$sessionid> have valid values. @@@ -1230,7 -1212,7 +1228,7 @@@ sub check_api_auth } } - =item check_cookie_auth + =head2 check_cookie_auth ($status, $sessionId) = check_api_auth($cookie, $userflags); @@@ -1243,7 -1225,7 +1241,7 @@@ have been authenticated in the usual wa Possible return values in C<$status> are: - =over 4 + =over =item "ok" -- user authenticated; C<$sessionID> have valid values. @@@ -1339,7 -1321,7 +1337,7 @@@ sub check_cookie_auth } } - =item get_session + =head2 get_session use CGI::Session; my $session = get_session($sessionID); @@@ -1443,7 -1425,7 +1441,7 @@@ sub checkpw return 0; } - =item getuserflags + =head2 getuserflags my $authflags = getuserflags($flags, $userid, [$dbh]); @@@ -1483,24 -1465,20 +1481,20 @@@ sub getuserflags return $userflags; } - =item get_user_subpermissions - - =over 4 + =head2 get_user_subpermissions - my $user_perm_hashref = get_user_subpermissions($userid); - - =back + $user_perm_hashref = get_user_subpermissions($userid); Given the userid (note, not the borrowernumber) of a staff user, return a hashref of hashrefs of the specific subpermissions accorded to the user. An example return is - { + { tools => { export_catalog => 1, import_patrons => 1, } - } + } The top-level hash-key is a module or function code from userflags.flag, while the second-level key is a code @@@ -1531,13 -1509,9 +1525,9 @@@ sub get_user_subpermissions return $user_perms; } - =item get_all_subpermissions - - =over 4 + =head2 get_all_subpermissions - my $perm_hashref = get_all_subpermissions(); - - =back + my $perm_hashref = get_all_subpermissions(); Returns a hashref of hashrefs defining all specific permissions currently defined. The return value @@@ -1561,7 -1535,7 +1551,7 @@@ sub get_all_subpermissions return $all_perms; } - =item haspermission + =head2 haspermission $flags = ($userid, $flagsrequired); @@@ -1631,8 -1605,6 +1621,6 @@@ END { } # module clean-up code here 1; __END__ - =back - =head1 SEE ALSO CGI(3)