com web/master: Kill a tiny svn-auth.inc: entry/svn-account.php forgot.php include/cvs-auth.inc include/svn-auth.inc

Commit: f4e4f1eac662b46585ebeff020b52988191a600b Author: Hannes Magnusson <bjori@mongodb.com> Tue, 10 Dec 2013 20:01:32 -0800 Parents: c659097ec0d0a08327b80c1b32ac0797f35ba5dd Branches: master Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=f4e4f1eac662b46585ebeff020b52988191a600b Log: Kill a tiny svn-auth.inc Changed paths: M entry/svn-account.php M forgot.php M include/cvs-auth.inc D include/svn-auth.inc Diff: diff --git a/entry/svn-account.php b/entry/svn-account.php index d19550a..91f3fce 100644 --- a/entry/svn-account.php +++ b/entry/svn-account.php @@ -1,8 +1,8 @@ <?php -require 'email-validation.inc'; -require dirname(__FILE__) . '/../include/svn-auth.inc'; -require 'functions.inc'; +require dirname(__FILE__) . '/../email-validation.inc'; +require dirname(__FILE__) . '/../include/cvs-auth.inc'; +require dirname(__FILE__) . '/../functions.inc'; $valid_vars = array('name','email','username','passwd','note','group','yesno'); foreach($valid_vars as $k) { diff --git a/forgot.php b/forgot.php index 0a18646..5629bd0 100644 --- a/forgot.php +++ b/forgot.php @@ -1,6 +1,6 @@ <?php // vim: et ts=2 sw=2 require 'functions.inc'; -require dirname(__FILE__) . "/include/svn-auth.inc"; +require dirname(__FILE__) . "/include/cvs-auth.inc"; $valid_vars = array('id','user','key','n1','n2'); foreach($valid_vars as $k) { diff --git a/include/cvs-auth.inc b/include/cvs-auth.inc index 05ae1ed..e979140 100644 --- a/include/cvs-auth.inc +++ b/include/cvs-auth.inc @@ -3,7 +3,13 @@ define("LOGIN_IGNORE_PWD", FALSE); define("LOGIN_PWD_FILE", "/repository/CVSROOT/passwd"); -require dirname(__FILE__) . "/svn-auth.inc"; +require dirname(__FILE__) . "/cvs-auth.inc"; + +define("REALM", "PHP Subversion Repository"); + +function gen_svn_pass($username, $password) { + return md5(sprintf("%s:%s:%s", $username, REALM, $password)); +} function find_password($user) { diff --git a/include/svn-auth.inc b/include/svn-auth.inc deleted file mode 100644 index 7755af7..0000000 --- a/include/svn-auth.inc +++ /dev/null @@ -1,7 +0,0 @@ -<?php -define("REALM", "PHP Subversion Repository"); - -function gen_svn_pass($username, $password) { - return md5(sprintf("%s:%s:%s", $username, REALM, $password)); -} -