Revision 1982
Added by darkviper about 11 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
11 | 11 |
! = Update/Change |
12 | 12 |
=============================================================================== |
13 | 13 |
|
14 |
17 Oct-2013 Build 1982 Manuela v.d.Decken(DarkViper) |
|
15 |
# /framework/AccessFile little Typofixes |
|
16 |
+ /framework/AccessFileHelper added new method getDelTreeLog() and add const LOG_PRESERVE and LOG_CLEAR |
|
17 |
! set WbAdaptor::AppName to 'WebsiteBaker' |
|
14 | 18 |
10 Oct-2013 Build 1981 Dietmar Woellbrink (Luisehahne) |
15 | 19 |
# Argument that is passed to the constructor of the Access File Class has been corrected |
16 | 20 |
10 Oct-2013 Build 1980 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.3'); |
54 |
if(!defined('REVISION')) define('REVISION', '1981');
|
|
54 |
if(!defined('REVISION')) define('REVISION', '1982');
|
|
55 | 55 |
if(!defined('SP')) define('SP', ''); |
branches/2.8.x/wb/framework/WbAdaptor.php | ||
---|---|---|
223 | 223 |
} |
224 | 224 |
$this->_aSys['AppName'] = 'WebsiteBaker'; |
225 | 225 |
$this->_aSys['System']['AppName'] = 'WebsiteBaker'; |
226 |
$this->_aSys['Request']['AppName'] = 'WebsiteBaker'; |
|
226 | 227 |
} |
227 | 228 |
|
228 | 229 |
} // end of class WbAdaptor |
branches/2.8.x/wb/framework/AccessFileHelper.php | ||
---|---|---|
44 | 44 |
*/ |
45 | 45 |
const DEL_ROOT_DELETE = 1; |
46 | 46 |
/** |
47 |
* clear logs |
|
48 |
*/ |
|
49 |
const LOG_CLEAR = true; |
|
50 |
/** |
|
51 |
* preserve logs |
|
52 |
*/ |
|
53 |
const LOG_PRESERVE = false; |
|
54 |
/** |
|
47 | 55 |
* to store the last delTree log |
48 | 56 |
*/ |
49 | 57 |
static $aDelTreeLog = array(); |
... | ... | |
131 | 139 |
} |
132 | 140 |
/** |
133 | 141 |
* returns the log of the last delTree request |
142 |
* @param bool $bClearLog TRUE clears the log after request, FALSE preserve the log |
|
134 | 143 |
* @return array |
135 | 144 |
*/ |
136 |
static function getDelTreeLog() |
|
145 |
static function getDelTreeLog($bClearLog = self::LOG_CLEAR)
|
|
137 | 146 |
{ |
138 |
return self::$aDelTreeLog; |
|
147 |
$aRetval = self::$aDelTreeLog; |
|
148 |
if($bClearLog) { self::$aDelTreeLog = array(); } |
|
149 |
return $aRetval; |
|
139 | 150 |
} |
140 | 151 |
|
141 | 152 |
} // end of class AccessFileHelper |
branches/2.8.x/wb/framework/AccessFile.php | ||
---|---|---|
102 | 102 |
} |
103 | 103 |
} |
104 | 104 |
|
105 |
/**
|
|
106 |
* Write the accessfile
|
|
107 |
* @throws AccessFileException
|
|
108 |
*/
|
|
105 |
/** |
|
106 |
* Write the accessfile |
|
107 |
* @throws AccessFileException |
|
108 |
*/ |
|
109 | 109 |
public function write() |
110 | 110 |
{ |
111 | 111 |
// remove AppPath from File for use in error messages |
... | ... | |
146 | 146 |
// prepare old/new file-/dirname |
147 | 147 |
$sOldFilename = $this->_sFileName; |
148 | 148 |
$sOldSubDirname = dirname($sOldFilename) . '/'; |
149 |
$sBaseDirname = dirname($sOldSubDirname) . '/'; |
|
150 | 149 |
$sPattern = '/^(' . preg_quote($sOldSubDirname, '/') . ')([^\/\.]+?)(\.[a-z0-9]+)$/siU'; |
151 | 150 |
$sNewFilename = preg_replace($sPattern, '\1' . $sNewName . '\3', $sOldFilename); |
152 | 151 |
$sNewSubDirname = dirname($sNewFilename) . '/'; |
Also available in: Unified diff
/framework/AccessFile little Typofixes
/framework/AccessFileHelper added new method getDelTreeLog() and add const LOG_PRESERVE and LOG_CLEAR
set WbAdaptor::AppName to 'WebsiteBaker'