R55272 - in /trunk: admin/inc/ egroupware/api/src/ phpgwapi/inc/ setup/

ralfbecker_sf 2016-03-05 14:02:13 UTC #1

Author: ralfbecker
New Revision: 55272

URL: http://svn.stylite.de/viewvc/egroupware?rev=55272&view=rev
Log:
move egw_csrf class to Api\Csrf without a compatibility class

Added:
trunk/egroupware/api/src/Csrf.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.egw_csrf.inc.php
Removed:
trunk/phpgwapi/inc/class.egw_csrf.inc.php
Modified:
trunk/admin/inc/class.uiconfig.inc.php
trunk/setup/account_migration.php
trunk/setup/admin_account.php
trunk/setup/applications.php
trunk/setup/config.php
trunk/setup/db_backup.php
trunk/setup/index.php

Modified: trunk/admin/inc/class.uiconfig.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/inc/class.uiconfig.inc.php?rev=55272&r1=55271&r2=55272&view=diff

— trunk/admin/inc/class.uiconfig.inc.php (original)
+++ trunk/admin/inc/class.uiconfig.inc.php Sat Mar 5 15:02:13 2016
@@ -9,6 +9,8 @@

@version $Id$
*/

+use EGroupware\Api;
+
/**

Site configuration for all apps using an $app/templates/default/config.tpl
*/
@@ -24,7 +26,7 @@
// for POST requests validate CSRF token (or terminate request)
if ($_SERVER[‘REQUEST_METHOD’] == ‘POST’)
{

  	egw_csrf::validate($_POST['csrf_token'], __CLASS__);

  	Api\Csrf::validate($_POST['csrf_token'], __CLASS__);
  }

  if (empty($_GET['appname']) && isset($params['appname']))

@@ -44,7 +46,7 @@
// load the translations of the app we show too, so they dont need to be in admin!
if ($_appname != ‘admin’)
{

```
  	translation::add_app($_appname);
```

  	Api\Translation::add_app($_appname);
  }

  if(get_magic_quotes_gpc() && is_array($_POST['newsettings']))

@@ -103,7 +105,7 @@
// fix footer submit buttons to just {submit} {cancel}
$t->set_var(‘footer’, preg_replace(’/<input[^>]+value="{lang_(submit|cancel)}"[^>]*>/’, ‘{$1}’, $t->get_var(‘footer’)));

```
  $c = new config($config_appname);
```

  $c = new Api\Config($config_appname);
  $c->read_repository();
  if ($_POST['cancel'] || ($_POST['submit'] || $_POST['save'] || $_POST['apply']) && $GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
  {

@@ -177,7 +179,7 @@
$t->set_var(‘th_text’, $GLOBALS[‘egw_info’][‘theme’][‘th_text’]);
$t->set_var(‘row_on’, $GLOBALS[‘egw_info’][‘theme’][‘row_on’]);
$t->set_var(‘row_off’, $GLOBALS[‘egw_info’][‘theme’][‘row_off’]);

  $t->set_var('hidden_vars', html::input_hidden('csrf_token', egw_csrf::token(__CLASS__)));

  $t->set_var('hidden_vars', html::input_hidden('csrf_token', Api\Csrf::token(__CLASS__)));

  $vars = $t->get_undefined('body');

Copied: trunk/egroupware/api/src/Csrf.php (from r55263, trunk/phpgwapi/inc/class.egw_csrf.inc.php)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Csrf.php?p2=trunk/egroupware/api/src/Csrf.php&p1=trunk/phpgwapi/inc/class.egw_csrf.inc.php&r1=55263&r2=55272&rev=55272&view=diff

— trunk/phpgwapi/inc/class.egw_csrf.inc.php (original)
+++ trunk/egroupware/api/src/Csrf.php Sat Mar 5 15:02:13 2016
@@ -6,9 +6,14 @@

@license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@package api
@author Ralf Becker rb@stylite.de