mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

General cleanup

Browse Source
This commit is contained in:
CaMer0n
2011-06-08 03:18:50 +00:00
parent dbf47650bc
commit 98af91027f
7 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/ad_links.php
View File

@@ -582,7 +582,8 @@ $array_functions = array(
29 => array(e_ADMIN.'fileinspector.php', ADLAN_147, ADLAN_148, 'Y', 4, E_16_INSPECT, E_32_INSPECT), 29 => array(e_ADMIN.'fileinspector.php', ADLAN_147, ADLAN_148, 'Y', 4, E_16_INSPECT, E_32_INSPECT),
30 => array(e_ADMIN.'notify.php', ADLAN_149, ADLAN_150, 'O', 4, E_16_NOTIFY, E_32_NOTIFY), 30 => array(e_ADMIN.'notify.php', ADLAN_149, ADLAN_150, 'O', 4, E_16_NOTIFY, E_32_NOTIFY),
31 => array(e_ADMIN.'cron.php', ADLAN_157, ADLAN_158, 'U', 4, E_16_CRON, E_32_CRON), 31 => array(e_ADMIN.'cron.php', ADLAN_157, ADLAN_158, 'U', 4, E_16_CRON, E_32_CRON),
32 => array(e_ADMIN.'eurl.php', ADLAN_159, ADLAN_160, 'L', 1, E_16_EURL, E_32_EURL), // Deprecated until e_url.php standard is established.
// 32 => array(e_ADMIN.'eurl.php', ADLAN_159, ADLAN_160, 'L', 1, E_16_EURL, E_32_EURL),
33 => array(e_ADMIN.'plugin.php', ADLAN_98, ADLAN_99, 'Z', 5 , E_16_PLUGMANAGER, E_32_PLUGMANAGER), 33 => array(e_ADMIN.'plugin.php', ADLAN_98, ADLAN_99, 'Z', 5 , E_16_PLUGMANAGER, E_32_PLUGMANAGER),
34 => array(e_ADMIN.'docs.php', ADLAN_12, ADLAN_13, '', 20, E_16_DOCS, E_32_DOCS), 34 => array(e_ADMIN.'docs.php', ADLAN_12, ADLAN_13, '', 20, E_16_DOCS, E_32_DOCS),
// TODO System Info. // TODO System Info.

18
e107_admin/e107_update.php
View File

@@ -23,16 +23,16 @@ $e_sub_cat = 'database';
require_once ("auth.php"); require_once ("auth.php");
require_once ("update_routines.php"); require_once ("update_routines.php");
require_once (e_HANDLER."message_handler.php"); $mes = e107::getMessage();
$emessage = &eMessage::getInstance(); $frm = e107::getForm();
require_once (e_HANDLER."form_handler.php");
$frm = new e_form(); // FIX ME - Should be a class so it can be called any where.
// Carry out core updates // Carry out core updates
function run_updates($dbupdate) function run_updates($dbupdate)
{ {
global $emessage; global $mes;
foreach($dbupdate as $func => $rmks) foreach($dbupdate as $func => $rmks)
{ {
$installed = call_user_func("update_".$func); $installed = call_user_func("update_".$func);
@@ -45,10 +45,10 @@ function run_updates($dbupdate)
$error = call_user_func("update_".$func, "do"); $error = call_user_func("update_".$func, "do");
if($error != '') if($error != '')
{ {
$emessage->add($message, E_MESSAGE_ERROR); $mes->add($message, E_MESSAGE_ERROR);
$emessage->add($error, E_MESSAGE_ERROR); $mes->add($error, E_MESSAGE_ERROR);
} }
else $emessage->add($message, E_MESSAGE_SUCCESS); else $mes->add($message, E_MESSAGE_SUCCESS);
} }
} }
} }
@@ -139,7 +139,7 @@ ob_start();
$text = ob_get_contents(); $text = ob_get_contents();
ob_end_clean(); ob_end_clean();
$e107->ns->tablerender(LAN_UPDATE_56, $emessage->render().$text); $e107->ns->tablerender(LAN_UPDATE_56, $mes->render().$text);
if($total_updates == 0) if($total_updates == 0)
{ // No updates needed - clear the cache to be sure { // No updates needed - clear the cache to be sure

7
e107_admin/eurl.php
View File

@@ -73,7 +73,12 @@ class admin_eurl_config {
function renderPage() function renderPage()
{ {
$emessage = e107::getMessage();
$mes = e107::getMessage();
$mes->addInfo("Deprecated for now"); // SEF URLs not to be used until e_url.php standard established.
return e107::getRender()->tablerender(PAGE_NAME, $mes->render());
$empty = " $empty = "
<tr> <tr>
<td colspan='2'>".LAN_EURL_EMPTY."</td> <td colspan='2'>".LAN_EURL_EMPTY."</td>

12
e107_admin/newspost.php
View File

@@ -1683,7 +1683,11 @@ class admin_newspost
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
<tbody> <tbody>";
// news_rewrite table Deprecated. e_url.php standard to be established.
/*
$text .= "
<tr> <tr>
<td class='label'>Friendly URL string: </td> <td class='label'>Friendly URL string: </td>
<td class='control'> <td class='control'>
@@ -1691,7 +1695,11 @@ class admin_newspost
".$frm->hidden('news_rewrite_id', intval($_POST['news_rewrite_id']))." ".$frm->hidden('news_rewrite_id', intval($_POST['news_rewrite_id']))."
<div class='field-help'>To make this work, you need to enable 'SEF URLs' config profile from <a href='".e_ADMIN_ABS."eurl.php'>URL Configuration area</a></div> <div class='field-help'>To make this work, you need to enable 'SEF URLs' config profile from <a href='".e_ADMIN_ABS."eurl.php'>URL Configuration area</a></div>
</td> </td>
</tr> </tr>";
*/
$text .= "
<tr> <tr>
<td class='label'>Meta keywords: </td> <td class='label'>Meta keywords: </td>
<td class='control'>".$frm->text('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)."</td> <td class='control'>".$frm->text('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)."</td>

4
e107_handlers/form_handler.php
View File

@@ -726,12 +726,12 @@ class e_form
case 'execute': case 'execute':
$image = ADMIN_EXECUTE_ICON_PATH; $image = ADMIN_EXECUTE_ICON_PATH;
$options['class'] = vartrue($options['class'] , 'action delete'); $options['class'] = vartrue($options['class'] , 'action execute');
break; break;
case 'view': case 'view':
$image = ADMIN_VIEW_ICON_PATH; $image = ADMIN_VIEW_ICON_PATH;
$options['class'] = vartrue($options['class'] , 'action delete'); $options['class'] = vartrue($options['class'] , 'action view');
break; break;
} }
$options['title'] = $title;//shorthand $options['title'] = $title;//shorthand

6
e107_plugins/forum/forum_sql.php
View File

@@ -31,9 +31,9 @@ CREATE TABLE forum_thread (
`thread_sticky` tinyint(1) unsigned NOT NULL default '0', `thread_sticky` tinyint(1) unsigned NOT NULL default '0',
`thread_datestamp` int(10) unsigned default NULL, `thread_datestamp` int(10) unsigned default NULL,
`thread_user` int(10) unsigned default NULL, `thread_user` int(10) unsigned default NULL,
`thread_user_anon` varchar(30) NULL, `thread_user_anon` varchar(30) default NULL,
`thread_lastuser` int(10) unsigned default NULL, `thread_lastuser` int(10) unsigned default NULL,
`thread_lastuser_anon` varchar(30) NULL, `thread_lastuser_anon` varchar(30) default NULL,
`thread_total_replies` int(10) unsigned NOT NULL default '0', `thread_total_replies` int(10) unsigned NOT NULL default '0',
`thread_options` text, `thread_options` text,
PRIMARY KEY (`thread_id`), PRIMARY KEY (`thread_id`),
@@ -54,7 +54,7 @@ CREATE TABLE forum_post (
`post_edit_user` int(10) unsigned default NULL, `post_edit_user` int(10) unsigned default NULL,
`post_ip` varchar(45) default NULL, `post_ip` varchar(45) default NULL,
`post_user_anon` varchar(30) default NULL, `post_user_anon` varchar(30) default NULL,
`post_attachments` text default NULL, `post_attachments` text,
`post_options` text, `post_options` text,
PRIMARY KEY (`post_id`), PRIMARY KEY (`post_id`),
KEY `post_ip` (`post_ip`), KEY `post_ip` (`post_ip`),

2
e107_themes/_blank/admin_theme.php
View File

@@ -68,7 +68,7 @@ $no_core_css = TRUE;
define("ADMIN_DOWN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/down_32.png' alt='' title='".LAN_DELETE."' />"); define("ADMIN_DOWN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/down_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DOWN_ICON_PATH", e_IMAGE."admin_images/down_32.png"); define("ADMIN_DOWN_ICON_PATH", e_IMAGE."admin_images/down_32.png");
define("ADMIN_EXECUTE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/execute_32.png' alt='' title='".LAN_DELETE."' />"); define("ADMIN_EXECUTE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/execute_32.png' alt='' title='".LAN_EXECUTE."' />");
define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_32.png"); define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_32.png");