gitlabFork/ISPConfig3.git - Solinfo Gitblit

			@@ -110,20 +110,22 @@
			/*
			* process all actions
			*/
			foreach ($actions as $action) {
			if ($action['action_type'] == 'os_update') {
			/* do the update */
			$this->_doOsUpdate($action);
			/* this action takes so much time,
			* we stop executing the actions not to waste more time */
			return;
			}
			if ($action['action_type'] == 'ispc_update') {
			/* do the update */
			$this->_doIspCUpdate($action);
			/* this action takes so much time,
			* we stop executing the actions not to waste more time */
			return;
			if(is_array($actions)) {
			foreach ($actions as $action) {
			if ($action['action_type'] == 'os_update') {
			/* do the update */
			$this->_doOsUpdate($action);
			/* this action takes so much time,
			* we stop executing the actions not to waste more time */
			return;
			}
			if ($action['action_type'] == 'ispc_update') {
			/* do the update */
			$this->_doIspCUpdate($action);
			/* this action takes so much time,
			* we stop executing the actions not to waste more time */
			return;
			}
			}
			}
			}
			@@ -132,9 +134,15 @@
			/*
			* Do the update
			*/
			exec("aptitude update");
			exec("aptitude upgrade -y");

			//TODO : change this when distribution information has been integrated into server record
			if(file_exists('/etc/gentoo-release')) {
			exec("glsa-check -f --nocolor affected");
			}
			else {
			exec("aptitude update");
			exec("aptitude upgrade -y");
			}

			/*
			* All well done!
			*/
			@@ -142,6 +150,10 @@
			}

			private function _doIspCUpdate($action) {

			// Ensure that this code is not executed twice as this would cause a loop in case of a failure
			$this->_actionDone($action['action_id'], 'ok');

			/*
			* Get the version-number of the newest version
			*/
			@@ -187,7 +199,7 @@
			/*
			* All well done!
			*/
			$this->_actionDone($action['action_id'], 'ok');
			//$this->_actionDone($action['action_id'], 'ok');
			}
			}
			?>