diff -w -B --recursive --new-file -u bibadmin-0.5/account.php bibadmin/account.php --- bibadmin-0.5/account.php 2005-11-28 11:26:11.000000000 +0100 +++ bibadmin/account.php 2005-12-14 09:47:17.000000000 +0100 @@ -47,6 +47,7 @@ } function getCol($col){ + global $server_http_protocol; if (empty($col)) return ' Df '; else if (strtolower($col)=='none') @@ -268,7 +269,7 @@ $headers = get_mail_headers($logged_user->email, false, '', true, $admin_mail, 'html'); $req_path = $_SERVER['REQUEST_URI']; if (is_integer($pos = strrpos($req_path, "/"))) $req_path = substr($req_path, 0, $pos+1); - $req_path = "http://".$_SERVER['SERVER_NAME'].$req_path; + $req_path = $server_http_protocol."://".$_SERVER['SERVER_NAME'].$req_path; mail($ad_usr->email, $mail_subj_prefix.'[ACCOUNT] '.$user.' has '.($approve_uid?'ENABLED ':($deny_uid?'DISABLED ':' ')).$ad_usr->first_name.' '.$ad_usr->last_name.'\'s account \''.$ad_usr->user.'\'', "Dear ".$ad_usr->first_name.' '.$ad_usr->last_name.',

'.$user.' has '.($approve_uid?'enabled':($deny_uid?'disabled':''))." your account on ".$team_name." ".$publicationl.'s server.

'.($approve_uid?'You can now login and add/modify your publications.

':($deny_uid?'You can no longer login on this server!

':''))."
--
".$req_path."", $headers); } } else { @@ -612,8 +613,8 @@ $headers = get_mail_headers($email, false, '', false, '', 'html'); mail($admin_mail, $mail_subj_prefix.'['.(empty($modify)?"ADD":"MODIFY")." USER] $f_name $l_name ($user_n) from $comp_name/$ip", "
".(empty($modify)?($users_approve_creation?'Request to add a':'Added').' new':"Modified #$userid")." user from IP: $comp_name / $ip

First name: $f_name
Last name: $l_name
Login User Name: $user_n
E-mail: ".str_replace('<','<',str_replace('>','>',$email))."


". - ((empty($modify) && $users_approve_creation)?"To activate this account, click here (administrator login required).

-To deny this account creation request, click here (administrator login required)." + ((empty($modify) && $users_approve_creation)?"To activate this account, click here (administrator login required).

+To deny this account creation request, click here (administrator login required)." :''), $headers); if (!$users_approve_creation) { setcookie('user', $l_name.", ".$f_name); @@ -681,7 +682,7 @@ echo titlu("left", "$subt_col", "000000", "  ".$test); } - if ($users_approve_creation && !$acc_created_and_w) { + if (/*$users_approve_creation &&*/ !$acc_created_and_w) { echo "\n\n". (empty($chg)?"":"
\n". @@ -703,8 +704,8 @@ $current_dir = substr($current_dir, 0, $pos); unset($pos); $current_dir = substr($current_dir, 0, strrpos($current_dir, "/")); - echo ((empty($chg) || $chg=='sty' || ($chg=='all' && $allfields))?get_li((!empty($chg)?'CSS ':'').'Style', 'text', 'css', (empty($chg)?'CSS: '.(empty($css)?'Empty':'OK').'
My URL: '.((empty($userid) || empty($auth_id))?'Empty':"OK")."
$btbColors:  ".getCol($body_col).' '.getCol($tit_c).' '. getCol($st_c).' '. getCol($col_1).' '. getCol($col_2).''.$etb."$etb":$css), '70', (empty($chg)?"":'')) :''). - (($chg=='sty' || ($chg=='all' && $allfields))?get_li('My URL', '', '', ((empty($userid) || empty($auth_id))?'Empty':''."http://". $_SERVER["HTTP_HOST"] . $current_dir .'/'. $show_sc."?author=$auth_ident&col_uid=$userid
  (You must have &col_uid=$userid in the URL, then put the URL on your home page).".''), '', ''). + echo ((empty($chg) || $chg=='sty' || ($chg=='all' && $allfields))?get_li((!empty($chg)?'CSS ':'').'Style', 'text', 'css', (empty($chg)?'CSS: '.(empty($css)?'Empty':'OK').'
My URL: '.((empty($userid) || empty($auth_id))?'Empty':"OK")."
$btb
  Change
Colors:  ".getCol($body_col).' '.getCol($tit_c).' '. getCol($st_c).' '. getCol($col_1).' '. getCol($col_2).''.$etb."$etb":$css), '70', (empty($chg)?"":'')) :''). + (($chg=='sty' || ($chg=='all' && $allfields))?get_li('My URL', '', '', ((empty($userid) || empty($auth_id))?'Empty':''.$server_http_protocol."://". $_SERVER["HTTP_HOST"] . $current_dir .'/'. $show_sc."?author=$auth_ident&col_uid=$userid
  (You must have &col_uid=$userid in the URL, then put the URL on your home page).".''), '', ''). ''. get_li('Body color', 'text', 'body_col', $body_col, '20', ''). get_li('Title color', 'text', 'tit_c', $tit_c, '20', ''). diff -w -B --recursive --new-file -u bibadmin-0.5/basket.php bibadmin/basket.php --- bibadmin-0.5/basket.php 2005-11-28 11:26:11.000000000 +0100 +++ bibadmin/basket.php 2005-12-13 10:01:09.000000000 +0100 @@ -35,7 +35,7 @@ function download(&$res, $ids, $file_name, $title) { - global $default_dnwl_file_name, $host, $login_user_db, $login_pass_db, $db_bibliography, $tb_publications, $user; + global $default_dnwl_file_name, $host, $login_user_db, $login_pass_db, $db_bibliography, $tb_publications, $user, $server_http_protocol; if (empty($file_name)) $file_name = $default_dnwl_file_name; header("Content-Type: application/octet-stream"); @@ -44,7 +44,7 @@ echo "\n % -% GENERATED FROM http://".$_SERVER["HTTP_HOST"].$_SERVER["PATH_INFO"]." +% GENERATED FROM ".$server_http_protocol."://".$_SERVER["HTTP_HOST"].$_SERVER["PATH_INFO"]." % by : ".(empty($user)?"anonymous":$user)." % IP : ".getHostByAddr(GetEnv("REMOTE_ADDR"))." % at : ".date ("r")." GMT diff -w -B --recursive --new-file -u bibadmin-0.5/bibadmin.js bibadmin/bibadmin.js --- bibadmin-0.5/bibadmin.js 2005-11-28 11:26:11.000000000 +0100 +++ bibadmin/bibadmin.js 2005-12-14 22:21:38.000000000 +0100 @@ -357,9 +357,12 @@ else trms = trms.replace(re, ' '); } +// var re2 = new RegExp ('+', 'gi'); +// trms=trms.replace(re2, '%2b'); re=new RegExp (' ', 'gi'); trms=trms.replace(re,'+'); trms=escape(trms); +// trms=encodeURIComponent(trms); if (document.search.action.indexOf('?')>0) re='&'; else diff -w -B --recursive --new-file -u bibadmin-0.5/create_db.php bibadmin/create_db.php --- bibadmin-0.5/create_db.php 2005-11-28 11:26:11.000000000 +0100 +++ bibadmin/create_db.php 2005-12-13 22:32:34.000000000 +0100 @@ -121,7 +121,7 @@ surname VARCHAR(30) default NULL, ident VARCHAR(30) default NULL, homepage VARCHAR(255) default NULL, - indexed ENUM('".$status_list[0]."', '".$status_list[1]."', '".$status_list[2]."') NOT NULL default '".$status_list[0]."', + indexed ENUM('".$status_list[0]."', '".$status_list[1]."', '".$status_list[2]."') NOT NULL default '".$status_list[$default_status]."', valid char(1) NOT NULL default 'y', PRIMARY KEY (`id`), KEY `name` (`name`), diff -w -B --recursive --new-file -u bibadmin-0.5/delete.php bibadmin/delete.php --- bibadmin-0.5/delete.php 2005-11-28 11:26:11.000000000 +0100 +++ bibadmin/delete.php 2005-12-13 10:01:41.000000000 +0100 @@ -25,7 +25,7 @@ global $db_bibliography, $tb_publications, $tb_authors, $tb_pub_to_auth, $tb_keywords, $tb_pub_to_keyw, $tb_bib_to_pub, $tb_bibs, $tb_comments, $warn_col, $var_methods_type, $userid, $admin_mail, $user, $subt_col, $tm, $modifs_save_copy, - $modifs_notify_admins, $user_admin, $tb_tmp_pubs, $account_sc, $publicationl, $webm_mail, $tb_users, $mail_subj_prefix; + $modifs_notify_admins, $user_admin, $tb_tmp_pubs, $account_sc, $publicationl, $webm_mail, $tb_users, $mail_subj_prefix, $server_http_protocol; if ($tm || ($modifs_notify_admins && !$user_admin)) { //send notification email @@ -39,7 +39,7 @@ unset($pos); if (is_integer($pos = strrpos($req_path, "/"))) $req_path = substr($req_path, 0, $pos + 1); - mail($admin_mail, $mail_subj_prefix."[DELETE PUB] ".($user?$user:"$comp_name").($tm?'':" deleted")." pub #$record_id from $comp_name/$ip", "User: ".($user?"$user":"Not logged in")."     from IP: $comp_name / $ip

".($tm?"wants to DELETE":"has DELETED")." the following ".$publicationl.":

".$publi."


Click here to see this modification.", $headers); + mail($admin_mail, $mail_subj_prefix."[DELETE PUB] ".($user?$user:"$comp_name").($tm?'':" deleted")." pub #$record_id from $comp_name/$ip", "User: ".($user?"$user":"Not logged in")."     from IP: $comp_name / $ip

".($tm?"wants to DELETE":"has DELETED")." the following ".$publicationl.":

".$publi."


Click here to see this modification.", $headers); //end send notification mail } diff -w -B --recursive --new-file -u bibadmin-0.5/fc_common.php bibadmin/fc_common.php --- bibadmin-0.5/fc_common.php 2005-11-28 11:26:11.000000000 +0100 +++ bibadmin/fc_common.php 2005-12-14 22:22:29.000000000 +0100 @@ -360,7 +360,7 @@ function search_f($script_name, $terms, $in, $leastthree, $small) { global $user; - return "".(!$small?" + return "".(!$small?"     Search for: ":' Search: ')."":">")." in ".($small?"":'')."
  Change

     Set your custom colors:
         - to use default color leave the field empty,
         - to use no color, just put none in the field.
@@ -76,7 +76,7 @@ if (is_integer($pos = strpos($req_path, "?"))) $req_path = substr($req_path, 0, $pos); unset($pos); if (is_integer($pos = strrpos($req_path, "/"))) $req_path = substr($req_path, 0, $pos + 1); - $req_path = "http://".$_SERVER['SERVER_NAME'].$req_path . $account_sc.'?ch=pass'; + $req_path = $server_http_protocol."://".$_SERVER['SERVER_NAME'].$req_path . $account_sc.'?ch=pass'; mail(str_replace('<','<',str_replace('>','>',$row->email)), $mail_subj_prefix." Your account informations on $team_name ".$publication.'s server', "Your username and new password information on $team_name ".$publication."s server are:


User: ".$row->user."
Password: ".$new_pass."



You should change your password at:
$req_path

", $headers); echo "
New password generated and sent to ".str_replace('<','<',str_replace('>','>',$row->email)); diff -w -B --recursive --new-file -u bibadmin-0.5/parameters.php bibadmin/parameters.php --- bibadmin-0.5/parameters.php 2005-11-28 18:00:19.000000000 +0100 +++ bibadmin/parameters.php 2006-04-05 16:53:36.000000000 +0200 @@ -40,6 +40,11 @@ /* Set the favourite icon */ $shortcut_icon = 'images/favicon.ico'; +/* Set the http-server's hyper tranpsort protocol used for downloads and + accout purposes: + chose between 'http' and 'https' */ +$server_http_protocol = 'http'; + /* Webmaster mail and displayed name (no email is visible to visitors nor to users) */ $webm_mail = ''; @@ -131,6 +136,16 @@ accounts. (Use $modifs_notify_admins above to disable notifications)*/ $admin_mail = false; +/* Code diacritical characters in bibtex-output. If set most characters 0xC0 to 0xFF + of the ISO/IEC 8859-1 table will be printed as e.g. ä => {\"a}, etc. */ + +$code_diacritical_out = true; + +/* Code diacritical characters in bibtex-input. If set most characters 0xC0 to 0xFF + of the ISO/IEC 8859-1 table will be printed as e.g. {\"a} => ä etc. */ + +$code_diacritical_in = true; + /* Other settings (play with then if you like) */ @@ -206,6 +221,7 @@ // 'Booklet', 'MastersThesis', 'TechReport', 'Manual', 'Unpublished', 'Misc'); $status_list = array('Actual '.$team_name.' member', 'Past '.$team_name.' member', 'Not an '.$team_name.' member'); +$default_status = 2; //set to 0..$status_sist.sizeof() $var_methods_type = array('GET', 'POST', 'COOKIE');