From 485ef39605e561e5267e84a97d65b2b471c4d241 Mon Sep 17 00:00:00 2001
From: "Ramón M. Gómez" <ramongomez@us.es>
Date: Tue, 20 Nov 2018 11:07:32 +0100
Subject: #872: Adapting commit {{{80cbc63}}} from devel to master.

---
 admin/WebConsole/jscripts/propiedades_ordenadores.js      |  3 +--
 admin/WebConsole/principal/imagenes.php                   |  5 ++---
 admin/WebConsole/propiedades/propiedades_repositorios.php |  2 +-
 installer/opengnsys_installer.sh                          | 14 --------------
 installer/opengnsys_update.sh                             |  1 -
 server/bin/checkperms                                     |  2 +-
 6 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/admin/WebConsole/jscripts/propiedades_ordenadores.js b/admin/WebConsole/jscripts/propiedades_ordenadores.js
index f42c309f..ff7c3c7a 100644
--- a/admin/WebConsole/jscripts/propiedades_ordenadores.js
+++ b/admin/WebConsole/jscripts/propiedades_ordenadores.js
@@ -96,6 +96,5 @@ function comprobar_datos(){
 	 	validate (form.nombreordenador, validate_text_notnull, 0) &&
 		validate (form.ip, validate_ipadress_notnull, 1) &&
 		validate (form.mac, validate_macaddress_notnull, 2) &&
-		validate (form.numserie, validate_alphanum, 3) &&
-		validate (form.idrepositorio, validate_number_notnull, 5) ;
+		validate (form.numserie, validate_alphanum, 3) ;
 }
diff --git a/admin/WebConsole/principal/imagenes.php b/admin/WebConsole/principal/imagenes.php
index 4ba41ff0..553979db 100644
--- a/admin/WebConsole/principal/imagenes.php
+++ b/admin/WebConsole/principal/imagenes.php
@@ -242,9 +242,8 @@ function SubarbolXML_Imagenes($grupoid,$amb,$litamb,$tipo)
 	// Para hallar el repositorio de las incrementales hay que buscar los datos de la imagen basica (en la propia tablas imágenes)
 	if ($tipo == 3) {
 	    $cmd->texto.="      INNER JOIN imagenes AS basica
-				LEFT JOIN repositorios
-			        WHERE basica.idrepositorio=repositorios.idrepositorio
-			        AND imagenes.imagenid=basica.idimagen AND ";
+				LEFT JOIN repositorios ON basica.idrepositorio=repositorios.idrepositorio
+			        WHERE imagenes.imagenid=basica.idimagen AND ";
 	} else {
 	    $cmd->texto.="      LEFT JOIN repositorios USING  (idrepositorio) WHERE ";
 	}
diff --git a/admin/WebConsole/propiedades/propiedades_repositorios.php b/admin/WebConsole/propiedades/propiedades_repositorios.php
index 87d95b0d..069b8b6a 100644
--- a/admin/WebConsole/propiedades/propiedades_repositorios.php
+++ b/admin/WebConsole/propiedades/propiedades_repositorios.php
@@ -230,7 +230,7 @@ function TomaPropiedades($cmd,$id){
 	global $ordenadores;
 
 	$cmd->texto=<<<EOT
-SELECT repositorios.*, COUNT(*) AS numordenadores
+SELECT repositorios.*, COUNT(ordenadores.idordenador) AS numordenadores
   FROM repositorios
   LEFT JOIN ordenadores USING(idrepositorio)
  WHERE repositorios.idrepositorio='$id';
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 2d8e7d79..95304a4b 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -1093,12 +1093,8 @@ function installWebFiles()
 	cp -a $COMPATDIR/imagenes.device.php $COMPATDIR/imagenes.device4.php
 	# Acceso al manual de usuario
 	ln -fs ../doc/userManual $INSTALL_TARGET/www/userManual
-	# Cambiar permisos para ficheros especiales.
-	chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/www/images/{fotos,iconos}
-	chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/www/tmp/
 	# Ficheros de log de la API REST.
 	touch $INSTALL_TARGET/log/{ogagent,remotepc,rest}.log
-	chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/log/{ogagent,remotepc,rest}.log
 
 	echoAndLog "${FUNCNAME}(): Web files installed successfully."
 }
@@ -1191,7 +1187,6 @@ function makeDoxygenFiles()
 		return 1
 	fi
 	mv "$INSTALL_TARGET/www/html" "$INSTALL_TARGET/www/api"
-	chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/www/api
 	echoAndLog "${FUNCNAME}(): Doxygen web files created successfully."
 }
 
@@ -1239,15 +1234,6 @@ function createDirs()
 		fi
 	fi
 
-	# Establecer los permisos básicos.
-	echoAndLog "${FUNCNAME}(): setting directory permissions"
-	chmod -R 775 $path_opengnsys_base/{log/clients,images}
-	chown -R :$OPENGNSYS_CLIENT_USER $path_opengnsys_base/{log/clients,images}
-	if [ $? -ne 0 ]; then
-		errorAndLog "${FUNCNAME}(): error while setting permissions"
-		return 1
-	fi
-
 	# Mover el fichero de registro de instalación al directorio de logs.
 	echoAndLog "${FUNCNAME}(): moving installation log file"
 	mv $LOG_FILE $OGLOGFILE && LOG_FILE=$OGLOGFILE
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index 8461f2ec..8a307257 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -627,7 +627,6 @@ function updateWebFiles()
  	ln -fs ../doc/userManual $INSTALL_TARGET/www/userManual
 	# Fichero de log de la API REST.
 	touch $INSTALL_TARGET/log/{ogagent,rest,remotepc}.log
-	chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/log/{ogagent,rest,remotepc}.log
 
 	echoAndLog "${FUNCNAME}(): Web files successfully updated"
 }
diff --git a/server/bin/checkperms b/server/bin/checkperms
index fbe3be0f..5c558c45 100755
--- a/server/bin/checkperms
+++ b/server/bin/checkperms
@@ -57,5 +57,5 @@ chown -R $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/tftpboot/menu.lst
 chown -R :$OPENGNSYS_USER $OPENGNSYS_DIR/tftpboot/ogLive*
 find -L $OPENGNSYS_DIR/tftpboot -type d -exec chmod 755 {} \;
 find -L $OPENGNSYS_DIR/tftpboot -type f -exec chmod 644 {} \;
-chown $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/log/ogagent.log
+chown $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/log/{ogagent,remotepc,rest}.log
 
-- 
cgit v1.2.3-18-g5258