Commit 87b08bf7 authored by User expired's avatar User expired
Browse files

Merge branch '160705' into 'uibk'

160705



See merge request !10
parents b9870d01 687cd52d
......@@ -127,7 +127,7 @@ function F_list_online_users($wherequery, $order_field, $orderdir, $firstrow, $r
}
echo '</td>';
echo '<td>'.$this_session['session_user_level'].'</td>';
echo '<td>'.$this_session['session_user_ip'].'</td>';
echo '<td>'.ip6toip4($this_session['session_user_ip']).'</td>';
echo '</tr>'.K_NEWLINE;
}
} else {
......
......@@ -259,7 +259,6 @@ if ($_SESSION['session_user_level'] < 10) { //not admin
$sql .= ' GROUP BY g.group_name, g.group_id ';
}
$sql .= ' ORDER BY g.group_name ';
F_print_error('INFO',$sql);
if ($r = F_db_query($sql, $db)) {
echo '<option value="0"';
if ($group_id == 0) {
......@@ -452,4 +451,4 @@ require_once('../code/tce_page_footer.php');
//============================================================+
// END OF FILE
//============================================================+
//============================================================+
\ No newline at end of file
......@@ -180,14 +180,10 @@ ALTER FUNCTION get_tcexam_group_users(character varying)
-- get tcexam_user
CREATE OR REPLACE FUNCTION get_tcexam_user(userid character varying)
RETURNS text
LANGUAGE plpgsql
SECURITY DEFINER
SET search_path TO tcexam, pg_temp
AS $function$
RETURNS text AS
$function$
DECLARE
xoutput text;
xoutput text;
BEGIN
SELECT XMLSERIALIZE ( CONTENT
......@@ -204,13 +200,15 @@ SELECT XMLSERIALIZE ( CONTENT
))) as text )
INTO xoutput
FROM tce_users u
WHERE u.user_name = userid
;
WHERE u.user_name = userid;
RETURN xoutput;
END;
$function$
LANGUAGE plpgsql VOLATILE
SECURITY DEFINER
SET search_path TO tcexam, pg_temp;
ALTER FUNCTION get_tcexam_user(character varying)
OWNER TO tcexam;
-- insert_tcexam_group
......@@ -237,18 +235,15 @@ $BODY$
SECURITY DEFINER
-- Set a secure search_path: trusted schema(s), then 'pg_temp'.
SET search_path = tcexam, pg_temp;
ALTER FUNCTION insert_tcexam_group(text, character varying, character varying, character varying)
ALTER FUNCTION insert_tcexam_group(character varying, character varying, character varying)
OWNER TO tcexam;
-- insert_tcexam_user
CREATE OR REPLACE FUNCTION insert_tcexam_user(xmlbody text)
RETURNS void
LANGUAGE plpgsql
SECURITY DEFINER
SET search_path TO tcexam, pg_temp
AS $function$
RETURNS void AS
$function$
DECLARE
login character varying;
email character varying;
......@@ -274,7 +269,9 @@ AS $function$
END;
$function$
LANGUAGE plpgsql VOLATILE
SECURITY DEFINER
SET search_path TO tcexam, pg_temp;
ALTER FUNCTION insert_tcexam_user(text)
OWNER TO tcexam;
......@@ -355,11 +352,8 @@ ALTER FUNCTION update_tcexam_group(character varying, character varying, charact
-- update_tcexam_user
CREATE OR REPLACE FUNCTION update_tcexam_user(xmlbody text)
RETURNS void
LANGUAGE plpgsql
SECURITY DEFINER
SET search_path TO tcexam, pg_temp
AS $function$
RETURNS void AS
$function$
DECLARE
login character varying;
email character varying;
......@@ -400,6 +394,9 @@ AS $function$
$function$
LANGUAGE plpgsql VOLATILE
SECURITY DEFINER
SET search_path TO tcexam, pg_temp;
ALTER FUNCTION update_tcexam_user(text)
OWNER TO tcexam;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment