Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2015-06-05 dadfb45a9a29e239ff722e6d8e91c75f76c314b8

 interface/web/tools/resync.php

@@ -379,6 +379,10 @@
         }
      }

      $csrf_token = $app->auth->csrf_token_get('tools_resync');
      $app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
      $app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);

      parent::onShowEnd();
   }
         
@@ -429,7 +433,12 @@

    function onSubmit() {
        global $app;

		
      if(isset($_POST) && count($_POST) > 1) {
         //* CSRF Check
         $app->auth->csrf_token_check();
      }
		
      //* all services
      if($this->dataRecord['resync_all'] == 1) {
         $this->dataRecord['resync_sites'] = 1;