Revision 1540
Added by Dietmar almost 13 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
=========================== add small Features 2.8.2 ========================== |
| 14 |
11 Dez-2011 Build 1540 Dietmar Woellbrink (Luisehahne) |
|
| 15 |
! did some changes and fixes found by testers |
|
| 14 | 16 |
10 Dez-2011 Build 1539 Dietmar Woellbrink (Luisehahne) |
| 15 | 17 |
! update phpmailer to version 5.1 |
| 16 | 18 |
10 Dez-2011 Build 1538 Dietmar Woellbrink (Luisehahne) |
| branches/2.8.x/wb/admin/media/index.php | ||
|---|---|---|
| 113 | 113 |
// Parse template object |
| 114 | 114 |
$template->parse('main', 'main_block', false);
|
| 115 | 115 |
$template->pparse('output', 'page');
|
| 116 |
|
|
| 116 |
/* |
|
| 117 | 117 |
$endtime=explode(" ", microtime());
|
| 118 | 118 |
$endtime=$endtime[0]+$endtime[1]; |
| 119 | 119 |
$debugVMsg = ''; |
| ... | ... | |
| 124 | 124 |
// $debugVMsg = print_message($debugVMsg,'#','debug',-1,false); |
| 125 | 125 |
print $debugVMsg.'<br />'; |
| 126 | 126 |
} |
| 127 |
|
|
| 127 |
*/ |
|
| 128 | 128 |
// Print admin |
| 129 | 129 |
$admin->print_footer(); |
| 130 |
|
|
| 131 |
?> |
|
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 52 | 52 |
|
| 53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.2');
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1539');
|
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1540');
|
|
| 56 | 56 |
if(!defined('SP')) define('SP', 'SP2');
|
| branches/2.8.x/wb/install/save.php | ||
|---|---|---|
| 301 | 301 |
""; |
| 302 | 302 |
|
| 303 | 303 |
$config_filename = '../config.php'; |
| 304 |
|
|
| 305 | 304 |
// Check if the file exists and is writable first. |
| 306 | 305 |
if(file_exists($config_filename) AND is_writable($config_filename)) {
|
| 307 | 306 |
if(!$handle = fopen($config_filename, 'w')) {
|
| ... | ... | |
| 680 | 679 |
$dirs['modules'] = WB_PATH.'/modules/'; |
| 681 | 680 |
$dirs['templates'] = WB_PATH.'/templates/'; |
| 682 | 681 |
$dirs['languages'] = WB_PATH.'/languages/'; |
| 682 |
|
|
| 683 | 683 |
foreach($dirs AS $type => $dir) {
|
| 684 | 684 |
if($handle = opendir($dir)) {
|
| 685 | 685 |
while(false !== ($file = readdir($handle))) {
|
| branches/2.8.x/wb/install/index.php | ||
|---|---|---|
| 190 | 190 |
<tr> |
| 191 | 191 |
<?php |
| 192 | 192 |
$config = '<font class="good">Writeable</font>'; |
| 193 |
$config_content = "<?php\n"; |
|
| 193 | 194 |
$configFile = '/config.php'; |
| 194 |
if(!isset($_SESSION['config_rename']) ) {
|
|
| 195 |
if(!isset($_SESSION['config_rename']) ) |
|
| 196 |
{
|
|
| 195 | 197 |
|
| 196 |
if( (file_exists($wb_path.$configFile)==true)) {
|
|
| 197 |
if ( filesize($wb_path.$configFile) > 128) {
|
|
| 198 |
if( (file_exists($wb_path.$configFile)==true)) |
|
| 199 |
{
|
|
| 200 |
|
|
| 201 |
if ( filesize($wb_path.$configFile) > 128) |
|
| 202 |
{
|
|
| 198 | 203 |
$installFlag = false; |
| 199 | 204 |
$config = '<font class="bad">Not empty!!?</font>'; |
| 200 |
} elseif( is_writeable($wb_path.$configFile)==true ) {
|
|
| 201 |
$config = '<font class="good">Writeable</font>'; |
|
| 202 |
$_SESSION['config_rename'] = true; |
|
| 203 |
} |
|
| 204 |
} elseif((file_exists($wb_path.'/config.php.new')==true)) {
|
|
| 205 |
} elseif(!$handle = fopen($wb_path.$configFile, 'w') ) |
|
| 206 |
{
|
|
| 207 |
$installFlag = false; |
|
| 208 |
$config = '<font class="bad">Not Writeable</font>'; |
|
| 209 |
} else {
|
|
| 210 |
if (fwrite($handle, $config_content) === FALSE) {
|
|
| 211 |
$installFlag = false; |
|
| 212 |
$config = '<font class="bad">Not Writeable</font>'; |
|
| 213 |
} else {
|
|
| 214 |
$config = '<font class="good">Writeable</font>'; |
|
| 215 |
$_SESSION['config_rename'] = true; |
|
| 216 |
} |
|
| 217 |
// Close file |
|
| 218 |
fclose($handle); |
|
| 219 |
} |
|
| 220 |
|
|
| 221 |
} elseif((file_exists($wb_path.'/config.php.new')==true)) |
|
| 222 |
{
|
|
| 205 | 223 |
$configFile = '/config.php.new'; |
| 206 | 224 |
$installFlag = false; |
| 207 | 225 |
$config = '<font class="bad">Please rename</font>'; |
| 208 |
} else {
|
|
| 209 |
$installFlag = false; |
|
| 210 |
$config = '<font class="bad">Missing!!?</font>'; |
|
| 226 |
} else |
|
| 227 |
{
|
|
| 228 |
$installFlag = false; |
|
| 229 |
$config = '<font class="bad">Missing!!?</font>'; |
|
| 211 | 230 |
} |
| 212 |
|
|
| 213 | 231 |
} |
| 214 | 232 |
?> |
| 215 | 233 |
<td width="150px" style="color: #666666;"><?php print $wb_root.$configFile ?></td> |
| branches/2.8.x/wb/modules/wrapper/info.php | ||
|---|---|---|
| 24 | 24 |
/* -------------------------------------------------------- */ |
| 25 | 25 |
|
| 26 | 26 |
$module_directory = 'wrapper'; |
| 27 |
$module_name = 'Wrapper 2.8.3';
|
|
| 27 |
$module_name = 'Wrapper'; |
|
| 28 | 28 |
$module_function = 'page'; |
| 29 | 29 |
$module_version = '2.8.3'; |
| 30 | 30 |
$module_platform = '2.7 | 2.8.x'; |
| branches/2.8.x/wb/modules/wysiwyg/info.php | ||
|---|---|---|
| 23 | 23 |
/* -------------------------------------------------------- */ |
| 24 | 24 |
|
| 25 | 25 |
$module_directory = 'wysiwyg'; |
| 26 |
$module_name = 'WYSIWYG 2.8.3';
|
|
| 26 |
$module_name = 'WYSIWYG'; |
|
| 27 | 27 |
$module_function = 'page'; |
| 28 | 28 |
$module_version = '2.8.3'; |
| 29 | 29 |
$module_platform = '2.8.2'; |
| branches/2.8.x/wb/modules/jsadmin/info.php | ||
|---|---|---|
| 16 | 16 |
*/ |
| 17 | 17 |
|
| 18 | 18 |
$module_directory = 'jsadmin'; |
| 19 |
$module_name = 'Javascript Admin 1.4.0';
|
|
| 19 |
$module_name = 'Javascript Admin'; |
|
| 20 | 20 |
$module_function = 'tool'; |
| 21 | 21 |
$module_version = '1.4.0'; |
| 22 | 22 |
$module_platform = '2.7 | 2.8.x'; |
| branches/2.8.x/wb/modules/droplets/install.php | ||
|---|---|---|
| 25 | 25 |
} |
| 26 | 26 |
/* -------------------------------------------------------- */ |
| 27 | 27 |
|
| 28 |
global $admin; |
|
| 28 |
// global $admin;
|
|
| 29 | 29 |
|
| 30 |
$sql = 'DROP TABLE IF EXISTS `'.TABLE_PREFIX.'mod_droplets` '; |
|
| 31 |
$database->query($sql); |
|
| 30 |
$msg = array(); |
|
| 31 |
$sql = 'DROP TABLE IF EXISTS `'.TABLE_PREFIX.'mod_droplets` '; |
|
| 32 |
if( !$database->query($sql) ) {
|
|
| 33 |
$msg[] = $database->get_error(); |
|
| 34 |
} |
|
| 32 | 35 |
|
| 33 |
$sql = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_droplets` ( '; |
|
| 34 |
$sql .= '`id` INT NOT NULL auto_increment, '; |
|
| 35 |
$sql .= '`name` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, '; |
|
| 36 |
$sql .= '`code` LONGTEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL , '; |
|
| 37 |
$sql .= '`description` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, '; |
|
| 38 |
$sql .= '`modified_when` INT NOT NULL default \'0\', '; |
|
| 39 |
$sql .= '`modified_by` INT NOT NULL default \'0\', '; |
|
| 40 |
$sql .= '`active` INT NOT NULL default \'0\', '; |
|
| 41 |
$sql .= '`admin_edit` INT NOT NULL default \'0\', '; |
|
| 42 |
$sql .= '`admin_view` INT NOT NULL default \'0\', '; |
|
| 43 |
$sql .= '`show_wysiwyg` INT NOT NULL default \'0\', '; |
|
| 44 |
$sql .= '`comments` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, '; |
|
| 45 |
$sql .= 'PRIMARY KEY ( `id` ) '; |
|
| 46 |
$sql .= ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; |
|
| 47 |
$database->query($sql); |
|
| 36 |
$sql = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_droplets` ( '; |
|
| 37 |
$sql .= '`id` INT NOT NULL auto_increment, '; |
|
| 38 |
$sql .= '`name` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, '; |
|
| 39 |
$sql .= '`code` LONGTEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL , '; |
|
| 40 |
$sql .= '`description` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, '; |
|
| 41 |
$sql .= '`modified_when` INT NOT NULL default \'0\', '; |
|
| 42 |
$sql .= '`modified_by` INT NOT NULL default \'0\', '; |
|
| 43 |
$sql .= '`active` INT NOT NULL default \'0\', '; |
|
| 44 |
$sql .= '`admin_edit` INT NOT NULL default \'0\', '; |
|
| 45 |
$sql .= '`admin_view` INT NOT NULL default \'0\', '; |
|
| 46 |
$sql .= '`show_wysiwyg` INT NOT NULL default \'0\', '; |
|
| 47 |
$sql .= '`comments` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, '; |
|
| 48 |
$sql .= 'PRIMARY KEY ( `id` ) '; |
|
| 49 |
$sql .= ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; |
|
| 50 |
if( !$database->query($sql) ) {
|
|
| 51 |
$msg[] = $database->get_error(); |
|
| 52 |
} |
|
| 48 | 53 |
|
| 49 |
//add all droplets from the droplet subdirectory |
|
| 50 |
$folder=opendir(WB_PATH.'/modules/droplets/example/.'); |
|
| 51 |
$names = array(); |
|
| 52 |
while ($file = readdir($folder)) {
|
|
| 53 |
$ext=strtolower(substr($file,-4)); |
|
| 54 |
if ($ext==".php"){
|
|
| 55 |
if ($file<>"index.php" ) {
|
|
| 56 |
$names[count($names)] = $file; |
|
| 54 |
//add all droplets from the droplet subdirectory |
|
| 55 |
$folder=opendir(WB_PATH.'/modules/droplets/example/.'); |
|
| 56 |
$names = array(); |
|
| 57 |
while ($file = readdir($folder)) {
|
|
| 58 |
$ext=strtolower(substr($file,-4)); |
|
| 59 |
if ($ext==".php"){
|
|
| 60 |
if ($file<>"index.php" ) {
|
|
| 61 |
$names[count($names)] = $file; |
|
| 62 |
} |
|
| 57 | 63 |
} |
| 58 | 64 |
} |
| 59 |
} |
|
| 60 |
closedir($folder); |
|
| 65 |
closedir($folder); |
|
| 61 | 66 |
|
| 62 |
foreach ($names as $dropfile) {
|
|
| 63 |
$droplet = addslashes(getDropletCodeFromFile($dropfile)); |
|
| 64 |
if ($droplet != "") {
|
|
| 65 |
$description = "Example Droplet"; |
|
| 66 |
$comments = "Example Droplet"; |
|
| 67 |
$cArray = explode("\n",$droplet);
|
|
| 68 |
if (substr($cArray[0],0,3) == "//:") {
|
|
| 69 |
$description = trim(substr($cArray[0],3)); |
|
| 70 |
array_shift ( $cArray ); |
|
| 67 |
foreach ($names as $dropfile) |
|
| 68 |
{
|
|
| 69 |
$droplet = addslashes(getDropletCodeFromFile($dropfile)); |
|
| 70 |
if ($droplet != "") |
|
| 71 |
{
|
|
| 72 |
$description = "Example Droplet"; |
|
| 73 |
$comments = "Example Droplet"; |
|
| 74 |
$cArray = explode("\n",$droplet);
|
|
| 75 |
if (substr($cArray[0],0,3) == "//:") {
|
|
| 76 |
$description = trim(substr($cArray[0],3)); |
|
| 77 |
array_shift ( $cArray ); |
|
| 78 |
} |
|
| 79 |
if (substr($cArray[0],0,3) == "//:") {
|
|
| 80 |
$comments = trim(substr($cArray[0],3)); |
|
| 81 |
array_shift ( $cArray ); |
|
| 82 |
} |
|
| 83 |
$droplet = implode ( "\n", $cArray ); |
|
| 84 |
$name = substr($dropfile,0,-4); |
|
| 85 |
$modified_when = time(); |
|
| 86 |
$modified_by = (method_exists($admin, 'get_user_id') ? $admin->get_user_id() : 1); |
|
| 87 |
$sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_droplets` SET '; |
|
| 88 |
$sql .= '`name` = \''.$name.'\', '; |
|
| 89 |
$sql .= '`code` = \''.$droplet.'\', '; |
|
| 90 |
$sql .= '`description` = \''.$description.'\', '; |
|
| 91 |
$sql .= '`comments` = \''.$comments.'\', '; |
|
| 92 |
$sql .= '`active` = 1, '; |
|
| 93 |
$sql .= '`modified_when` = '.$modified_when.', '; |
|
| 94 |
$sql .= '`modified_by` = '.$modified_by; |
|
| 95 |
if( !$database->query($sql) ) {
|
|
| 96 |
$msg[] = $database->get_error(); |
|
| 97 |
} |
|
| 98 |
// do not output anything if this script is called during fresh installation |
|
| 99 |
// if (method_exists($admin, 'get_user_id')) echo "Droplet import: $name<br/>"; |
|
| 71 | 100 |
} |
| 72 |
if (substr($cArray[0],0,3) == "//:") {
|
|
| 73 |
$comments = trim(substr($cArray[0],3)); |
|
| 74 |
array_shift ( $cArray ); |
|
| 101 |
} |
|
| 102 |
|
|
| 103 |
function getDropletCodeFromFile ( $dropletfile ) {
|
|
| 104 |
$data = ''; |
|
| 105 |
$filename = WB_PATH."/modules/droplets/example/".$dropletfile; |
|
| 106 |
if (file_exists($filename)) {
|
|
| 107 |
$filehandle = fopen ($filename, "r"); |
|
| 108 |
$data = fread ($filehandle, filesize ($filename)); |
|
| 109 |
fclose($filehandle); |
|
| 110 |
// unlink($filename); doesnt work in unix |
|
| 75 | 111 |
} |
| 76 |
$droplet = implode ( "\n", $cArray ); |
|
| 77 |
$name = substr($dropfile,0,-4); |
|
| 78 |
$modified_when = time(); |
|
| 79 |
$modified_by = (method_exists($admin, 'get_user_id') ? $admin->get_user_id() : 1); |
|
| 80 |
$sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_droplets` SET '; |
|
| 81 |
$sql .= '`name` = \''.$name.'\', '; |
|
| 82 |
$sql .= '`code` = \''.$droplet.'\', '; |
|
| 83 |
$sql .= '`description` = \''.$description.'\', '; |
|
| 84 |
$sql .= '`comments` = \''.$comments.'\', '; |
|
| 85 |
$sql .= '`active` = 1, '; |
|
| 86 |
$sql .= '`modified_when` = '.$modified_when.', '; |
|
| 87 |
$sql .= '`modified_by` = '.$modified_by; |
|
| 88 |
$database->query($sql); |
|
| 89 |
|
|
| 90 |
// do not output anything if this script is called during fresh installation |
|
| 91 |
// if (method_exists($admin, 'get_user_id')) echo "Droplet import: $name<br/>"; |
|
| 112 |
return $data; |
|
| 92 | 113 |
} |
| 93 |
} |
|
| 94 |
|
|
| 95 |
function getDropletCodeFromFile ( $dropletfile ) {
|
|
| 96 |
$data = ''; |
|
| 97 |
$filename = WB_PATH."/modules/droplets/example/".$dropletfile; |
|
| 98 |
if (file_exists($filename)) {
|
|
| 99 |
$filehandle = fopen ($filename, "r"); |
|
| 100 |
$data = fread ($filehandle, filesize ($filename)); |
|
| 101 |
fclose($filehandle); |
|
| 102 |
// unlink($filename); doesnt work in unix |
|
| 103 |
} |
|
| 104 |
return $data; |
|
| 105 |
} |
|
| branches/2.8.x/wb/modules/code/info.php | ||
|---|---|---|
| 25 | 25 |
/* -------------------------------------------------------- */ |
| 26 | 26 |
|
| 27 | 27 |
$module_directory = 'code'; |
| 28 |
$module_name = 'Code 2.8.3';
|
|
| 28 |
$module_name = 'Code'; |
|
| 29 | 29 |
$module_function = 'page'; |
| 30 | 30 |
$module_version = '2.8.3'; |
| 31 | 31 |
$module_platform = '2.7 | 2.8.x'; |
| branches/2.8.x/wb/modules/news/info.php | ||
|---|---|---|
| 24 | 24 |
} |
| 25 | 25 |
/* -------------------------------------------------------- */ |
| 26 | 26 |
$module_directory = 'news'; |
| 27 |
$module_name = 'News 3.5.6';
|
|
| 27 |
$module_name = 'News'; |
|
| 28 | 28 |
$module_function = 'page'; |
| 29 | 29 |
$module_version = '3.5.6'; |
| 30 | 30 |
$module_platform = '2.8.2'; |
Also available in: Unified diff
did some changes and fixes found by testers