diff --git a/CenIsere_AUTOMAP/tools/resources.py b/CenIsere_AUTOMAP/tools/resources.py index c2bc15f7..bf0d6ccd 100644 --- a/CenIsere_AUTOMAP/tools/resources.py +++ b/CenIsere_AUTOMAP/tools/resources.py @@ -107,25 +107,25 @@ def load_ui(*args): return ui_class -def login_base(take=None): - from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user - first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password) - first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor) - first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')") - res_ident = first_cur.fetchone() +# def login_base(take=None): +# from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user +# first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password) +# first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor) +# first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')") +# res_ident = first_cur.fetchone() - mdp = base64.b64decode(str(res_ident[0])).decode('utf-8') - user = res_ident[1] +# mdp = base64.b64decode(str(res_ident[0])).decode('utf-8') +# user = res_ident[1] - con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp) +# con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp) - cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor) - first_conn.close() +# cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor) +# first_conn.close() - if take: - return cur,con - else: - return cur +# if take: +# return cur,con +# else: +# return cur def send_issues(url,titre,body,labels): import requests import json @@ -158,7 +158,7 @@ def maj_verif(NAME): url = qgis.utils.pluginMetadata(NAME,'repository') #URL = url+'/raw/branch/main/plugins.xml' - URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml' + URL = 'https://gitea.cenra-outils.org/CEN38/Plugin_QGIS/releases/download/latest/plugins.xml' # print(URL) version = qgis.utils.pluginMetadata(NAME,'version') len_version = len(version)