mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-28 16:50:07 +02:00
Code Issues Releases Wiki Activity

Some code cleanup

Browse Source
This commit is contained in:
CaMer0n
2009-11-05 09:15:19 +00:00
parent 3cf3d709d1
commit d892e2c039
13 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_admin/eurl.php
View File

@@ -9,9 +9,9 @@
* URL Management
*
* $Source: /cvs_backup/e107_0.8/e107_admin/eurl.php,v $
* $Revision: 1.11 $
* $Date: 2009-09-29 17:43:13 $
* $Author: secretr $
* $Revision: 1.12 $
* $Date: 2009-11-05 09:15:12 $
* $Author: e107coders $
*/
require_once('../class2.php');
@@ -254,8 +254,7 @@ class admin_eurl_config {
function parse_config_xml($path)
{
require_once(e_HANDLER.'xml_class.php');
$xml = new xmlClass;
$xml = e107::getXml();
$parsed = $xml->loadXMLfile($path, true, true);
//Load Lan file if required

13
e107_admin/includes/categories.php
View File

@@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+
| e107 website system
|
| <20>Steve Dunstan 2001-2002
| <20>Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
@@ -11,16 +11,16 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/includes/categories.php,v $
| $Revision: 1.7 $
| $Date: 2009-11-01 20:41:34 $
| $Author: e107steved $
| $Revision: 1.8 $
| $Date: 2009-11-05 09:15:12 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
require_once(e_HANDLER."message_handler.php");
$emessage = &eMessage::getInstance();
$emessage = e107::getMessage();
$text = "<div style='text-align:center'>
<table class='fborder' style='".ADMIN_WIDTH."'>";
@@ -50,8 +50,7 @@ foreach ($admin_cat['id'] as $cat_key => $cat_id)
{
$text_rend = render_links(e_ADMIN."plugin.php", ADLAN_98, ADLAN_99, "Z", E_16_PLUGMANAGER, 'default');
require_once(e_HANDLER.'xml_class.php');
$xml = new xmlClass; // We're going to have some plugins with plugin.xml files, surely? So create XML object now
$xml = e107::getXml();
$xml->filter = array('@attributes' => FALSE,'administration' => FALSE); // .. and they're all going to need the same filter
if ($text_rend)

8
e107_admin/includes/infopanel.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $
| $Revision: 1.14 $
| $Date: 2009-10-26 09:50:00 $
| $Revision: 1.15 $
| $Date: 2009-11-05 09:15:12 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -82,9 +82,9 @@ if (isset($_POST['submit-mye107']) || varset($_POST['submit-mymenus']))
<div class='left block-text'>";
// TODO Load with Ajax
/*
require_once(e_HANDLER.'xml_class.php');
$xml = new xmlClass;
$xml = e107::getXml();
$vars = $xml->loadXMLfile('http://www.e107.org/e107_plugins/rss_menu/rss.php?1.2', true, true);
$text .= print_r($vars,TRUE);
*/

11
e107_admin/upload.php
View File

@@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+
| e107 website system
|
| <20>Steve Dunstan 2001-2002
| <20>Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/upload.php,v $
| $Revision: 1.9 $
| $Date: 2009-08-28 16:10:51 $
| $Author: marj_nl_fr $
| $Revision: 1.10 $
| $Date: 2009-11-05 09:15:12 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
require_once("../class2.php");
@@ -191,8 +191,7 @@ switch ($action)
$current_perms = array();
if (($edit_upload_list && is_readable(e_UPLOAD_TEMP_DIR.e_SAVE_FILETYPES)) || (!$edit_upload_list && is_readable(e_ADMIN.e_READ_FILETYPES)))
{
require_once(e_HANDLER.'xml_class.php');
$xml = new xmlClass;
$xml = e107::getXml();
$source_file = $edit_upload_list ? e_UPLOAD_TEMP_DIR.e_SAVE_FILETYPES : e_ADMIN.e_READ_FILETYPES;
$temp_vars = $xml->loadXMLfile($source_file, true, false);
if ($temp_vars === FALSE)