diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2018-11-06 18:29:57 +0100 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2018-11-06 18:29:57 +0100 |
| commit | 1f855e7be10e9ed413755e4824cddfce6ba26e3b (patch) | |
| tree | 6daf88aaa9055bed8fab3c16bc48c90d6d7bcf40 | |
| parent | 83b821e00d6880abac8346287c0e8da3db2478ee (diff) | |
#872: Adapting commits {{{991ad53}}} and {{{131f02b}}} from devel to master branch.
| -rw-r--r-- | admin/WebConsole/controlpostacceso.php | 27 | ||||
| -rw-r--r-- | admin/WebConsole/idiomas/php/cat/acceso_cat.php | 3 | ||||
| -rw-r--r-- | admin/WebConsole/idiomas/php/eng/acceso_eng.php | 31 | ||||
| -rw-r--r-- | admin/WebConsole/idiomas/php/esp/acceso_esp.php | 2 | ||||
| -rw-r--r-- | doc/CHANGELOG.es.txt | 2 | ||||
| -rwxr-xr-x | installer/opengnsys_installer.sh | 2 |
6 files changed, 45 insertions, 22 deletions
diff --git a/admin/WebConsole/controlpostacceso.php b/admin/WebConsole/controlpostacceso.php index 08e6d3f2..55710553 100644 --- a/admin/WebConsole/controlpostacceso.php +++ b/admin/WebConsole/controlpostacceso.php @@ -17,7 +17,7 @@ include_once("./clases/AdoPhp.php"); $ident=""; $idc=0; $iph=""; // Switch menu cliente - + if (isset($_POST["usu"])) $usu=mysql_escape_string($_POST["usu"]); if (isset($_POST["pss"])) $pss=mysql_escape_string($_POST["pss"]); if (isset($_POST["idcentro"])) $idc=mysql_escape_string($_POST["idcentro"]); @@ -168,6 +168,28 @@ if ($idc != 0) return(true); } //_______________________________________________________________________________________________________ + // Muestra mensaje de alerta si no existe repositorio en la unidad organizativa + // Parametros: + // - cmd:Una comando ya operativo (con conexión abierta) + // - idcentro: identificador de la unidad organizativa + //_______________________________________________________________________________________________________ + function alert_norepo($cmd, $idcentro,$mensaje){ + $idrepositorio = ''; + $rs=new Recordset; + $cmd->texto="SELECT idrepositorio FROM repositorios ". + " WHERE idcentro=$idcentro LIMIT 1;"; + $rs->Comando=&$cmd; + if ($rs->Abrir()) { + $rs->Primero(); + $idrepositorio = $rs->campos["idrepositorio"]; + } + $rs->Cerrar(); + if ($idrepositorio == '') { + echo 'alert("'.$mensaje.'");'; + } + return; + + } ?> <html> <head> @@ -183,6 +205,7 @@ if ($idc != 0) <script language="javascript"> var vez=0; setTimeout("acceso();",300); + function acceso(){ o=document.getElementById("mensaje"); var s=o.style.visibility; @@ -197,7 +220,7 @@ if ($idc != 0) vez++; setTimeout("acceso();",300); } + <?php alert_norepo($cmd, $idc,$TbMsg["WARN_NOREPO"]) ?>; </script> </body> </html> - diff --git a/admin/WebConsole/idiomas/php/cat/acceso_cat.php b/admin/WebConsole/idiomas/php/cat/acceso_cat.php index 1b29d068..747c4047 100644 --- a/admin/WebConsole/idiomas/php/cat/acceso_cat.php +++ b/admin/WebConsole/idiomas/php/cat/acceso_cat.php @@ -30,5 +30,4 @@ $TbMsg["ACCESS_ALLOWED"]='Accés permès. Esperi si us plau ...'; $TbMsg["ACCESS_ERROR"]='Error d\'acces'; $TbMsg["ACCESS_UNKNOWNERROR"]='Error desconegut'; $TbMsg["ACCESS_NOFRAMES"]='El navegador necessita suport per a "frames" per a mostrar la pàgina.'; -?> - +$TbMsg["WARN_NOREPO"]='No existe repositorio definido en la Unidad Organizativa'; diff --git a/admin/WebConsole/idiomas/php/eng/acceso_eng.php b/admin/WebConsole/idiomas/php/eng/acceso_eng.php index aab35ee9..a788a712 100644 --- a/admin/WebConsole/idiomas/php/eng/acceso_eng.php +++ b/admin/WebConsole/idiomas/php/eng/acceso_eng.php @@ -1,34 +1,33 @@ <?php // __________________________________________________ // -// Fichero de idiomas php: acceso_esp.php -// Idioma: Español +// Php language file: acceso_eng.php +// Language: English // __________________________________________________ -// Mensajes de error. +// Error messages. $TbErr=array(); $TbErr[0]="NO ERRORS"; -$TbErr[1]="Attention: You must access the application via the homepage"; -$TbErr[2]="Attention: The application not have access to the database server"; -$TbErr[3]="Attention: There are problems to retrieve the record, it may have been removed"; -$TbErr[4]="Attention: You do not have access to this application"; +$TbErr[1]="Warning: You must access this application via homepage"; +$TbErr[2]="Warning: This application does not have access to Database server"; +$TbErr[3]="Warning: Problems recovering register, it may have been deleted"; +$TbErr[4]="Warning: You do not have access to this application"; -// Mensajes. +// Messages. $TbMsg=array(); -$TbMsg["ACCESS_TITLE"]="OpenGnsys: Labs web administration"; +$TbMsg["ACCESS_TITLE"]="OpenGnsys: Labs-web administration"; $TbMsg["ACCESS_HEADING"]="Computer Labs Management"; -$TbMsg["ACCESS_SUBHEAD"]="Administrators Access"; +$TbMsg["ACCESS_SUBHEAD"]="Adminis Access"; $TbMsg["ACCESS_USERNAME"]="Username"; $TbMsg["ACCESS_PASSWORD"]="Password"; $TbMsg["ACCESS_ORGUNIT"]="Organitational Unit"; $TbMsg["ACCESS_OK"]="OK"; $TbMsg["ACCESS_CHOOSE"]="Choose"; -$TbMsg["ACCESS_NOUSER"]="You must enter a username"; -$TbMsg["ACCESS_NOPASS"]="You must enter a password"; -$TbMsg["ACCESS_NOUNIT"]='You have not entered any Organizational Unit.\nYou will NOT have access to the system unless that you are a main administrator of the Application.\nDo you want to access with this profile?'; -$TbMsg["ACCESS_ALLOWED"]='Allowed access. Please wait ...'; +$TbMsg["ACCESS_NOUSER"]="Must enter username"; +$TbMsg["ACCESS_NOPASS"]="Must enter password"; +$TbMsg["ACCESS_NOUNIT"]='Warning: enter Organizational Unit.\nYou cannot access system unless you are the main admin of Application.\nDo you want to access with this profile?'; +$TbMsg["ACCESS_ALLOWED"]='Access allowed. Please wait ...'; $TbMsg["ACCESS_ERROR"]='Access error'; $TbMsg["ACCESS_UNKNOWNERROR"]='Unknown error'; $TbMsg["ACCESS_NOFRAMES"]='Sorry, your browser does not handle frames.'; -?> - +$TbMsg["WARN_NOREPO"]='There is no repository defined in the Organizational Unit.'; diff --git a/admin/WebConsole/idiomas/php/esp/acceso_esp.php b/admin/WebConsole/idiomas/php/esp/acceso_esp.php index e5d084f5..ece7487b 100644 --- a/admin/WebConsole/idiomas/php/esp/acceso_esp.php +++ b/admin/WebConsole/idiomas/php/esp/acceso_esp.php @@ -30,4 +30,4 @@ $TbMsg["ACCESS_ALLOWED"]='Acceso permitido. Espere por favor ...'; $TbMsg["ACCESS_ERROR"]='Error de acceso'; $TbMsg["ACCESS_UNKNOWNERROR"]='Error desconocido'; $TbMsg["ACCESS_NOFRAMES"]='El navegador necesita soporte para "frames" para mostrar la página.'; -?> +$TbMsg["WARN_NOREPO"]='No existe repositorio definido en la Unidad Organizativa.'; diff --git a/doc/CHANGELOG.es.txt b/doc/CHANGELOG.es.txt index bb9ea4cc..196664d8 100644 --- a/doc/CHANGELOG.es.txt +++ b/doc/CHANGELOG.es.txt @@ -15,6 +15,7 @@ Tickets resueltos en módulo OpenGnsys Client: Tickets resueltos en módulo OpenGnsys Server: #846 Configuración de logrotate para que incluya todos los servicios de OpenGnsys (corrección) +#859 Gestor de los ficheros PXE duplicado Tickets resueltos en módulo OpenGnsys Repository Server: #580 Caídas de ogAdmServer y ogAdmClient por desbordamiento de cadenas (no se resolverá) @@ -23,6 +24,7 @@ Tickets resueltos en módulo OpenGnsys Repository Server: Tickets resueltos en módulo OpenGnsys Web Admin Console: #835 Problemas al listar plantillas en Nerboot Avanzado (corrección) #867 La ayuda en la consola incluirá más información +#870 Netboot avanzado no crea la plantilla de arranque si el equipo no tiene asignado un repositorio (corrección) Tickets genéricos resueltos: #839 Errores detectado en API REST para Remote PC (corrección) diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index a9f34aa5..2d8e7d79 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -208,7 +208,7 @@ case "$OSDISTRIB" in fedora|centos) DEPENDENCIES=( subversion httpd mod_ssl php php-ldap mysql-server mysql-devel mysql-devel.i686 php-mysql dhcp tftp-server tftp xinetd binutils gcc gcc-c++ glibc-devel glibc-devel.i686 glibc-static glibc-static.i686 libstdc++-devel.i686 make wget curl doxygen graphviz ctorrent samba samba-client rsync unzip debootstrap schroot squashfs-tools python-crypto arp-scan procps-ng gettext moreutils jq net-tools http://ftp.altlinux.org/pub/distributions/ALTLinux/5.1/branch/$(arch)/RPMS.classic/netpipes-4.2-alt1.$(arch).rpm ) INSTALLEXTRADEPS=( 'pushd /tmp; wget -t3 http://download.bittornado.com/download/BitTornado-0.3.18.tar.gz && tar xvzf BitTornado-0.3.18.tar.gz && cd BitTornado-CVS && python setup.py install && ln -fs btlaunchmany.py /usr/bin/btlaunchmany && ln -fs bttrack.py /usr/bin/bttrack; popd' ) - INSTALLPKG="yum update -y libstdc++ libstdc++.i686" + INSTALLPKG="yum install -y libstdc++ libstdc++.i686" CHECKPKG="rpm -q --quiet \$package" SYSTEMD=$(which systemctl 2>/dev/null) if [ -n "$SYSTEMD" ]; then |