"); // FIXME
- }
- $from = 0;
- $amount = 20; // Number per page - could make configurable later if required
- if ($sub_action) $from = intval($sub_action);
-
-// @todo format form the 0.8 way
- $text = "
-
";
-
- if (count($banLogEntries))
- {
- $text .= " ".str_replace('[y]', $num_entry, BANLAN_87);
- }
-
- echo $text;
- // e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_86, $text);
- break;
-
-
- case 'options' :
- if (!getperms('0'))
- exit();
- if (isset($_POST['update_ban_options']))
- {
- $pref['enable_rdns'] = intval($_POST['ban_rdns_on_access']);
- $pref['enable_rdns_on_ban'] = intval($_POST['ban_rdns_on_ban']);
- $pref['ban_max_online_access'] = intval($_POST['ban_access_guest']).','.intval($_POST['ban_access_member']);
- $pref['ban_retrigger'] = intval($_POST['ban_retrigger']);
- $pref['ban_date_format'] = $tp->toDB($_POST['ban_date_format']);
- save_prefs(); // @todo FIXME log detail of changes. Right prefs to use?
- $mes->addSuccess(LAN_SETSAVED);
- }
-
- if (isset($_POST['remove_expired_bans']))
- {
- $result = $sql->db_Delete('banlist',"`banlist_bantype` < ".eIPHandler::BAN_TYPE_WHITELIST." AND `banlist_banexpires` > 0 AND `banlist_banexpires` < ".time());
- banlist_adminlog('12', $result);
- $mes->addSuccess(str_replace('[y]', $result, BANLAN_48));
- }
-
- list($ban_access_guest, $ban_access_member) = explode(',', varset($pref['ban_max_online_access'], '100,200'));
- $ban_access_member = max($ban_access_guest, $ban_access_member);
- $text = "
-
- ";
-
- echo $mes->render().$text;
-
- // e107::getRender()->tablerender(BANLAN_16.SEP.LAN_OPTIONS, $mes->render().$text);
- break;
-
- case 'times' :
-
-
- // e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_77, $mes->render().$text);
- break;
-
- case 'edit' : // Edit an existing ban
- case 'add' : // Add a new ban
- case 'whedit' : // Edit existing whitelist entry
- case 'whadd' : // Add a new whitelist entry
-
- if(!E107_DEBUG_LEVEL)
- {
- break;
- }
- RETURN;
-
- if (!isset($banlist_reason)) $banlist_reason = '';
- if (!isset($banlist_ip)) $banlist_ip = '';
- if (!isset($banlist_notes)) $banlist_notes = '';
-
- $page_title = array('edit' => BANLAN_60, 'add' => BANLAN_9, 'whedit' => BANLAN_59, 'whadd' => BANLAN_58);
- $rdns_warn = vartrue($pref['enable_rdns']) ? '' : '
'.BANLAN_12.'
';
- $next = ($action == 'whedit' || $action == 'whadd') ? '?white' : '?list';
- // Edit/add form first
- $text .= "
-
- ";
-
- echo $mes->render().$text;
- // e107::getRender()->tablerender($page_title[$action], $mes->render().$text);
- break; // End of 'Add' and 'Edit'
-
-
- case 'transfer' :
- $message = '';
- $error = false;
- if (isset($_POST['ban_import']))
- { // Got a file to import
- require_once(e_HANDLER.'upload_handler.php');
- if (($files = process_uploaded_files(e_UPLOAD, FALSE, array('overwrite' => TRUE, 'max_file_count' => 1, 'file_mask' => 'csv'))) === FALSE)
- { // Invalid file
- $error = true;
- $mes->addError(BANLAN_47);
- }
- if(empty($files) || vartrue($files[0]['error']))
- {
- $error = true;
- if(varset($files[0]['message']))
- $mes->addError($files[0]['message']);
- }
- if(!$error)
- { // Got a file of some sort
- $message = process_csv(e_UPLOAD.$files[0]['name'],
- intval(varset($_POST['ban_over_import'], 0)),
- intval(varset($_POST['ban_over_expiry'], 0)),
- $separator_char[intval(varset($_POST['ban_separator'], 1))],
- $quote_char[intval(varset($_POST['ban_quote'], 3))]);
- banlist_adminlog('07', 'File: '.e_UPLOAD.$files[0]['name'].' '.$message);
- }
-
- }
-
- $text = "
-
- ";
-
- // Now do the import options
- $text .= "
-
- ";
-
- echo $mes->render().$text;
- // e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_35, $mes->render().$text);
- break; // End case 'transfer'
-
- case 'list' :
- case 'white' :
- default :
-
- if(!E107_DEBUG_LEVEL)
- {
- break;
- }
-
- if (($action != 'list') && ($action != 'white'))
- $action = 'list';
-
- $edit_action = ($action == 'list' ? 'edit' : 'whedit');
- $del_action = ($action == 'list' ? 'remove' : 'whremove');
- $col_widths = array('list' => array(10, 5, 35, 30, 10, 10), 'white' => array(15, 40, 35, 10));
- $col_titles = array('list' => array(BANLAN_17, BANLAN_20, BANLAN_10, BANLAN_19, BANLAN_18, LAN_OPTIONS),
- 'white' => array(BANLAN_55, BANLAN_56, BANLAN_19, LAN_OPTIONS));
- $no_values = array('list' => BANLAN_2, 'white' => BANLAN_54);
- $col_defs = array('list' => array('banlist_datestamp' => 0, 'banlist_bantype' => 0, 'ip_reason' => BANLAN_7, 'banlist_notes' => 0, 'banlist_banexpires' => 0, 'ban_options' => 0),
- 'white' => array('banlist_datestamp' => 0, 'ip_reason' => BANLAN_57, 'banlist_notes' => 0, 'ban_options' => 0));
-
- $text = "
-
- ";
-
- echo $mes->render().$text;
- // e107::getRender()->tablerender(($action == 'list' ? BANLAN_3 : BANLAN_61), $mes->render().$text);
- // End of case 'list' and the default case
-} // End switch ($action)
-
-
-require_once(e_ADMIN.'footer.php');
-
-
-/**
- * Admin menu options
- */
-function banlist_adminmenu()
-{
- $action = (e_QUERY) ? e_QUERY : 'list';
-
- $var['list']['text'] = BANLAN_14; // List existing bans
- $var['list']['link'] = e_SELF.'?list';
- $var['list']['perm'] = '4';
-
- $var['add']['text'] = BANLAN_25; // Add a new ban
- $var['add']['link'] = e_SELF.'?add';
- $var['add']['perm'] = '4';
-
- $var['white']['text'] = BANLAN_52; // List existing whitelist entries
- $var['white']['link'] = e_SELF.'?white';
- $var['white']['perm'] = '4';
-
- $var['whadd']['text'] = BANLAN_53; // Add a new whitelist entry
- $var['whadd']['link'] = e_SELF.'?whadd';
- $var['whadd']['perm'] = '4';
-
- $var['transfer']['text'] = BANLAN_35;
- $var['transfer']['link'] = e_SELF.'?transfer';
- $var['transfer']['perm'] = '4';
-
- if (getperms('0'))
- {
- $var['times']['text'] = BANLAN_15;
- $var['times']['link'] = e_SELF.'?times';
- $var['times']['perm'] = '0';
-
- $var['options']['text'] = LAN_OPTIONS;
- $var['options']['link'] = e_SELF.'?options';
- $var['options']['perm'] = '0';
-
- $var['banlog']['text'] = BANLAN_81;
- $var['banlog']['link'] = e_SELF.'?banlog';
- $var['banlog']['perm'] = '0';
- }
- e107::getNav()->admin(BANLAN_16, $action, $var);
-}
-
-
-
-// Parse the date string used by the import/export - YYYYMMDD_HHMMSS
-function parse_date($instr)
-{
- if (strlen($instr) != 15)
- return 0;
- return mktime(substr($instr, 9, 2), substr($instr, 11, 2), substr($instr, 13, 2), substr($instr, 4, 2), substr($instr, 6, 2), substr($instr, 0, 4));
-}
-
-
-
-// Process the imported CSV file, update the database, delete the file.
-// Return a message
-function process_csv($filename, $override_imports, $override_expiry, $separator = ',', $quote = '"')
-{
- $sql = e107::getDb();
- $pref['ban_durations'] = e107::getPref('ban_durations');
- $mes = e107::getMessage();
-
- // echo "Read CSV: {$filename} separator: {$separator}, quote: {$quote} override imports: {$override_imports} override expiry: {$override_expiry} ";
- // Renumber imported bans
- if ($override_imports)
- $sql->update('banlist', "`banlist_bantype`=".eIPHandler::BAN_TYPE_TEMPORARY." WHERE `banlist_bantype` = ".eIPHandler::BAN_TYPE_IMPORTED);
- $temp = file($filename);
- $line_num = 0;
- foreach ($temp as $line)
- { // Process one entry
- $line = trim($line);
- $line_num++;
- if ($line)
- {
- $fields = explode($separator, $line);
- $field_num = 0;
- $field_list = array('banlist_bantype' => eIPHandler::BAN_TYPE_IMPORTED);
- foreach ($fields as $f)
- {
- $f = trim($f);
- if (substr($f, 0, 1) == $quote)
- {
- if (substr($f, -1, 1) == $quote)
- { // Strip quotes
- $f = substr($f, 1, -1); // Strip off the quotes
- }
- else
- {
- $mes->addError(BANLAN_49.$line_num);
- return BANLAN_49.$line_num;
- }
- }
- // Now handle the field
- $field_num++;
- switch ($field_num)
- {
- case 1 : // IP address
- $field_list['banlist_ip'] = e107::getIPHandler()->ipEncode($f);
- break;
- case 2 : // Original date of ban
- $field_list['banlist_datestamp'] = parse_date($f);
- break;
- case 3 : // Expiry of ban - depends on $override_expiry
- if ($override_expiry)
- {
- $field_list['banlist_banexpires'] = parse_date($f);
- }
- else
- { // Use default ban time from now
- $field_list['banlist_banexpires'] = $pref['ban_durations'][eIPHandler::BAN_TYPE_IMPORTED] ? time() + (60*60*$pref['ban_durations'][eIPHandler::BAN_TYPE_IMPORTED]) : 0;
- }
- break;
- case 4 : // Original ban type - we always ignore this and force to 'imported'
- break;
- case 5 : // Ban reason originally generated by E107
- $field_list['banlist_reason'] = $f;
- break;
- case 6 : // Any user notes added
- $field_list['banlist_notes'] = $f;
- break;
- default : // Just ignore any others
- }
- }
- $qry = "REPLACE INTO `#banlist` (".implode(',', array_keys($field_list)).") values ('".implode("', '", $field_list)."')";
- // echo count($field_list)." elements, query: ".$qry." ";
- if (!$sql->gen($qry))
- {
- $mes->addError(BANLAN_50.$line_num);
- return BANLAN_50.$line_num;
- }
- }
- }
- // Success here - may need to delete old imported bans
- if ($override_imports)
- $sql->delete('banlist', "`banlist_bantype` = ".eIPHandler::BAN_TYPE_TEMPORARY);
- @unlink($filename); // Delete file once done
- $mes->addSuccess(str_replace('[y]', $line_num, BANLAN_51).$filename);
- return str_replace('[y]', $line_num, BANLAN_51).$filename;
-}
-
-
-
-/**
- * Log event to admin log
- *
- * @param string $msg_num - exactly two numeric characters corresponding to a log message
- * @param string $woffle - information for the body of the log entre
- *
- * @return none
- */
-function banlist_adminlog($msg_num = '00', $woffle = '')
-{
- e107::getAdminLog()->log_event('BANLIST_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
-}
-
-
-/**
- * Handle page DOM within the page header
- *
- * @return string JS source
- */
-function headerjs()
-{
-/*
- require_once(e_HANDLER.'js_helper.php');
- $ret = "
-
-
- ";
-
- return $ret;
-
-*/
-}
-
-require_once(e_ADMIN."footer.php");
-exit;
-?>
diff --git a/e107_admin/banlist_export.php b/e107_admin/banlist_export.php
index 96f107fba..fb89f612b 100644
--- a/e107_admin/banlist_export.php
+++ b/e107_admin/banlist_export.php
@@ -135,7 +135,7 @@ function do_export($filename, $type_list='',$format_array=array(), $sep = ',', $
// Log event to admin log
function banlist_adminlog($msg_num='00', $woffle='')
{
- e107::getAdminLog()->log_event('BANLIST_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
+ e107::getAdminLog()->add('BANLIST_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
}
diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 2d4d06937..456907a5f 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -716,7 +716,7 @@ require_once(e_ADMIN.'footer.php');
*/
function frontpage_adminlog($msg_num = '00', $woffle = '')
{
- e107::getAdminLog()->log_event('FRONTPG_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
+ e107::getAdminLog()->add('FRONTPG_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
}
diff --git a/e107_admin/image.php b/e107_admin/image.php
index 4f3168ae5..b6b30699e 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -2918,7 +2918,7 @@ class media_admin_ui extends e_admin_ui
{
if(!$sc_path) return array();
$path = e107::getParser()->replaceConstants($sc_path);
- $info = e107::getFile()->get_file_info($path,true);
+ $info = e107::getFile()->getFileInfo($path,true);
return array(
'media_type' => $info['mime'],
'media_datestamp' => time(),
@@ -3042,7 +3042,7 @@ class media_admin_ui extends e_admin_ui
{
$mes = e107::getMessage();
$tp = e107::getParser();
- $f = e107::getFile()->get_file_info($oldpath,TRUE);
+ $f = e107::getFile()->getFileInfo($oldpath,TRUE);
$mes->addDebug("checkDupe(): newpath=".$newpath." oldpath=".$oldpath." ".print_r($newpath,TRUE));
if(file_exists($newpath) || e107::getDb()->select("core_media","*","media_url = '".$tp->createConstants($newpath,'rel')."' LIMIT 1") )
@@ -3399,7 +3399,7 @@ class media_admin_ui extends e_admin_ui
}
// End Resize routine. ---------------------
- $f = $fl->get_file_info($oldpath);
+ $f = $fl->getFileInfo($oldpath);
if(!$f['mime'])
{
@@ -3510,27 +3510,21 @@ class media_admin_ui extends e_admin_ui
$mes = e107::getMessage();
$tmp = array();
- $tmp['image_post'] = intval($_POST['image_post']);
- $tmp['resize_method'] = $tp->toDB($_POST['resize_method']);
- $tmp['im_path'] = trim($tp->toDB($_POST['im_path']));
- $tmp['image_post_class'] = intval($_POST['image_post_class']);
- $tmp['image_post_disabled_method'] = intval($_POST['image_post_disabled_method']);
- $tmp['enable_png_image_fix'] = intval($_POST['enable_png_image_fix']);
+ $tmp['image_post'] = (int) $_POST['image_post'];
+ $tmp['resize_method'] = $tp->toDB($_POST['resize_method']);
+ $tmp['im_path'] = trim($tp->toDB($_POST['im_path']));
+ $tmp['image_post_class'] = (int) $_POST['image_post_class'];
+ $tmp['image_post_disabled_method'] = (int) $_POST['image_post_disabled_method'];
+ $tmp['enable_png_image_fix'] = (int) $_POST['enable_png_image_fix'];
if($_POST['img_import_resize_w'] && $_POST['img_import_resize_h'])
{
$tmp['img_import_resize'] = intval($_POST['img_import_resize_w'])."x".intval($_POST['img_import_resize_h']);
- }
-
- if ($admin_log->logArrayDiffs($tmp, $pref, 'IMALAN_04'))
- {
- save_prefs(); // Only save if changes
- $mes->add(IMALAN_9, E_MESSAGE_SUCCESS);
}
- else
- {
- $mes->add(IMALAN_20, E_MESSAGE_INFO);
- }
+
+ e107::getConfig()->setPref($tmp)->save(true,true,true);
+
+
}
diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 80d5f6c28..11e1fb410 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -624,7 +624,7 @@ class mailout_main_ui extends e_admin_ui
else
{
$mes->addSuccess(LAN_MAILOUT_81. ' ('.$sendto.')');
- e107::getAdminLog()->log_event('MAIL_01', $sendto, E_LOG_INFORMATIVE,'');
+ e107::getAdminLog()->add('MAIL_01', $sendto, E_LOG_INFORMATIVE,'');
}
@@ -750,7 +750,7 @@ class mailout_main_ui extends e_admin_ui
if ($this->mailAdmin->activateEmail($mailId, FALSE, $notify, $first, $last))
{
e107::getMessage()->addSuccess(LAN_MAILOUT_185);
- $log->log_event('MAIL_06','ID: '.$mailId,E_LOG_INFORMATIVE,'');
+ $log->add('MAIL_06','ID: '.$mailId,E_LOG_INFORMATIVE,'');
}
else
{
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index e1dc06a74..49626d3da 100755
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -367,7 +367,7 @@ class plugin_ui extends e_admin_ui
// $name = deftrue($info['plugin_name'],$info['plugin_name']). " v".$info['plugin_version']. "({e_PLUGIN}".$info['plugin_path'].")";
- // $log->log_event('PLUGMAN_01', $name, E_LOG_INFORMATIVE, '');
+ // $log->add('PLUGMAN_01', $name, E_LOG_INFORMATIVE, '');
// make sure ALL plugin/addon pref lists get update and are current
e107::getPlug()->clearCache()->buildAddonPrefLists();
@@ -2804,7 +2804,7 @@ class pluginManager{
$name = deftrue($info['plugin_name'],$info['plugin_name']). " v".$info['plugin_version']. "({e_PLUGIN}".$info['plugin_path'].")";
- $log->log_event('PLUGMAN_01', $name, E_LOG_INFORMATIVE, '');
+ $log->add('PLUGMAN_01', $name, E_LOG_INFORMATIVE, '');
$this->show_message($text, E_MESSAGE_SUCCESS);
}
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 2b5be4b03..d98962cab 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -291,7 +291,7 @@ function sendTest()
else
{
$mes->addSuccess(LAN_MAILOUT_81. ' ('.$sendto.')');
- $log->log_event('MAIL_01',$sendto,E_LOG_INFORMATIVE,'');
+ $log->add('MAIL_01',$sendto,E_LOG_INFORMATIVE,'');
}
}
diff --git a/e107_admin/themeold.php b/e107_admin/themeold.php
deleted file mode 100644
index 5411ac37f..000000000
--- a/e107_admin/themeold.php
+++ /dev/null
@@ -1,925 +0,0 @@
-getMarketplace();
- echo $mp->renderLoginForm();
- exit;
- break;
-
- /*
- case 'download':
- $string = base64_decode($_GET['src']);
- parse_str($string, $p);
- $mp = $themec->getMarketplace();
- $mp->generateAuthKey($e107SiteUsername, $e107SiteUserpass);
- // Server flush useless. It's ajax ready state 4, we can't flush (sadly) before that (at least not for all browsers)
- echo "
";
- exit;
-}
-
-echo "
- This is the e107 resetcore utility. It allows you to completely rebuild your core if it becomes corrupt, or to restore a backup. It won't affect your actual content (news posts, forum posts, articles etc).
- Only run this utility if your site is failing to load due to a critical core error, or if you need to change a setting and can't log into your admin area.
-
- Please enter your main administrator username and password to continue ...
; ?>logo_template_large.png)
e107 Reset Core Utility
-