Project

General

Profile

« Previous | Next » 

Revision 1603

Added by Dietmar over 12 years ago

fix local module reload and module manuell install
forgot to upload login.php

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
=========================== add small Features 2.8.2 ==========================
14
08 Feb-2012 Build 1603 Dietmar Woellbrink (Luisehahne)
15
! fix local module reload and module manuell install
16
! forgot to upload login.php
14 17
08 Feb-2012 Build 1602 Dietmar Woellbrink (Luisehahne)
15 18
! a quick simple stylesheet fix in wb_theme, 
16 19
07 Feb-2012 Build 1601 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.2');
54
if(!defined('REVISION')) define('REVISION', '1602');
54
if(!defined('REVISION')) define('REVISION', '1603');
55 55
if(!defined('SP')) define('SP', 'SP2');
branches/2.8.x/wb/admin/modules/manual_install.php
42 42
if ($admin->get_permission('admintools') == false) { die(header('Location: ../../index.php')); }
43 43

  
44 44
// check if the referer URL if available
45
$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : 
45
$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] :
46 46
	(isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '');
47

  
47
$referer = '';
48 48
// if referer is set, check if script was invoked from "admin/modules/index.php"
49 49
$required_url = ADMIN_URL . '/modules/index.php';
50 50
if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) 
branches/2.8.x/wb/admin/addons/reload.php
40 40
// check if the referer URL if available
41 41
$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] :
42 42
	(isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '');
43
$referer = '';
43 44
// if referer is set, check if script was invoked from "admin/modules/index.php"
44 45
$required_url = ADMIN_URL . '/addons/index.php';
45 46
if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false)))
branches/2.8.x/wb/account/login.php
54 54
// Create new login app
55 55
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
56 56
$redirect  = strip_tags(isset(${$requestMethod}['redirect']) ? ${$requestMethod}['redirect'] : '');
57
$redirect = ((isset($_SERVER['HTTP_REFERER']) && empty($redirect)) ?  $_SERVER['HTTP_REFERER'] : $redirect);
58
$_SESSION['HTTP_REFERER'] = str_replace(WB_URL,'',$redirect);
57
$redirect = ((isset($_SESSION['HTTP_REFERER']) && ($redirect='')) ?  $_SESSION['HTTP_REFERER'] : $redirect);
58
// $_SESSION['HTTP_REFERER'] = str_replace(WB_URL,'',$redirect);
59 59

  
60
$loginUrl  = WB_URL.'/account/login.php';
61
$loginUrl .= (!empty($redirect) ? '?redirect=' .$_SESSION['HTTP_REFERER'] : '');
60
// $loginUrl  = WB_URL.'/account/login.php';
61
$loginUrl .= (($redirect!='') ? '?redirect=' .$_SESSION['HTTP_REFERER'] : '');
62 62

  
63 63
$ThemeUrl  = WB_URL.$wb->correct_theme_source('warning.html');
64 64
// Setup template object, parse vars to it, then parse it

Also available in: Unified diff