diff --git a/admin/global.php b/admin/global.php
index 765667c..0e639d9 100755
--- a/admin/global.php
+++ b/admin/global.php
@@ -31,26 +31,26 @@ require_once('./includes/admin_strings.php');
// ###################################################################
$kalens->load('printer', 'admin', true);
-$admin->css_link('../framework/printer.css.php');
-$admin->set('realm', $lang->string('Administration'));
-$admin->page_code('<script type="text/javascript" src="../clientside/global.js"></script>');
+$print->css_link('../framework/printer.css.php');
+$print->set('realm', $lang->string('Administration'));
+$print->page_code('<script type="text/javascript" src="../clientside/global.js"></script>');
function admin_login()
{
global $kalens;
- $kalens->admin->page_start($kalens->lang->string('Login'), '', 15, '', 'document.cplogin.' . ($kalens->userinfo['username'] ? 'password' : 'username') . '.focus();');
+ $kalens->print->page_start($kalens->lang->string('Login'), '', 15, '', 'document.cplogin.' . ($kalens->userinfo['username'] ? 'password' : 'username') . '.focus();');
- $kalens->admin->form_start('../login.php', 'cplogin', false, 'cplogin');
- $kalens->admin->table_start(true, '425');
- $kalens->admin->table_head($kalens->lang->string('ProCal') . ' ' . $kalens->lang->string('Login'));
- $kalens->admin->row_input($kalens->lang->string('Username'), 'username', $kalens->userinfo['username'], 2, 35, false, false, 'middle');
- $kalens->admin->row_input($kalens->lang->string('Password'), 'password', '', 2, 35, false, true, 'middle');
- $kalens->admin->row_submit('', $kalens->lang->string('Login'));
- $kalens->admin->table_end();
- $kalens->admin->form_end();
+ $kalens->print->form_start('../login.php', 'cplogin', false, 'cplogin');
+ $kalens->print->table_start(true, '425');
+ $kalens->print->table_head($kalens->lang->string('ProCal') . ' ' . $kalens->lang->string('Login'));
+ $kalens->print->row_input($kalens->lang->string('Username'), 'username', $kalens->userinfo['username'], 2, 35, false, false, 'middle');
+ $kalens->print->row_input($kalens->lang->string('Password'), 'password', '', 2, 35, false, true, 'middle');
+ $kalens->print->row_submit('', $kalens->lang->string('Login'));
+ $kalens->print->table_end();
+ $kalens->print->form_end();
- $kalens->admin->page_end();
+ $kalens->print->page_end();
}
// ########################### ADMIN LOGIN ###########################
@@ -61,7 +61,7 @@ if ($_COOKIE[COOKIE_PREFIX . 'adminsession'])
if (md5(md5($kalens->userinfo['password']) . md5($kalens->userinfo['email']) . md5($kalens->userinfo['userid'])) != $_COOKIE[COOKIE_PREFIX . 'adminsession'])
{
$funct->cookie(COOKIE_PREFIX . 'adminsession', null);
- $admin->error($lang->string('The admin session on your computer does not authenticate properly in our system. It has been removed from your system. This is considered an attempt to gain unauthorized entry into the system.'));
+ $print->error($lang->string('The admin session on your computer does not authenticate properly in our system. It has been removed from your system. This is considered an attempt to gain unauthorized entry into the system.'));
}
else
{
diff --git a/admin/index.php b/admin/index.php
index 9cced04..4b5deea 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -63,15 +63,15 @@ if (empty($_REQUEST['do']))
if ($_REQUEST['do'] == 'main')
{
- $admin->page_start(sprintf($lang->string('%1$s Panel'), $lang->string('Administration')));
+ $print->page_start(sprintf($lang->string('%1$s Panel'), $lang->string('Administration')));
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('%1$s Panel'), $lang->string('Administration')), 2);
- $admin->row_span($lang->string('Welcome to the ProCal Administration Panel. Here you can setup all of the various options that ProCal has to offer. If you have any problems using this panel, consult the <a href="http://docs.iris-studios.com/" target="_blank">online manual</a>.'), 'alt1');
- $admin->table_end();
- $admin->form_end();
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('%1$s Panel'), $lang->string('Administration')), 2);
+ $print->row_span($lang->string('Welcome to the ProCal Administration Panel. Here you can setup all of the various options that ProCal has to offer. If you have any problems using this panel, consult the <a href="http://docs.iris-studios.com/" target="_blank">online manual</a>.'), 'alt1');
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
if ($_REQUEST['do'] == 'nav')
@@ -121,10 +121,10 @@ if ($_REQUEST['do'] == 'nav')
// -------------------------------------------------------------------
- $admin->page_start($lang->string('Navigation'), 'nav_body');
+ $print->page_start($lang->string('Navigation'), 'nav_body');
- $admin->page_code("\n<div align=\"center\"><img src=\"../images/admin/logo.gif\" title=\"\" border=\"0\" /></div>\n");
- $admin->page_code("<br />\n<br />\n\n<!-- cp main link -->\n<div align=\"center\">\n\t<a href=\"index.php?do=main\" class=\"smallfont\" target=\"main\">" . $lang->string('Index') . "</a> | <a href=\"../login.php?do=cplogout\" class=\"smallfont\" target=\"_parent\">" . $lang->string('Logout') . "</a>\n</div>\n<!-- / cp main link -->\n<br />\n");
+ $print->page_code("\n<div align=\"center\"><img src=\"../images/admin/logo.gif\" title=\"\" border=\"0\" /></div>\n");
+ $print->page_code("<br />\n<br />\n\n<!-- cp main link -->\n<div align=\"center\">\n\t<a href=\"index.php?do=main\" class=\"smallfont\" target=\"main\">" . $lang->string('Index') . "</a> | <a href=\"../login.php?do=cplogout\" class=\"smallfont\" target=\"_parent\">" . $lang->string('Logout') . "</a>\n</div>\n<!-- / cp main link -->\n<br />\n");
foreach ($navigation AS $group => $links)
{
@@ -138,7 +138,7 @@ if ($_REQUEST['do'] == 'nav')
echo "\n</div>";
}
- $admin->page_end();
+ $print->page_end();
}
/*=====================================================================*\
diff --git a/admin/options.php b/admin/options.php
index 971e8a5..22da8de 100755
--- a/admin/options.php
+++ b/admin/options.php
@@ -26,9 +26,9 @@ require_once('./global.php');
require_once('./includes/admin/xml.php');
$settingtypes = array(
- 'text' => '$admin->row_input',
- 'textarea' => '$admin->row_textarea',
- 'list' => '$admin->row_list'
+ 'text' => '$print->row_input',
+ 'textarea' => '$print->row_textarea',
+ 'list' => '$print->row_list'
);
function setting_code($setting)
@@ -37,24 +37,24 @@ function setting_code($setting)
$IS_SETTINGS = true;
- $kalens->admin->row_span((DEVDEBUG ? "<span class=\"smallfont\" style=\"float: right;\"><a href=\"options.php?do=editsetting&varname=$setting[varname]\">[" . $kalens->lang->string('Edit') . "]</a> <a href=\"options.php?do=killsetting&varname=$setting[varname]&group=$setting[groupname]\" onclick=\"return confirm('" . $kalens->lang->string('Are you sure you want to perform this delete operation?') . "');\">[" . $kalens->lang->string('Delete') . "]</a></span>" : '') . '<span' . (DEVDEBUG ? ' title="$kalens->options[\'' . $setting['varname'] . '\']"' : '') . "><strong>" . AdminStrings::fetchSettingTitle($setting['varname']) . "</strong></span>", 'thead');
+ $kalens->print->row_span((DEVDEBUG ? "<span class=\"smallfont\" style=\"float: right;\"><a href=\"options.php?do=editsetting&varname=$setting[varname]\">[" . $kalens->lang->string('Edit') . "]</a> <a href=\"options.php?do=killsetting&varname=$setting[varname]&group=$setting[groupname]\" onclick=\"return confirm('" . $kalens->lang->string('Are you sure you want to perform this delete operation?') . "');\">[" . $kalens->lang->string('Delete') . "]</a></span>" : '') . '<span' . (DEVDEBUG ? ' title="$kalens->options[\'' . $setting['varname'] . '\']"' : '') . "><strong>" . AdminStrings::fetchSettingTitle($setting['varname']) . "</strong></span>", 'thead');
switch ($setting['code'])
{
case 'textbox':
- $kalens->admin->row_input(AdminStrings::fetchSettingDescription($setting['varname']), 'settings[' . $setting['varname'] . ']', $setting['value']);
+ $kalens->print->row_input(AdminStrings::fetchSettingDescription($setting['varname']), 'settings[' . $setting['varname'] . ']', $setting['value']);
break;
case 'textarea':
- $kalens->admin->row_textarea(AdminStrings::fetchSettingDescription($setting['varname']), 'settings[' . $setting['varname'] . ']', $setting['value']);
+ $kalens->print->row_textarea(AdminStrings::fetchSettingDescription($setting['varname']), 'settings[' . $setting['varname'] . ']', $setting['value']);
break;
case 'yesno':
- $kalens->admin->list_item($kalens->lang->string('No'), '0', ($setting['value'] == false));
- $kalens->admin->list_item($kalens->lang->string('Yes'), '1', ($setting['value'] == true));
- $kalens->admin->row_list(AdminStrings::fetchSettingDescription($setting['varname']), 'settings[' . $setting['varname'] . ']');
+ $kalens->print->list_item($kalens->lang->string('No'), '0', ($setting['value'] == false));
+ $kalens->print->list_item($kalens->lang->string('Yes'), '1', ($setting['value'] == true));
+ $kalens->print->row_list(AdminStrings::fetchSettingDescription($setting['varname']), 'settings[' . $setting['varname'] . ']');
break;
default:
eval('$value = "' . $kalens->clean($setting['code'], TYPE_STRUN) . '";');
- $kalens->admin->row_text(AdminStrings::fetchSettingDescription($setting['varname']), $value);
+ $kalens->print->row_text(AdminStrings::fetchSettingDescription($setting['varname']), $value);
break;
}
}
@@ -62,19 +62,19 @@ function setting_code($setting)
// ######################## NEW SETTING GROUP ########################
if ($_REQUEST['do'] == 'newgroup')
{
- $admin->page_start(sprintf($lang->string('Add %1$s'), sprintf($lang->string('%1$s Group'), $lang->string('Setting'))));
+ $print->page_start(sprintf($lang->string('Add %1$s'), sprintf($lang->string('%1$s Group'), $lang->string('Setting'))));
- $admin->form_start('options.php', 'mk_group');
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('Add %1$s'), sprintf($lang->string('%1$s Group'), $lang->string('Setting'))));
- $admin->row_input($lang->string('Name'), 'groupname');
- $admin->row_input($lang->string('Shortname'), 'shortname');
- $admin->row_input($lang->string('Display Order'), 'displayorder');
- $admin->row_submit();
- $admin->table_end();
- $admin->form_end();
+ $print->form_start('options.php', 'mk_group');
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('Add %1$s'), sprintf($lang->string('%1$s Group'), $lang->string('Setting'))));
+ $print->row_input($lang->string('Name'), 'groupname');
+ $print->row_input($lang->string('Shortname'), 'shortname');
+ $print->row_input($lang->string('Display Order'), 'displayorder');
+ $print->row_submit();
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ######################## EDIT SETTING GROUP #######################
@@ -82,26 +82,26 @@ if ($_REQUEST['do'] == 'editgroup')
{
$get_group = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "settinggroup WHERE shortname = '" . $kalens->input_escape('group') . "'");
- $admin->page_start(sprintf($lang->string('Edit %1$s'), sprintf($lang->string('%1$s Group'), $lang->string('Setting'))));
+ $print->page_start(sprintf($lang->string('Edit %1$s'), sprintf($lang->string('%1$s Group'), $lang->string('Setting'))));
- $admin->form_start('options.php', 'ch_group');
- $admin->form_hidden_field('group', $get_group['shortname']);
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('Edit %1$s'), sprintf($lang->string('%1$s Group'), $lang->string('Setting'))));
- $admin->row_input($lang->string('Name'), 'groupname', $get_group['groupname']);
- $admin->row_input($lang->string('Display Order'), 'displayorder', $get_group['displayorder']);
- $admin->row_submit('<input type="checkbox" name="kill" value="1" />' . $lang->string('Delete'));
- $admin->table_end();
- $admin->form_end();
+ $print->form_start('options.php', 'ch_group');
+ $print->form_hidden_field('group', $get_group['shortname']);
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('Edit %1$s'), sprintf($lang->string('%1$s Group'), $lang->string('Setting'))));
+ $print->row_input($lang->string('Name'), 'groupname', $get_group['groupname']);
+ $print->row_input($lang->string('Display Order'), 'displayorder', $get_group['displayorder']);
+ $print->row_submit('<input type="checkbox" name="kill" value="1" />' . $lang->string('Delete'));
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ######################### ADD GROUP ACTION ########################
if ($_POST['do'] == 'mk_group')
{
$db->query("INSERT INTO " . TABLE_PREFIX . "settinggroup (groupname, shortname, displayorder) VALUES ('" . $kalens->input_escape('groupname') . "', '" . $kalens->input_escape('shortname') . "', " . $kalens->input_clean('displayorder', TYPE_UINT) . ")");
- $admin->redirect('options.php?do=settings&group=' . $kalens->in['shortname'], 10, true);
+ $print->redirect('options.php?do=settings&group=' . $kalens->in['shortname'], 10, true);
}
// ######################## EDIT GROUP ACTION ########################
@@ -114,7 +114,7 @@ if ($_POST['do'] == 'ch_group')
}
$db->query("UPDATE " . TABLE_PREFIX . "settinggroup SET groupname = '" . $kalens->input_escape('groupname') . "', displayorder = " . $kalens->input_clean('displayorder', TYPE_UINT) . " WHERE shortname = '" . $kalens->input_escape('group') . "'");
- $admin->redirect('options.php?do=settings&group=' . $kalens->in['group'], 10, true);
+ $print->redirect('options.php?do=settings&group=' . $kalens->in['group'], 10, true);
}
// ########################### SETTING LIST ##########################
@@ -123,23 +123,23 @@ if ($_REQUEST['do'] == 'settings')
$group = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "settinggroup WHERE shortname = '" . $kalens->input_escape('group') . "'");
$settings = $db->query("SELECT * FROM " . TABLE_PREFIX . "setting WHERE groupname = '$group[shortname]' ORDER BY varname ASC");
- $admin->page_start($group['groupname']);
+ $print->page_start($group['groupname']);
- $admin->form_start('options.php', 'save_settings');
- $admin->form_hidden_field('group', $group['shortname']);
- $admin->table_start();
- $admin->table_head($group['groupname'] . (DEVDEBUG ? " <a href=\"options.php?do=addsetting&group=$group[shortname]\">" . sprintf($lang->string('[%1$s]'), $lang->string('Add')) . "</a> <a href=\"options.php?do=editgroup&group=$group[shortname]\">" . sprintf($lang->string('[%1$s]'), $lang->string('Edit')) . "</a>" : ''));
+ $print->form_start('options.php', 'save_settings');
+ $print->form_hidden_field('group', $group['shortname']);
+ $print->table_start();
+ $print->table_head($group['groupname'] . (DEVDEBUG ? " <a href=\"options.php?do=addsetting&group=$group[shortname]\">" . sprintf($lang->string('[%1$s]'), $lang->string('Add')) . "</a> <a href=\"options.php?do=editgroup&group=$group[shortname]\">" . sprintf($lang->string('[%1$s]'), $lang->string('Edit')) . "</a>" : ''));
while ($setting = $db->fetch_array($settings))
{
setting_code($setting);
}
- $admin->row_submit();
- $admin->table_end();
- $admin->form_end();
+ $print->row_submit();
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ########################## SAVE SETTINGS ##########################
@@ -149,25 +149,25 @@ if ($_POST['do'] == 'save_settings')
{
$db->query("UPDATE " . TABLE_PREFIX . "setting SET value = '" . $kalens->escape($value) . "' WHERE varname = '" . $kalens->escape($name) . "'");
}
- $admin->redirect("options.php?do=settings&group=" . $kalens->in['group']);
+ $print->redirect("options.php?do=settings&group=" . $kalens->in['group']);
}
// ########################### ADD SETTING ###########################
if ($_REQUEST['do'] == 'addsetting')
{
- $admin->page_start(sprintf($lang->string('Add %1$s'), $lang->string('Setting')));
- $admin->form_start('options.php', 'mk_setting');
- $admin->form_hidden_field('group', $kalens->in['group']);
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('Add %1$s'), $lang->string('Setting')));
- $admin->row_input($lang->string('Varname'), 'varname');
- $admin->row_textarea($lang->string('Code Type'), 'code');
- $admin->row_textarea($lang->string('Value'), 'value');
- $admin->row_input($lang->string('Volatile'), 'volatile', 0);
- $admin->row_submit();
- $admin->table_end();
- $admin->form_end();
- $admin->page_end();
+ $print->page_start(sprintf($lang->string('Add %1$s'), $lang->string('Setting')));
+ $print->form_start('options.php', 'mk_setting');
+ $print->form_hidden_field('group', $kalens->in['group']);
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('Add %1$s'), $lang->string('Setting')));
+ $print->row_input($lang->string('Varname'), 'varname');
+ $print->row_textarea($lang->string('Code Type'), 'code');
+ $print->row_textarea($lang->string('Value'), 'value');
+ $print->row_input($lang->string('Volatile'), 'volatile', 0);
+ $print->row_submit();
+ $print->table_end();
+ $print->form_end();
+ $print->page_end();
}
// ######################## ADD SETTING ACTION #######################
@@ -184,7 +184,7 @@ if ($_POST['do'] == 'mk_setting')
" . $kalens->input_clean('volatile', TYPE_UINT) . "
)"
);
- $admin->redirect("options.php?do=settings&group=" . $kalens->in['group']);
+ $print->redirect("options.php?do=settings&group=" . $kalens->in['group']);
}
// ########################### EDIT SETTING ##########################
@@ -193,26 +193,26 @@ if ($_REQUEST['do'] == 'editsetting')
$setting = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "setting WHERE varname = '" . $kalens->input_escape('varname') . "'");
$groups = $db->query("SELECT * FROM " . TABLE_PREFIX . "settinggroup ORDER BY displayorder ASC");
- $admin->page_start(sprintf($lang->string('Edit %1$s'), $lang->string('Setting')));
- $admin->form_start('options.php', 'ch_setting');
- $admin->form_hidden_field('varname', $setting['varname']);
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('Add %1$s'), $lang->string('Setting')));
+ $print->page_start(sprintf($lang->string('Edit %1$s'), $lang->string('Setting')));
+ $print->form_start('options.php', 'ch_setting');
+ $print->form_hidden_field('varname', $setting['varname']);
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('Add %1$s'), $lang->string('Setting')));
while ($group = $db->fetch_array($groups))
{
- $admin->list_item($group['groupname'], $group['shortname'], ($group['shortname'] == $setting['groupname']));
+ $print->list_item($group['groupname'], $group['shortname'], ($group['shortname'] == $setting['groupname']));
}
- $admin->row_list($lang->string('Group Name'), 'groupname');
+ $print->row_list($lang->string('Group Name'), 'groupname');
- $admin->row_text($lang->string('Varname'), $setting['varname']);
- $admin->row_textarea($lang->string('Code Type'), 'code', $setting['code']);
- $admin->row_textarea($lang->string('Value'), 'value', $setting['value']);
- $admin->row_input($lang->string('Volatile'), 'volatile', $setting['volatile']);
- $admin->row_submit();
- $admin->table_end();
- $admin->form_end();
- $admin->page_end();
+ $print->row_text($lang->string('Varname'), $setting['varname']);
+ $print->row_textarea($lang->string('Code Type'), 'code', $setting['code']);
+ $print->row_textarea($lang->string('Value'), 'value', $setting['value']);
+ $print->row_input($lang->string('Volatile'), 'volatile', $setting['volatile']);
+ $print->row_submit();
+ $print->table_end();
+ $print->form_end();
+ $print->page_end();
}
// ####################### EDIT SETTING ACTION #######################
@@ -226,31 +226,31 @@ if ($_POST['do'] == 'ch_setting')
volatile = " . $kalens->input_clean('volatile', TYPE_UINT) . "
WHERE varname = '" . $kalens->input_escape('varname') . "'"
);
- $admin->redirect("options.php?do=settings&group=" . $kalens->in['groupname']);
+ $print->redirect("options.php?do=settings&group=" . $kalens->in['groupname']);
}
// ########################## DELETE SETTING #########################
if ($_REQUEST['do'] == 'killsetting')
{
$db->query("DELETE FROM " . TABLE_PREFIX . "setting WHERE varname = '" . $kalens->input_escape('varname') . "'");
- $admin->redirect("options.php?do=settings&group=" . $kalens->in['group']);
+ $print->redirect("options.php?do=settings&group=" . $kalens->in['group']);
}
// ############################ XML IMPEX ############################
if ($_REQUEST['do'] == 'io')
{
- $admin->page_start($lang->string('XML Import/Export'));
+ $print->page_start($lang->string('XML Import/Export'));
- $admin->form_start('options.php', 'ul', 'multipart/form-data');
- $admin->table_start();
- $admin->table_head($lang->string('XML Import/Export'));
- $admin->row_upload($lang->string('Upload File'), 'settingfile');
- $admin->row_submit();
- $admin->table_head($lang->string('Downoad File'));
- $admin->row_span("<strong>" . $lang->string('Downoad File') . ":</strong> <a href=\"options.php?do=dl\">" . $lang->string('Downoad File') . "</a>");
- $admin->table_end();
+ $print->form_start('options.php', 'ul', 'multipart/form-data');
+ $print->table_start();
+ $print->table_head($lang->string('XML Import/Export'));
+ $print->row_upload($lang->string('Upload File'), 'settingfile');
+ $print->row_submit();
+ $print->table_head($lang->string('Downoad File'));
+ $print->row_span("<strong>" . $lang->string('Downoad File') . ":</strong> <a href=\"options.php?do=dl\">" . $lang->string('Downoad File') . "</a>");
+ $print->table_end();
- $admin->page_end();
+ $print->page_end();
}
if ($_REQUEST['do'] == 'dl')
@@ -264,10 +264,10 @@ if ($_POST['do'] == 'ul')
if ($result !== true)
{
- $admin->error($result);
+ $print->error($result);
}
- $admin->redirect('options.php');
+ $print->redirect('options.php');
}
/*=====================================================================*\
diff --git a/admin/styles.php b/admin/styles.php
index 3f42efc..99dc8bc 100644
--- a/admin/styles.php
+++ b/admin/styles.php
@@ -44,14 +44,14 @@ if ($_REQUEST['do'] == 'kill')
$style->set_condition();
$style->delete();
- $admin->redirect('styles.php?do=modify');
+ $print->redirect('styles.php?do=modify');
}
// ###################################################################
if ($_REQUEST['do'] == 'delete')
{
- $admin->page_confirm($lang->string('Are you sure you want to delete this style and any template customizations in it?'), 'styles.php', 'kill', array('styleid' => $kalens->in['styleid']));
+ $print->page_confirm($lang->string('Are you sure you want to delete this style and any template customizations in it?'), 'styles.php', 'kill', array('styleid' => $kalens->in['styleid']));
}
// ###################################################################
@@ -75,37 +75,37 @@ if ($_POST['do'] == 'insert')
$result = upload_template_xml(@file_get_contents($_FILES['templatefile']['tmp_name']), $_FILES['templatefile']['name'], $styleid);
if ($result !== true)
{
- $admin->error($result);
+ $print->error($result);
}
$db->transaction_commit();
- $admin->redirect('styles.php?do=modify');
+ $print->redirect('styles.php?do=modify');
}
// ###################################################################
if ($_REQUEST['do'] == 'add')
{
- $admin->page_start($lang->string('Add New Style'));
+ $print->page_start($lang->string('Add New Style'));
- $admin->form_start('styles.php', 'insert', 'multipart/form-data');
- $admin->table_start();
- $admin->table_head($lang->string('Add New Style'));
+ $print->form_start('styles.php', 'insert', 'multipart/form-data');
+ $print->table_start();
+ $print->table_head($lang->string('Add New Style'));
- $admin->row_input($lang->string('Name'), 'stylename');
- $admin->row_upload($lang->string('Upload File (optional)'), 'templatefile');
+ $print->row_input($lang->string('Name'), 'stylename');
+ $print->row_upload($lang->string('Upload File (optional)'), 'templatefile');
if ($kalens->debug)
{
- $admin->row_yesno($lang->string('Import Using XML Settings?'), 'usexmlopts', false);
+ $print->row_yesno($lang->string('Import Using XML Settings?'), 'usexmlopts', false);
}
- $admin->row_submit();
- $admin->table_end();
- $admin->form_end();
+ $print->row_submit();
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
@@ -120,7 +120,7 @@ if ($_POST['do'] == 'update')
$style->update();
- $admin->redirect('styles.php?do=modify');
+ $print->redirect('styles.php?do=modify');
}
// ###################################################################
@@ -132,47 +132,47 @@ if ($_REQUEST['do'] == 'edit')
$style->set_condition();
$style->fetch();
- $admin->page_start($lang->string('Edit Style'));
+ $print->page_start($lang->string('Edit Style'));
- $admin->form_start('styles.php', 'update');
- $admin->form_hidden_field('styleid', $style->objdata['styleid']);
+ $print->form_start('styles.php', 'update');
+ $print->form_hidden_field('styleid', $style->objdata['styleid']);
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('Edit Style - %1$s (id: %2$d)'), $style->objdata['stylename'], $style->objdata['styleid']));
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('Edit Style - %1$s (id: %2$d)'), $style->objdata['stylename'], $style->objdata['styleid']));
- $admin->row_input($lang->string('Name'), 'stylename', $style->objdata['stylename']);
+ $print->row_input($lang->string('Name'), 'stylename', $style->objdata['stylename']);
- $admin->row_submit('<a href="styles.php?do=delete&styleid=' . $style->objdata['styleid'] . '">[' . $lang->string('Delete') . ']</a>');
- $admin->table_end();
- $admin->form_end();
+ $print->row_submit('<a href="styles.php?do=delete&styleid=' . $style->objdata['styleid'] . '">[' . $lang->string('Delete') . ']</a>');
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
if ($_REQUEST['do'] == 'modify')
{
- $admin->page_start($lang->string('Styles'));
+ $print->page_start($lang->string('Styles'));
- $admin->table_start();
- $admin->table_head($lang->string('Styles'));
+ $print->table_start();
+ $print->table_head($lang->string('Styles'));
if (DEVDEBUG)
{
- $admin->row_text('<strong>» ' . $lang->string('MASTER STYLE') . '</strong>', '<a href="styles.php?do=download&styleid=-1">[' . $lang->string('Download') . ']</a>');
+ $print->row_text('<strong>» ' . $lang->string('MASTER STYLE') . '</strong>', '<a href="styles.php?do=download&styleid=-1">[' . $lang->string('Download') . ']</a>');
}
$get_styles = $db->query("SELECT * FROM " . TABLE_PREFIX . "style ORDER BY stylename");
while ($style = $db->fetch_array($get_styles))
{
- $admin->row_text($style['stylename'], "<a href=\"styles.php?do=edit&styleid=$style[styleid]\">[" . $lang->string('Edit') . "]</a> <a href=\"styles.php?do=download&styleid=$style[styleid]\">[" . $lang->string('Download') . "]</a>");
+ $print->row_text($style['stylename'], "<a href=\"styles.php?do=edit&styleid=$style[styleid]\">[" . $lang->string('Edit') . "]</a> <a href=\"styles.php?do=download&styleid=$style[styleid]\">[" . $lang->string('Download') . "]</a>");
}
- $admin->row_span('<a href="styles.php?do=add">[' . $lang->string('Add New Style') . ']</a>', 'tfoot', 'center');
- $admin->table_end();
+ $print->row_span('<a href="styles.php?do=add">[' . $lang->string('Add New Style') . ']</a>', 'tfoot', 'center');
+ $print->table_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
@@ -184,7 +184,7 @@ if ($_REQUEST['do'] == 'download')
$customcount = $db->query_first("SELECT COUNT(*) AS count FROM " . TABLE_PREFIX . "template WHERE styleid = " . $kalens->in['styleid']);
if ($customcount['count'] < 1 AND $kalens->in['styleid'] != -1)
{
- $admin->error($lang->string('There are no customizations made in this style, therefore there is nothing to download.'));
+ $print->error($lang->string('There are no customizations made in this style, therefore there is nothing to download.'));
}
download_template_xml('procal_style.xml', $kalens->in['styleid']);
diff --git a/admin/templates.php b/admin/templates.php
index abe2949..3ffbe3d 100755
--- a/admin/templates.php
+++ b/admin/templates.php
@@ -38,14 +38,14 @@ if ($_POST['do'] == 'killall')
$db->query("DELETE FROM " . TABLE_PREFIX . "template WHERE styleid = " . $kalens->in['styleid']);
}
- $admin->redirect("templates.php?do=modify&styleid=" . $kalens->in['styleid']);
+ $print->redirect("templates.php?do=modify&styleid=" . $kalens->in['styleid']);
}
// ###################################################################
if ($_REQUEST['do'] == 'deleteall')
{
- $admin->page_confirm($lang->string('Are you sure you want to revert all of this styles templates to their default state?'), 'templates.php', 'killall', array('styleid', $kalens->in['styleid']));
+ $print->page_confirm($lang->string('Are you sure you want to revert all of this styles templates to their default state?'), 'templates.php', 'killall', array('styleid', $kalens->in['styleid']));
}
// ###################################################################
@@ -58,14 +58,14 @@ if ($_POST['do'] == 'kill')
$tpl->delete();
// Send the user on their merry way
- $admin->redirect("templates.php?do=modify&styleid=" . $tpl->objdata['styleid']);
+ $print->redirect("templates.php?do=modify&styleid=" . $tpl->objdata['styleid']);
}
// ###################################################################
if ($_REQUEST['do'] == 'delete')
{
- $admin->page_confirm(sprintf($lang->string('Are you sure you want to remove the template <strong>%1$s</strong> (id: %2$s)?'), $kalens->in['template'], $kalens->in['id']), 'templates.php', 'kill', array('templateid' => $kalens->in['templateid']));
+ $print->page_confirm(sprintf($lang->string('Are you sure you want to remove the template <strong>%1$s</strong> (id: %2$s)?'), $kalens->in['template'], $kalens->in['id']), 'templates.php', 'kill', array('templateid' => $kalens->in['templateid']));
}
// ###################################################################
@@ -78,30 +78,30 @@ if ($_POST['do'] == 'insert')
$tpl->set('template', $_POST['template']);
$tpl->insert();
- $admin->redirect('templates.php?do=modify&styleid=' . $kalens->in['styleid']);
+ $print->redirect('templates.php?do=modify&styleid=' . $kalens->in['styleid']);
}
// ###################################################################
if ($_REQUEST['do'] == 'add')
{
- $admin->page_start($lang->string('New Template'));
+ $print->page_start($lang->string('New Template'));
- $admin->form_start('templates.php', 'insert');
- $admin->form_hidden_field('styleid', $kalens->input_clean('styleid', TYPE_INT));
+ $print->form_start('templates.php', 'insert');
+ $print->form_hidden_field('styleid', $kalens->input_clean('styleid', TYPE_INT));
- $admin->table_start();
- $admin->table_head($lang->string('New Template'));
+ $print->table_start();
+ $print->table_head($lang->string('New Template'));
- $admin->row_input($lang->string('Name'), 'templatename');
- $admin->row_textarea($lang->string('Data'), 'template', '', 2, 30, 75, true, 'width: 98%');
+ $print->row_input($lang->string('Name'), 'templatename');
+ $print->row_textarea($lang->string('Data'), 'template', '', 2, 30, 75, true, 'width: 98%');
- $admin->row_submit();
+ $print->row_submit();
- $admin->table_end();
- $admin->form_end();
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
@@ -141,11 +141,11 @@ if ($_POST['do'] == 'update')
if ($kalens->in['reload'])
{
- $admin->redirect("templates.php?do=edit&id=" . $templateid);
+ $print->redirect("templates.php?do=edit&id=" . $templateid);
}
else
{
- $admin->redirect("templates.php?do=modify&styleid=" . $kalens->in['styleid']);
+ $print->redirect("templates.php?do=modify&styleid=" . $kalens->in['styleid']);
}
}
@@ -167,30 +167,30 @@ if ($_REQUEST['do'] == 'edit')
$template = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "template WHERE templateid = " . $kalens->in['id']);
}
- $admin->page_start($lang->string('Edit Template'));
+ $print->page_start($lang->string('Edit Template'));
- $admin->form_start('templates.php', 'update');
- $admin->form_hidden_field('templateid', ($kalens->in['name'] ? -1 : $kalens->in['id']));
- $admin->form_hidden_field('styleid', (($template['styleid'] == -1 AND $kalens->in['name']) ? $kalens->in['styleid'] : $template['styleid']));
+ $print->form_start('templates.php', 'update');
+ $print->form_hidden_field('templateid', ($kalens->in['name'] ? -1 : $kalens->in['id']));
+ $print->form_hidden_field('styleid', (($template['styleid'] == -1 AND $kalens->in['name']) ? $kalens->in['styleid'] : $template['styleid']));
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('Edit Template - %1$s (id: %2$d)'), $template['templatename'], $template['templateid']));
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('Edit Template - %1$s (id: %2$d)'), $template['templatename'], $template['templateid']));
if ($template['styleid'] == -1)
{
- $admin->row_input($lang->string('Name'), 'templatename', $template['templatename']);
+ $print->row_input($lang->string('Name'), 'templatename', $template['templatename']);
}
else
{
- $admin->form_hidden_field('templatename', $template['templatename']);
- $admin->row_text($lang->string('Name'), $template['templatename']);
+ $print->form_hidden_field('templatename', $template['templatename']);
+ $print->row_text($lang->string('Name'), $template['templatename']);
}
- $admin->row_textarea($lang->string('Data'), 'template', $kalens->entity_encode($template['template']), 2, 30, 75, true, 'width: 98%');
- $admin->row_submit('<input type="checkbox" class="button" name="reload" value="1" checked="checked" accesskey="e" />' . $lang->string('Reload After Save?'));
- $admin->table_end();
- $admin->form_end();
+ $print->row_textarea($lang->string('Data'), 'template', $kalens->entity_encode($template['template']), 2, 30, 75, true, 'width: 98%');
+ $print->row_submit('<input type="checkbox" class="button" name="reload" value="1" checked="checked" accesskey="e" />' . $lang->string('Reload After Save?'));
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
@@ -204,22 +204,22 @@ if ($_REQUEST['do'] == 'view')
$tpl->set_condition(array('templatename', 'styleid'));
$tpl->fetch();
- $admin->page_start($lang->string('View Original'));
+ $print->page_start($lang->string('View Original'));
- $admin->table_start();
- $admin->table_head($lang->string('View Original'));
- $admin->row_input($lang->string('Name'), 'templatename', $tpl->objdata['templatename']);
- $admin->row_textarea($lang->string('Data'), 'template', $kalens->entity_encode($tpl->objdata['template']), 2, 30, 75, true, 'width: 98%');
- $admin->table_end();
+ $print->table_start();
+ $print->table_head($lang->string('View Original'));
+ $print->row_input($lang->string('Name'), 'templatename', $tpl->objdata['templatename']);
+ $print->row_textarea($lang->string('Data'), 'template', $kalens->entity_encode($tpl->objdata['template']), 2, 30, 75, true, 'width: 98%');
+ $print->table_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
if ($_REQUEST['do'] == 'modify')
{
- $admin->page_start($lang->string('Template Manager'));
+ $print->page_start($lang->string('Template Manager'));
$kalens->input_clean('styleid', TYPE_INT);
@@ -340,12 +340,12 @@ If you want to revert this template to its original state, you can do so with th
));
require('./admin/js.php');
- $admin->page_code($js_template_manager);
+ $print->page_code($js_template_manager);
// Render the select menu
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('%1$s Manager'), $lang->string('Template')). ' - ' . $style['stylename'] . ' (styleid: ' . $style['styleid'] . ')');
- $admin->form_start('', '', false, 'templatemanager');
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('%1$s Manager'), $lang->string('Template')). ' - ' . $style['stylename'] . ' (styleid: ' . $style['styleid'] . ')');
+ $print->form_start('', '', false, 'templatemanager');
$control_box =
"<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\" align=\"center\" width=\"250\" class=\"tborder\">
@@ -368,16 +368,16 @@ $control_box =
</tr>
</table>";
- $admin->row_text("\n<select name=\"manager\" size=\"25\" onchange=\"change_handler();\" onclick=\"change_handler();\" ondblclick=\"click_handler('edit');\" class=\"manager_body\" style=\"width: 350px;\">\n" . implode("\n", $optlist) . "\n</select>\n", $control_box);
+ $print->row_text("\n<select name=\"manager\" size=\"25\" onchange=\"change_handler();\" onclick=\"change_handler();\" ondblclick=\"click_handler('edit');\" class=\"manager_body\" style=\"width: 350px;\">\n" . implode("\n", $optlist) . "\n</select>\n", $control_box);
unset($optlist);
- $admin->form_end();
- $admin->row_span('<a href="templates.php?do=add&styleid=' . $style['styleid'] . '">' . sprintf($lang->string('[%1$s]'), $lang->string('New')) . '</a>', 'tfoot', 'center');
+ $print->form_end();
+ $print->row_span('<a href="templates.php?do=add&styleid=' . $style['styleid'] . '">' . sprintf($lang->string('[%1$s]'), $lang->string('New')) . '</a>', 'tfoot', 'center');
- $admin->form_start('templates.php', 'styleopts');
- $admin->form_hidden_field('styleid', $style['styleid']);
- $admin->table_head($lang->string('StyleVars <span style="float:right" class="smallfont">Leave StyleVars blank to have them revert to their defaults.</span>'));
+ $print->form_start('templates.php', 'styleopts');
+ $print->form_hidden_field('styleid', $style['styleid']);
+ $print->table_head($lang->string('StyleVars <span style="float:right" class="smallfont">Leave StyleVars blank to have them revert to their defaults.</span>'));
// -------------------------------------------------------------------
// handle style vars
@@ -406,16 +406,16 @@ $control_box =
// print out stylevars
foreach ($mastervars AS $varname => $var)
{
- $admin->row_input(AdminStrings::fetchStyleVar($varname) . ($var != $stylevar["$varname"] ? "<span class=\"smallfont\"><strong>" . $lang->string('Modified') . "</strong></span>" : ''), "stylevar[$varname]", htmlspecialchars(stripslashes($stylevar["$varname"])));
+ $print->row_input(AdminStrings::fetchStyleVar($varname) . ($var != $stylevar["$varname"] ? "<span class=\"smallfont\"><strong>" . $lang->string('Modified') . "</strong></span>" : ''), "stylevar[$varname]", htmlspecialchars(stripslashes($stylevar["$varname"])));
}
- $admin->row_submit();
- $admin->form_end();
+ $print->row_submit();
+ $print->form_end();
- $admin->table_end();
+ $print->table_end();
}
- $admin->page_end();
+ $print->page_end();
}
// ####################### UPDATE STYLE OPTIONS ######################
@@ -448,7 +448,7 @@ if ($_POST['do'] == 'styleopts')
{
$db->query("DELETE FROM " . TABLE_PREFIX . "template WHERE templatename = 'STYLE_VARS' AND styleid = " . $kalens->in['styleid']);
}
- $admin->redirect("templates.php?do=manage&id=" . $kalens->in['styleid']);
+ $print->redirect("templates.php?do=manage&id=" . $kalens->in['styleid']);
}
/*=====================================================================*\
diff --git a/admin/users.php b/admin/users.php
index 0815e0e..dae9efa 100755
--- a/admin/users.php
+++ b/admin/users.php
@@ -43,14 +43,14 @@ if ($_REQUEST['do'] == 'kill')
$user->set_condition();
$user->delete();
- $admin->redirect('users.php?do=results&id=-1');
+ $print->redirect('users.php?do=results&id=-1');
}
// ###################################################################
if ($_REQUEST['do'] == 'delete')
{
- $admin->page_confirm($lang->string('Are you sure you want to delete this user?'), 'users.php', 'kill', array('userid' => $kalens->in['userid']));
+ $print->page_confirm($lang->string('Are you sure you want to delete this user?'), 'users.php', 'kill', array('userid' => $kalens->in['userid']));
}
// ###################################################################
@@ -68,37 +68,37 @@ if ($_POST['do'] == 'insert')
$user->insert();
- $admin->redirect('users.php?do=results&id=-1');
+ $print->redirect('users.php?do=results&id=-1');
}
// ###################################################################
if ($_REQUEST['do'] == 'add')
{
- $admin->page_start($lang->string('Add New User'));
+ $print->page_start($lang->string('Add New User'));
- $admin->form_start('users.php', 'insert');
+ $print->form_start('users.php', 'insert');
- $admin->table_start();
- $admin->table_head($lang->string('Add New User'));
+ $print->table_start();
+ $print->table_head($lang->string('Add New User'));
- $admin->row_input($lang->string('Username'), 'username');
- $admin->row_input($lang->string('Email'), 'email');
- $admin->row_input($lang->string('Password'), 'password');
+ $print->row_input($lang->string('Username'), 'username');
+ $print->row_input($lang->string('Email'), 'email');
+ $print->row_input($lang->string('Password'), 'password');
- $admin->list_item($lang->string('User'), '0', true);
- $admin->list_item($lang->string('Admin'), '1');
- $admin->row_list($lang->string('Status'), 'canadmin');
+ $print->list_item($lang->string('User'), '0', true);
+ $print->list_item($lang->string('Admin'), '1');
+ $print->row_list($lang->string('Status'), 'canadmin');
- $admin->row_text($lang->string('Style Choice'), construct_style_select(false, 'stylechoice'));
- $admin->row_text($lang->string('Time Zone Offset'), construct_time_zone_select(0, 'tzoffset'));
+ $print->row_text($lang->string('Style Choice'), construct_style_select(false, 'stylechoice'));
+ $print->row_text($lang->string('Time Zone Offset'), construct_time_zone_select(0, 'tzoffset'));
- $admin->row_submit();
+ $print->row_submit();
- $admin->table_end();
- $admin->form_end();
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
@@ -119,7 +119,7 @@ if ($_POST['do'] == 'update')
$user->update();
- $admin->redirect('users.php?do=results&id=-1');
+ $print->redirect('users.php?do=results&id=-1');
}
// ###################################################################
@@ -131,57 +131,57 @@ if ($_REQUEST['do'] == 'edit')
$user->set_condition();
$user->fetch();
- $admin->page_start($lang->string('Edit User'));
+ $print->page_start($lang->string('Edit User'));
- $admin->form_start('users.php', 'update');
- $admin->form_hidden_field('userid', $user->objdata['userid']);
+ $print->form_start('users.php', 'update');
+ $print->form_hidden_field('userid', $user->objdata['userid']);
- $admin->table_start();
- $admin->table_head(sprintf($lang->string('Edit User %1$s (id: %2$d)'), $user->objdata['username'], $user->objdata['userid']));
+ $print->table_start();
+ $print->table_head(sprintf($lang->string('Edit User %1$s (id: %2$d)'), $user->objdata['username'], $user->objdata['userid']));
- $admin->row_input($lang->string('Username'), 'username', $user->objdata['username']);
- $admin->row_input($lang->string('Email'), 'email', $user->objdata['email']);
- $admin->row_input($lang->string('Password'), 'password');
+ $print->row_input($lang->string('Username'), 'username', $user->objdata['username']);
+ $print->row_input($lang->string('Email'), 'email', $user->objdata['email']);
+ $print->row_input($lang->string('Password'), 'password');
- $admin->list_item($lang->string('User'), '0', ($user->objdata['canadmin'] ? false : true));
- $admin->list_item($lang->string('Admin'), '1', ($user->objdata['canadmin'] ? true : false));
- $admin->row_list($lang->string('Status'), 'canadmin');
+ $print->list_item($lang->string('User'), '0', ($user->objdata['canadmin'] ? false : true));
+ $print->list_item($lang->string('Admin'), '1', ($user->objdata['canadmin'] ? true : false));
+ $print->row_list($lang->string('Status'), 'canadmin');
- $admin->row_text($lang->string('Style Choice'), construct_style_select($user->objdata['stylechoice'], 'stylechoice'));
- $admin->row_text($lang->string('Time Zone Offset'), construct_time_zone_select($user->objdata['tzoffset'], 'tzoffset'));
+ $print->row_text($lang->string('Style Choice'), construct_style_select($user->objdata['stylechoice'], 'stylechoice'));
+ $print->row_text($lang->string('Time Zone Offset'), construct_time_zone_select($user->objdata['tzoffset'], 'tzoffset'));
- $admin->row_submit();
- $admin->table_end();
- $admin->form_end();
+ $print->row_submit();
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
if ($_REQUEST['do'] == 'modify')
{
- $admin->page_start($lang->string('Search'));
+ $print->page_start($lang->string('Search'));
- $admin->form_start('users.php', 'results', false, 'inputform', 'get');
+ $print->form_start('users.php', 'results', false, 'inputform', 'get');
- $admin->table_start();
- $admin->table_head($lang->string('Search'));
+ $print->table_start();
+ $print->table_head($lang->string('Search'));
- $admin->row_input($lang->string('Username'), 'username');
- $admin->row_input($lang->string('Email'), 'email');
+ $print->row_input($lang->string('Username'), 'username');
+ $print->row_input($lang->string('Email'), 'email');
- $admin->list_item($lang->string('BOTH'), '-1', true);
- $admin->list_item($lang->string('User'), '1');
- $admin->list_item($lang->string('Admin'), '2');
- $admin->row_list($lang->string('Status'), 'canadmin');
+ $print->list_item($lang->string('BOTH'), '-1', true);
+ $print->list_item($lang->string('User'), '1');
+ $print->list_item($lang->string('Admin'), '2');
+ $print->row_list($lang->string('Status'), 'canadmin');
- $admin->row_submit();
- $admin->table_end();
+ $print->row_submit();
+ $print->table_end();
- $admin->form_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
@@ -224,17 +224,17 @@ if ($_REQUEST['do'] == 'results')
}
else
{
- $admin->error($lang->string('You did not specify any valid search criteria.'));
+ $print->error($lang->string('You did not specify any valid search criteria.'));
}
}
$get_users = $db->query($query);
- $admin->page_start($lang->string('User List'));
+ $print->page_start($lang->string('User List'));
- $admin->table_start();
- $admin->table_head($lang->string('User List'), 4);
- $admin->table_column_head(array(
+ $print->table_start();
+ $print->table_head($lang->string('User List'), 4);
+ $print->table_column_head(array(
$lang->string('Username'),
$lang->string('Email'),
$lang->string('Status'),
@@ -250,7 +250,7 @@ if ($_REQUEST['do'] == 'results')
@header("Location: users.php?do=edit&id=$user[userid]");
}
- $admin->row_multi_item(array(
+ $print->row_multi_item(array(
$user['username'] => 'l',
$user['email'] => 'c',
($user['canadmin'] ? $lang->string('Admin') : $lang->string('User')) => 'c',
@@ -258,9 +258,9 @@ if ($_REQUEST['do'] == 'results')
);
}
- $admin->table_end();
+ $print->table_end();
- $admin->page_end();
+ $print->page_end();
}
/*=====================================================================*\
diff --git a/dev/phrase_adv.php b/dev/phrase_adv.php
index 060c9af..d4df479 100755
--- a/dev/phrase_adv.php
+++ b/dev/phrase_adv.php
@@ -38,7 +38,7 @@ if (empty($_REQUEST['do']))
// ###################################################################
if ($_REQUEST['do'] == 'view')
{
- $admin->page_start('Phrase Associator');
+ $print->page_start('Phrase Associator');
// -------------------------------------------------------------------
// -- Custom script
@@ -126,11 +126,11 @@ EOF;
// -- Page setup
// -------------------------------------------------------------------
- $admin->page_code($jscustom);
- $admin->form_start('phrase_adv.php', 'update_all');
- $admin->table_start();
- $admin->table_head('Phrase Associator');
- $admin->table_column_head(array('Phrases To Associate With (dynamic)', 'Unassociated Phrases (static)'), true);
+ $print->page_code($jscustom);
+ $print->form_start('phrase_adv.php', 'update_all');
+ $print->table_start();
+ $print->table_head('Phrase Associator');
+ $print->table_column_head(array('Phrases To Associate With (dynamic)', 'Unassociated Phrases (static)'), true);
// -------------------------------------------------------------------
// -- Get all of the phrases
@@ -179,18 +179,18 @@ EOF;
$right_side .= '</table>';
$left_side .= '</table>';
- $admin->row_text('<div style="height:500px; overflow:auto">' . $left_side . '</div>', '<div style="height:500px; overflow:auto">' . $right_side . '</div>');
+ $print->row_text('<div style="height:500px; overflow:auto">' . $left_side . '</div>', '<div style="height:500px; overflow:auto">' . $right_side . '</div>');
unset($right_side);
- $admin->row_text('<div class="smallfont">varname</div><input type="text" size="500" style="width:100%" id="static_varname" />', '<div class="smallfont">text</div><textarea rows="3" cols="500" style="width:100%" id="static_text"></textarea>');
- $admin->row_text('<input type="button" onclick="associate_phrase()" value=" Associate " /> <input type="button" onclick="update_phrase()" value=" Update " /><input type="hidden" id="phraseid" /><br /><br /><div class="smallfont"><strong>Selected Dynamic:</strong><div id="selected_dynamic"></div>',
+ $print->row_text('<div class="smallfont">varname</div><input type="text" size="500" style="width:100%" id="static_varname" />', '<div class="smallfont">text</div><textarea rows="3" cols="500" style="width:100%" id="static_text"></textarea>');
+ $print->row_text('<input type="button" onclick="associate_phrase()" value=" Associate " /> <input type="button" onclick="update_phrase()" value=" Update " /><input type="hidden" id="phraseid" /><br /><br /><div class="smallfont"><strong>Selected Dynamic:</strong><div id="selected_dynamic"></div>',
'<div class="smallfont">current associations</div><textarea rows="3" cols="500" style="width:100%" id="current_associations"></textarea><input type="hidden" id="hidden_selected_dynamic" />');
- $admin->row_submit(false, 'Finished', false);
- $admin->table_end();
- $admin->form_end();
+ $print->row_submit(false, 'Finished', false);
+ $print->table_end();
+ $print->form_end();
- $admin->page_end();
+ $print->page_end();
}
// ###################################################################
@@ -236,9 +236,9 @@ if ($_POST['do'] == 'update_all')
}
}
- $admin->page_start('All Saved');
- $admin->page_message('Associated All Phrases', 'All your changes have been saved. Click <a href="phrase_adv.php?do=view">here</a> to return to the associator. You are not automatically redirected.');
- $admin->page_end();
+ $print->page_start('All Saved');
+ $print->page_message('Associated All Phrases', 'All your changes have been saved. Click <a href="phrase_adv.php?do=view">here</a> to return to the associator. You are not automatically redirected.');
+ $print->page_end();
}
/*=====================================================================*\
diff --git a/dev/template_var_usage.php b/dev/template_var_usage.php
index eb485ae..67f61d8 100755
--- a/dev/template_var_usage.php
+++ b/dev/template_var_usage.php
@@ -24,7 +24,7 @@ chdir('./../admin/');
require_once('./global.php');
-$admin->page_start('Template Variable Usage');
+$print->page_start('Template Variable Usage');
// ###################################################################
@@ -47,11 +47,11 @@ echo "<form name=\"tplselect\" action=\"template_var_usage.php\" method=\"get\">
if ($_REQUEST['templateid'])
{
- $admin->table_start();
+ $print->table_start();
$tpl = $db->query_first("SELECT * FROM template WHERE templateid = " . intval($_REQUEST['templateid']));
- $admin->table_head("Template: $tpl[templatename]; Style: Master; Id: $tpl[templateid]");
+ $print->table_head("Template: $tpl[templatename]; Style: Master; Id: $tpl[templateid]");
$tpl['template'] = htmlspecialchars($tpl['template']);
@@ -86,23 +86,23 @@ if ($_REQUEST['templateid'])
//$tpl['template'] = preg_replace('#\{lang\.(\w+?)\}#is', '<span style="color:blue; background:#EEEEEE">{lang.\\1}</span>', $tpl['template']);
- $admin->row_span('<div style="width:100%; height:100%; background:white; color:#000000; font-family:courier; border:1px solid">' . nl2br($tpl['template']) . '</div>');
+ $print->row_span('<div style="width:100%; height:100%; background:white; color:#000000; font-family:courier; border:1px solid">' . nl2br($tpl['template']) . '</div>');
- $admin->table_head('Match List');
+ $print->table_head('Match List');
foreach ((array)$varlist AS $type => $matchlist)
{
- $admin->row_span($type, 'thead');
+ $print->row_span($type, 'thead');
foreach ((array)$matchlist AS $variable)
{
- $admin->row_span($variable);
+ $print->row_span($variable);
}
}
- $admin->table_end();
+ $print->table_end();
}
-$admin->page_end();
+$print->page_end();
/*=====================================================================*\
|| ###################################################################
diff --git a/dev/todo.html b/dev/todo.html
index 753e41f..63298c1 100644
--- a/dev/todo.html
+++ b/dev/todo.html
@@ -95,7 +95,7 @@ body {
<li>Change CSS_GLOBAL template to be colour-picker based (or at least more friendly!)</li>
<li>Change StyleVars and CSS to not be in the templates, but rather be in a separate table that will be easier to support inheritance</li>
<li class="done">Move inc/* to includes/ and inc/admin/* to inc/</li>
- <li>Change Admin CP object $admin to be $print (purely aesthetical)</li>
+ <li class="done">Change Admin CP object $admin to be $print (purely aesthetical)</li>
<li class="removed">Support multiple admin CP styles</li>
<li>Change images/ folder organization</li>
<li>Security measures to force the user to enter his or her password after X days or hours as well as a "remember me" checkbox</li>
diff --git a/includes/api_error.php b/includes/api_error.php
index 0ec9d32..9f14a5a 100644
--- a/includes/api_error.php
+++ b/includes/api_error.php
@@ -37,7 +37,7 @@ class APIErrorHandler
{
global $kalens;
- $kalens->admin->error($error);
+ $kalens->print->error($error);
}
// ###################################################################