Skip to content

Commit

Permalink
MX-Publisher CMS 3.0.0-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
@orynider
orynider committed Oct 4, 2018
1 parent 94edbe5 commit 1416aa3
Show file tree
Hide file tree
Showing 2,504 changed files with 194,385 additions and 13,773 deletions.
4 changes: 3 additions & 1 deletion .htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ DirectoryIndex index.php

# Just in case, let's disable viewing of directory indexes.
Options -Indexes
Options +FollowSymLinks

# Just in case, let's disable register globals (only valid for php4).
# Do NOT enable this when running php5, or you may face internal server errors
Expand Down Expand Up @@ -70,7 +71,8 @@ deny from all
#

#RewriteRule ^support/catlink([0-9]*)(.*)$ index.php?page=53&cat_link=$1 [L]
#RewriteRule ^support(.*)$ index.php?page=53 [L]
#RewriteRule ^support(.*)$ index.php?page=53 [L]
#RewriteRule ^index.html$ index.php [L,NE]

#
# General
Expand Down
17 changes: 5 additions & 12 deletions admin/admin_mx_block_cp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
/**
*
* @package MX-Publisher Core
* @version $Id: admin_mx_block_cp.php,v 1.25 2008/07/15 22:02:42 jonohlsson Exp $
* @version $Id: admin_mx_block_cp.php,v 1.29 2013/06/28 15:32:37 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
* @link http://mxpcms.sourceforge.net/
*
*/

Expand All @@ -19,7 +19,7 @@
//
// Security and Page header
//
define('IN_PORTAL', 1);
@define('IN_PORTAL', 1);
$mx_root_path = './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
$no_page_header = TRUE;
Expand Down Expand Up @@ -49,22 +49,18 @@
$blog_mode = $mx_request_vars->request('blog_mode', MX_TYPE_NO_TAGS, '');
$sid = $mx_request_vars->request('sid', MX_TYPE_NO_TAGS, '');

//
// Initial vars
//
$block_id = $mx_request_vars->is_request('block_id') ? $mx_request_vars->request('block_id', MX_TYPE_INT, '') : $mx_request_vars->request('id', MX_TYPE_INT, '');
$portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 0);
$sub_id = $mx_request_vars->request('sub_id', MX_TYPE_INT, 0);
$blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']);

//
// Parameters
//
$submit = $mx_request_vars->is_post('submit');
$submit_pars = $mx_request_vars->is_post('submit_pars');
$cancel = $mx_request_vars->is_post('cancel');
$preview = $mx_request_vars->is_post('preview');
$refresh = $preview || $submit_search;
$refresh = $preview || $submit;

//
// Cancel
Expand Down Expand Up @@ -158,9 +154,7 @@

} // if .. !empty($mode)

//
// Hidden vars
//
$s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
$s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $block_id . '" />';
$s_hidden_fields .= '<input type="hidden" name="portalpage" value="' . $portalpage . '" />';
Expand All @@ -186,12 +180,11 @@
$mx_dynamic_select = new mx_dynamic_select();
$mx_dynamic_select->generate($block_id, true);
$blockcptemplate->assign_block_vars('dynamic_select', array());

//
// Start output
//
$blockcptemplate->set_filenames(array(
'body' => 'admin/mx_blockcp_admin_body.tpl'
'body' => 'admin/mx_blockcp_admin_body.tpl'
));

//
Expand Down
6 changes: 3 additions & 3 deletions admin/admin_mx_chkobjs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
/**
*
* @package MX-Publisher Core
* @version $Id: admin_mx_chkobjs.php,v 1.28 2008/02/11 11:27:26 joasch Exp $
* @version $Id: admin_mx_chkobjs.php,v 1.30 2013/06/28 15:32:37 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
* @link http://mxpcms.sourceforge.net/
*
*/

Expand All @@ -21,7 +21,7 @@
//
// Security and Page header
//
define('IN_PORTAL', 1);
@define('IN_PORTAL', 1);
$mx_root_path = './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
$no_page_header = TRUE;
Expand Down
6 changes: 3 additions & 3 deletions admin/admin_mx_gen_cache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
/**
*
* @package MX-Publisher Core
* @version $Id: admin_mx_gen_cache.php,v 1.29 2008/02/12 21:24:18 jonohlsson Exp $
* @version $Id: admin_mx_gen_cache.php,v 1.31 2013/06/28 15:32:37 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
* @link http://mxpcms.sourceforge.net/
*
*/

Expand All @@ -18,7 +18,7 @@
//
// Security and Page header
//
define('IN_PORTAL', 1);
@define('IN_PORTAL', 1);
$mx_root_path = './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
$no_page_header = TRUE;
Expand Down
30 changes: 19 additions & 11 deletions admin/admin_mx_meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
/**
*
* @package MX-Publisher Core
* @version $Id: admin_mx_meta.php,v 1.19 2008/02/04 15:44:44 joasch Exp $
* @version $Id: admin_mx_meta.php,v 1.22 2013/06/28 15:32:37 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
* @link http://mxpcms.sourceforge.net/
*
*/

Expand All @@ -18,7 +18,7 @@
//
// Security and Page header
//
define('IN_PORTAL', 1);
@define('IN_PORTAL', 1);
$mx_root_path = './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
$no_page_header = TRUE;
Expand Down Expand Up @@ -48,24 +48,28 @@
$title = $mx_request_vars->post('title', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$author = $mx_request_vars->post('author', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$copyright = $mx_request_vars->post('copyright', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$imagetoolbar = $mx_request_vars->post('imagetoolbar', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), 'no');
$distribution = $mx_request_vars->post('distribution', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), 'global');
$keywords = $mx_request_vars->post('keywords', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$description = $mx_request_vars->post('description', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$langcode = $mx_request_vars->post('langcode', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$rating = $mx_request_vars->post('rating', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$index = $mx_request_vars->post('index', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$follow = $mx_request_vars->post('follow', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$pragma = $mx_request_vars->post('pragma', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$icon = $mx_request_vars->post('icon', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '');
$langcode = $mx_request_vars->post('langcode', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), 'en-gb');
$rating = $mx_request_vars->post('rating', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), 'general');
$index = $mx_request_vars->post('index', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), 'follow');
$follow = $mx_request_vars->post('follow', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), 'index');
$pragma = $mx_request_vars->post('pragma', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), '7');
$icon = $mx_request_vars->post('icon', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), 'favicon.ico');

//
// Note we need to allow HTML Tags for the Extra Meta Settings!!!
//
$header = $mx_request_vars->post('header', (MX_TYPE_NO_STRIP), '');

$config_data = '<?php';
$config_data .= "\n" . ' $title = "' . $title . '";';
$config_data .= "\n" . ' $title = "' . str_replace("\'", "`", htmlspecialchars(trim($title))) . '";';
$config_data .= "\n" . ' $author = "' . $author . '";';
$config_data .= "\n" . ' $copyright = "' . $copyright . '";';
$config_data .= "\n" . ' $imagetoolbar = "' . $imagetoolbar . '";';
$config_data .= "\n" . ' $distribution = "' . $distribution . '";';
$config_data .= "\n" . ' $keywords = "' . $keywords . '";';
$config_data .= "\n" . ' $description = "' . $description . '";';
$config_data .= "\n" . ' $langcode = "' . $langcode . '";';
Expand All @@ -75,7 +79,7 @@
$config_data .= "\n" . ' $pragma = "' . $pragma . '";';
$config_data .= "\n" . ' $icon = "' . $icon . '";';
$config_data .= "\n" . ' $header = "' . $header . '";';
$config_data .= "\n" . '?>'; // Done this to prevent highlighting editors getting confused!
$config_data .= "\n" . '?>'; // Done this to prevent highlighting editors getting confused

//
// Write out the config file.
Expand Down Expand Up @@ -120,6 +124,8 @@
'L_TITLE' => $lang['Meta_Title'],
'L_AUTHOR' => $lang['Meta_Author'],
'L_COPYRIGHT' => $lang['Meta_Copyright'],
'L_IMAGETOOLBAR' => $lang['Meta_ImageToolBar'],
'L_DISTRIBUTION' => $lang['Meta_Distribution'],
'L_KEYWORDS' => $lang['Meta_Keywords'],
'L_KEYWORDS_EXPLAIN' => $lang['Meta_Keywords_explain'],
'L_DESCRIPTION' => $lang['Meta_Description'],
Expand All @@ -134,6 +140,8 @@
'TITLE' => $title,
'AUTHOR' => $author,
'COPYRIGHT' => $copyright,
'IMAGETOOLBAR' => $imagetoolbar,
'DISTRIBUTION' => $distribution,
'KEYWORDS' => $keywords,
'DESCRIPTION' => $description,
'LANGUAGE' => mx_generate_meta_select($langcode, 'langcode'),
Expand Down
25 changes: 12 additions & 13 deletions admin/admin_mx_module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
/**
*
* @package MX-Publisher Core
* @version $Id: admin_mx_module.php,v 1.51 2008/02/11 11:13:16 joasch Exp $
* @version $Id: admin_mx_module.php,v 1.54 2013/06/28 15:32:37 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
* @link http://mxpcms.sourceforge.net/
*
*/

Expand All @@ -18,7 +18,7 @@
//
// Security and Page header
//
define('IN_PORTAL', 1);
@define('IN_PORTAL', 1);
$mx_root_path = './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
$no_page_header = TRUE;
Expand Down Expand Up @@ -117,15 +117,15 @@
//
$s_hidden_module_install_fields = '<input type="hidden" name="mode" value="' . MX_MODULE_TYPE . '" />
<input type="hidden" name="action" value="' . MX_DO_INSTALL . '" />
<input type="hidden" name="id" value="' . $module_id . '" />
<input type="hidden" name="id" value="' . $nav_module_id . '" />
<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';

$result_message_height = $is_pak ? '300px' : '50px';
$result_message_height = isset($is_pak) ? '300px' : '50px';

//
// Hidden vars
//
$s_hidden_fields_module = '<input type="hidden" name="mode" value="add" /><input type="hidden" name="id" value="' . $module_id . '" />';
$s_hidden_fields_module = '<input type="hidden" name="mode" value="add" /><input type="hidden" name="id" value="' . $nav_module_id . '" />';

//
// Send to template
Expand All @@ -134,8 +134,8 @@
'L_TITLE' => $lang['Module_admin'],
'L_EXPLAIN' => $lang['Module_admin_explain'],

'NAV_MODULE_ID' => $nav_module_id,
'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:'.$result_message_height.'"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '',
'NAV_MODULE_ID' => $nav_module_id,
'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:'.$result_message_height.'"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '',

//
// General
Expand Down Expand Up @@ -208,7 +208,7 @@
{
$module_rows_current = $db->sql_fetchrowset($q_modules_current);
}
$db->sql_freeresult($result);
$db->sql_freeresult($q_modules_current);

//
// Get the rest modules
Expand All @@ -228,8 +228,7 @@
{
$module_rows = $db->sql_fetchrowset($q_modules);
}

$db->sql_freeresult($result);
$db->sql_freeresult($q_modules);

if ( $total_modules + $total_modules_current == 0 )
{
Expand All @@ -249,12 +248,12 @@
//
// Loop through the rows of modules setting block vars for the template.
//
for( $module_count = -1; $module_count < $total_modules; $module_count++ )
for( $module_count = 0; $module_count < $total_modules; $module_count++ )
{
//
// Give main vars specific names
//
$new_module = $module_count == -1;
$new_module = $module_count == 0;

$newmode = $new_module ? 'add' : 'modify';
$module_id = $new_module ? '0' : $module_rows[$module_count]['module_id'];
Expand Down
Loading

0 comments on commit 1416aa3

Please sign in to comment.