Skip to content

Commit

Permalink
updated "wrapper" to v2.7.4, fixing issue #187
Browse files Browse the repository at this point in the history
  • Loading branch information
Bianka Martinovic committed Oct 23, 2013
1 parent 293a95e commit 4983143
Show file tree
Hide file tree
Showing 13 changed files with 249 additions and 185 deletions.
40 changes: 23 additions & 17 deletions upload/modules/wrapper/add.php
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
<?php

/**
* This file is part of an ADDON for use with Black Cat CMS Core.
* This ADDON is released under the GNU GPL.
* Additional license terms can be seen in the info.php of this module.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version.
*
* @module wrapper
* @author WebsiteBaker Project
* @author LEPTON Project
* @copyright 2004-2010, WebsiteBaker Project
* @copyright 2010-2011, LEPTON Project
* @link http://www.LEPTON-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @license_terms please see info.php of this module
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* @author Website Baker Project, LEPTON Project, Black Cat Development
* @copyright 2004-2010, Website Baker Project
* @copyright 2011-2012, LEPTON Project
* @copyright 2013, Black Cat Development
* @link http://blackcat-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @category CAT_Module
* @package wrapper
*
*/

// include class.secure.php to protect this file and the whole CMS!
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
} else {
$root = "../";
$level = 1;
while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
$root .= "../";
$level += 1;
}
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
} else {
trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
}
}
// end include class.secure.php

global $database, $page_id, $section_id;

Expand Down
40 changes: 23 additions & 17 deletions upload/modules/wrapper/delete.php
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
<?php

/**
* This file is part of an ADDON for use with Black Cat CMS Core.
* This ADDON is released under the GNU GPL.
* Additional license terms can be seen in the info.php of this module.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version.
*
* @module wrapper
* @author WebsiteBaker Project
* @author LEPTON Project
* @copyright 2004-2010, WebsiteBaker Project
* @copyright 2010-2011, LEPTON Project
* @link http://www.LEPTON-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @license_terms please see info.php of this module
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* @author Website Baker Project, LEPTON Project, Black Cat Development
* @copyright 2004-2010, Website Baker Project
* @copyright 2011-2012, LEPTON Project
* @copyright 2013, Black Cat Development
* @link http://blackcat-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @category CAT_Module
* @package wrapper
*
*/

// include class.secure.php to protect this file and the whole CMS!
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
} else {
$root = "../";
$level = 1;
while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
$root .= "../";
$level += 1;
}
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
} else {
trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
}
}
// end include class.secure.php

// Delete page from mod_wrapper
$database->query("DELETE FROM ".CAT_TABLE_PREFIX."mod_wrapper WHERE section_id = '$section_id'");
Expand Down
0 upload/modules/wrapper/htt/iframe.lte → upload/modules/wrapper/htt/iframe.tpl
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion upload/modules/wrapper/htt/modify.lte → upload/modules/wrapper/htt/modify.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form action="{$CAT_URL}/modules/wrapper/save.php" method="post" class="ajaxForm">
<form action="{$CAT_URL}/modules/wrapper/save.php" method="post">
<input type="hidden" name="page_id" value="{$PAGE_ID}" />
<input type="hidden" name="section_id" value="{$SECTION_ID}" />
<table cellpadding="0" cellspacing="0" border="0" width="100%">
Expand Down
0 upload/modules/wrapper/htt/object.lte → upload/modules/wrapper/htt/object.tpl
View file
File renamed without changes.
42 changes: 23 additions & 19 deletions upload/modules/wrapper/index.php
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
<?php

/**
* This file is part of an ADDON for use with Black Cat CMS Core.
* This ADDON is released under the GNU GPL.
* Additional license terms can be seen in the info.php of this module.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version.
*
* @module wrapper
* @author WebsiteBaker Project
* @author LEPTON Project
* @copyright 2004-2010, WebsiteBaker Project
* @copyright 2010-2011, LEPTON Project
* @link http://www.LEPTON-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @license_terms please see info.php of this module
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* @author Website Baker Project, LEPTON Project, Black Cat Development
* @copyright 2004-2010, Website Baker Project
* @copyright 2011-2012, LEPTON Project
* @copyright 2013, Black Cat Development
* @link http://blackcat-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @category CAT_Module
* @package wrapper
*
*/

// include class.secure.php to protect this file and the whole CMS!
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
} else {
$root = "../";
$level = 1;
while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
$root .= "../";
$level += 1;
}
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
} else {
trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
}
}
// end include class.secure.php

?>
46 changes: 27 additions & 19 deletions upload/modules/wrapper/info.php
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,59 @@
<?php

/**
* This file is part of an ADDON for use with Black Cat CMS Core.
* This ADDON is released under the GNU GPL.
* Additional license terms can be seen in the info.php of this module.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version.
*
* @module wrapper
* @author WebsiteBaker Project
* @author LEPTON Project
* @copyright 2004-2010, WebsiteBaker Project
* @copyright 2010-2012, LEPTON Project
* @link http://www.LEPTON-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @license_terms please see info.php of this module
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* @author Website Baker Project, LEPTON Project, Black Cat Development
* @copyright 2004-2010, Website Baker Project
* @copyright 2011-2012, LEPTON Project
* @copyright 2013, Black Cat Development
* @link http://blackcat-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @category CAT_Module
* @package wrapper
*
*/

// include class.secure.php to protect this file and the whole CMS!
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
} else {
$root = "../";
$level = 1;
while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
$root .= "../";
$level += 1;
}
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
} else {
trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
}
}
// end include class.secure.php

$module_directory = 'wrapper';
$module_name = 'Wrapper';
$module_function = 'page';
$module_version = '2.7.3';
$module_version = '2.7.4';
$module_platform = '2.x';
$module_author = 'Ryan Djurovich, Dietrich Roland Pehlke (last)';
$module_author = 'Ryan Djurovich, Dietrich Roland Pehlke, Black Cat Development (last)';
$module_license = 'GNU General Public License';
$module_description = 'This module allows you to wrap your site around another using an inline frame';
$module_guid = 'a5830654-06f3-402a-9d25-a03c53fc5574';

/**
* 2.7.4 2013-10-23 - fix for BlackCat CMS
*
* 2.7.3 2012-02-09 - added upgrade.php.
*
* 2.7.1 2010-11-02 - Bugfix inside the html-template to get valid output.
Expand Down
43 changes: 24 additions & 19 deletions upload/modules/wrapper/install.php
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,45 @@
<?php

/**
* This file is part of an ADDON for use with Black Cat CMS Core.
* This ADDON is released under the GNU GPL.
* Additional license terms can be seen in the info.php of this module.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* @module wrapper
* @author WebsiteBaker Project
* @author LEPTON Project
* @copyright 2004-2010, WebsiteBaker Project
* @copyright 2010-2011, LEPTON Project
* @link http://www.LEPTON-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @license_terms please see info.php of this module
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* @author Website Baker Project, LEPTON Project, Black Cat Development
* @copyright 2004-2010, Website Baker Project
* @copyright 2011-2012, LEPTON Project
* @copyright 2013, Black Cat Development
* @link http://blackcat-cms.org
* @license http://www.gnu.org/licenses/gpl.html
* @category CAT_Module
* @package wrapper
*
*/

// include class.secure.php to protect this file and the whole CMS!
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
if (defined('CAT_PATH')) {
include(CAT_PATH.'/framework/class.secure.php');
} else {
$root = "../";
$level = 1;
while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
$root .= "../";
$level += 1;
}
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
if (file_exists($root.'/framework/class.secure.php')) {
include($root.'/framework/class.secure.php');
} else {
trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
}
}
// end include class.secure.php

if(defined('CAT_URL')) {

Expand Down Expand Up @@ -61,5 +68,3 @@
error_log( "Unable to register file -$file-!" );
}
}

?>

0 comments on commit 4983143

Please sign in to comment.