fossology · ag4ums · Sep 19, 2019 · Jun 6, 2019
diff --git a/debian/control b/debian/control
@@ -62,7 +62,7 @@ Description: architecture for analyzing software, common files
 
 Package: fossology-web
 Architecture: any
-Depends: fossology-common, fossology-decider, apache2,
+Depends: fossology-common, apache2,
  libapache2-mod-php5|libapache2-mod-php7.0|libapache2-mod-php7.2|libapache2-mod-php7.3,
  ${misc:Depends}
 Recommends: fossology-db
@@ -234,7 +234,7 @@ Description: architecture for analyzing software, monk
 
 Package: fossology-monkbulk
 Architecture: any
-Depends: fossology-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: fossology-common, fossology-deciderjob, ${shlibs:Depends}, ${misc:Depends}
 Description: architecture for analyzing software, monk bulk scanning
  The FOSSology project is a web based framework that allows you to
  upload software to be picked apart and then analyzed by software agents
@@ -270,7 +270,7 @@ Description: architecture for analyzing software, ojo
 
 Package: fossology-decider
 Architecture: any
-Depends: fossology-common, ${misc:Depends}
+Depends: fossology-common, fossology-deciderjob, ${misc:Depends}
 Description: architecture for analyzing software, decider
  The FOSSology project is a web based framework that allows you to
  upload software to be picked apart and then analyzed by software agents

diff --git a/install/fo-postinstall.in b/install/fo-postinstall.in
@@ -246,7 +246,7 @@ if [[ $AGENT ]]; then
    # change all files ownership to {$PROJECTUSER}:$PROJECTGROUP
    chown --recursive {$PROJECTUSER}:$PROJECTGROUP {$MODDIR} {$LIBEXECDIR} {$SYSCONFDIR}
    chown --silent {$PROJECTUSER}:$PROJECTGROUP {$INCLUDEDIR}/libfossology.h
-   chown --silent {$PROJECTUSER}:$PROJECTGROUP {$MAN1DIR}/cp2foss.1{,.gz} {$MAN1DIR}/fossjobs.1{,.gz} || echo
+   chown --silent {$PROJECTUSER}:$PROJECTGROUP {$MAN1DIR}/cp2foss.1\{,.gz\} {$MAN1DIR}/fossjobs.1\{,.gz\} || echo
 fi
 
 if [[ $AGENT && $RUNNINGDATABASE ]]; then

diff --git a/src/lib/php/Makefile b/src/lib/php/Makefile
@@ -19,7 +19,7 @@ TOP = ../../..
 VARS = $(TOP)/Makefile.conf
 include $(VARS)
 
-FILES = `find . -type f | grep -v svn |grep -v tests | grep -E "(php)$$"`
+FILES = `find . -type f | grep -Ev "(svn|\/tests?)" | grep -E "(php|twig)$$"`
 
 all: bootstrap services.xml
 

diff --git a/.../template/components/login-form.html.twig → .../template/components/login-form.html.twig b/.../template/components/login-form.html.twig → .../template/components/login-form.html.twig
diff --git a/...www/ui/template/components/menu.html.twig → ...php/UI/template/components/menu.html.twig b/...www/ui/template/components/menu.html.twig → ...php/UI/template/components/menu.html.twig
diff --git a/...mplate/components/select-folder.html.twig → ...mplate/components/select-folder.html.twig b/...mplate/components/select-folder.html.twig → ...mplate/components/select-folder.html.twig
diff --git a/src/www/ui/template/include/base.html.twig → ...ib/php/UI/template/include/base.html.twig b/src/www/ui/template/include/base.html.twig → ...ib/php/UI/template/include/base.html.twig
diff --git a/src/www/ui/template/include/foot.html.twig → ...ib/php/UI/template/include/foot.html.twig b/src/www/ui/template/include/foot.html.twig → ...ib/php/UI/template/include/foot.html.twig
diff --git a/src/www/ui/template/include/head.html.twig → ...ib/php/UI/template/include/head.html.twig b/src/www/ui/template/include/head.html.twig → ...ib/php/UI/template/include/head.html.twig
diff --git a/src/www/ui/template/include/macros.html.twig → .../php/UI/template/include/macros.html.twig b/src/www/ui/template/include/macros.html.twig → .../php/UI/template/include/macros.html.twig
diff --git a/src/www/ui/template/include/upload.html.twig → .../php/UI/template/include/upload.html.twig b/src/www/ui/template/include/upload.html.twig → .../php/UI/template/include/upload.html.twig
diff --git a/src/lib/php/services.xml.in b/src/lib/php/services.xml.in
@@ -18,7 +18,7 @@ without any warranty.
             {$TWIG_CACHE}
             <parameter key="autoescape" type="constant">false</parameter>
         </parameter>
-        <parameter key="twig.loader.source_path" type="string">%application_root%/www/ui/template</parameter>
+        <parameter key="twig.loader.source_path" type="string">%application_root%/lib/php/UI/template</parameter>
         <parameter key="time.zone" type="string"></parameter>
 	<parameter key="displayErrorDetails" type="constant">false</parameter>
         <parameter key="addContentLengthHeader" type="constant">false</parameter>

diff --git a/src/www/ui/Makefile b/src/www/ui/Makefile
@@ -26,7 +26,8 @@ DIRS = css images locale scripts ajaxPHP
 UIFILES = `find . -type f | grep -v svn |grep -v tests | grep -E "(php|dat|dtd|js|html|twig)$$"`
 OBSOLETEFILES = admin-tag-ns.php admin-change-owner.php admin-tag-ns-perm.php admin-folder-delete.php \
                 ajax-showjobs.php group-manage-self.php group-manage.php ajax-perms.php \
-                upload_permissions.php upload-srv-files.php upload-vcs.php
+                upload_permissions.php upload-srv-files.php upload-vcs.php template/components \
+                template/include
 
 OTHERFILES = `find . -type f | grep -v svn |grep -v tests | grep -E "(css|htc|gif|png|ico|htm)$$"`
 
@@ -41,8 +42,8 @@ install: empty-cache
 		mkdir -p $(DESTDIR)$(WEBDIR)/ui/$$dir; \
 	done
 	@for file in $(OBSOLETEFILES); do \
-		rm -f $(DESTDIR)$(WEBDIR)/ui/$$file; \
-		rm -f $$file; \
+		rm -rf $(DESTDIR)$(WEBDIR)/ui/$$file; \
+		rm -rf $$file; \
 	done
 	@for file in $(UIFILES); do \
 		$(INSTALL_DATA) $$file $(DESTDIR)$(WEBDIR)/ui/$$file; \

diff --git a/src/www/ui/api/index.php b/src/www/ui/api/index.php
@@ -60,6 +60,10 @@
 $timingLogger = $container->get("log.timing");
 $timingLogger->logWithStartTime("bootstrap", $startTime);
 
+/* Load UI templates */
+$loader = $container->get('twig.loader');
+$loader->addPath(dirname(dirname(__FILE__)).'/template');
+
 /* Initialize global system configuration variables $SysConfig[] */
 $timingLogger->tic();
 ConfigInit($GLOBALS['SYSCONFDIR'], $SysConf);

diff --git a/src/www/ui/index.php b/src/www/ui/index.php
@@ -43,6 +43,10 @@
 $timingLogger = $container->get("log.timing");
 $timingLogger->logWithStartTime("bootstrap", $startTime);
 
+/* Load UI templates */
+$loader = $container->get('twig.loader');
+$loader->addPath(dirname(__FILE__).'/template');
+
 /* Initialize global system configuration variables $SysConfig[] */
 $timingLogger->tic();
 ConfigInit($SYSCONFDIR, $SysConf);