mirror of
https://github.com/e107inc/e107.git
synced 2025-03-11 07:59:44 +01:00
Tidy up various errors and inconsistencies that have crept in
This commit is contained in:
e107steved
parent
f66ce71a8f
commit
ec13689f67
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $
|
||||
| $Revision: 1.24 $
|
||||
| $Date: 2008-06-17 19:45:46 $
|
||||
| $Revision: 1.25 $
|
||||
| $Date: 2008-07-25 19:26:32 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -242,7 +242,7 @@ function update_706_to_800($type='')
|
||||
|
||||
if (isset($pref['forum_user_customtitle']) && !isset($pref['signup_option_customtitle']))
|
||||
{
|
||||
if ($just_check) return update_needed();
|
||||
if ($just_check) return update_needed('Customtitle change');
|
||||
$pref['signup_option_customtitle'] = $pref['forum_user_customtitle'];
|
||||
unset($pref['forum_user_customtitle']);
|
||||
$do_save = TRUE;
|
||||
@ -251,7 +251,7 @@ function update_706_to_800($type='')
|
||||
//change menu_path for usertheme_menu
|
||||
if($sql->db_Select("menus", "menu_path", "menu_path='usertheme_menu' || menu_path='usertheme_menu/'"))
|
||||
{
|
||||
if ($just_check) return update_needed();
|
||||
if ($just_check) return update_needed('usertheme_menu');
|
||||
$sql->db_Update("menus", "menu_path='user_menu/' WHERE menu_path='usertheme_menu' || menu_path='usertheme_menu/' ");
|
||||
catch_error();
|
||||
}
|
||||
@ -259,7 +259,7 @@ function update_706_to_800($type='')
|
||||
//change menu_path for userlanguage_menu
|
||||
if($sql->db_Select("menus", "menu_path", "menu_path='userlanguage_menu' || menu_path='userlanguage_menu/'"))
|
||||
{
|
||||
if ($just_check) return update_needed();
|
||||
if ($just_check) return update_needed('userlanguage_menu');
|
||||
$sql->db_Update("menus", "menu_path='user_menu/' WHERE menu_path='userlanguage_menu' || menu_path='userlanguage_menu/' ");
|
||||
catch_error();
|
||||
}
|
||||
@ -267,7 +267,7 @@ function update_706_to_800($type='')
|
||||
//change menu_path for compliance_menu
|
||||
if($sql->db_Select("menus", "menu_path", "menu_path='compliance_menu' || menu_path='compliance_menu/'"))
|
||||
{
|
||||
if ($just_check) return update_needed();
|
||||
if ($just_check) return update_needed('compliance_menu');
|
||||
$sql->db_Update("menus", "menu_path='siteinfo_menu/' WHERE menu_path='compliance_menu' || menu_path='compliance_menu/' ");
|
||||
catch_error();
|
||||
}
|
||||
@ -275,7 +275,7 @@ function update_706_to_800($type='')
|
||||
//change menu_path for powered_by_menu
|
||||
if($sql->db_Select("menus", "menu_path", "menu_path='powered_by_menu' || menu_path='powered_by_menu/'"))
|
||||
{
|
||||
if ($just_check) return update_needed();
|
||||
if ($just_check) return update_needed('poweredby_menu');
|
||||
$sql->db_Update("menus", "menu_path='siteinfo_menu/' WHERE menu_path='powered_by_menu' || menu_path='powered_by_menu/' ");
|
||||
catch_error();
|
||||
}
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_files/def_e107_prefs.php,v $
|
||||
| $Revision: 1.11 $
|
||||
| $Date: 2008-06-13 20:20:20 $
|
||||
| $Revision: 1.12 $
|
||||
| $Date: 2008-07-25 19:26:32 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -92,10 +92,8 @@ City, State, Country
|
||||
'plug_status' => 'rss_menu',
|
||||
'plug_latest' => '',
|
||||
'wmessage_sc' => '0',
|
||||
'frontpage' =>
|
||||
array (
|
||||
'all' => 'news.php',
|
||||
),
|
||||
'frontpage_force' => array(e_UC_PUBLIC => ''),
|
||||
'frontpage' => array(e_UC_PUBLIC => 'news.php'),
|
||||
'signup_text' => '',
|
||||
'admin_alerts_ok' => '1',
|
||||
'link_replace' => '0',
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/news_shortcodes.php,v $
|
||||
| $Revision: 1.7 $
|
||||
| $Date: 2008-07-15 21:11:43 $
|
||||
| $Revision: 1.8 $
|
||||
| $Date: 2008-07-25 19:26:46 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -163,7 +163,8 @@ return emailprint::render_emailprint('news', $news_item['news_id'], 2);
|
||||
SC_END
|
||||
|
||||
SC_BEGIN PDFICON
|
||||
global $tp;
|
||||
global $tp, $pref;
|
||||
if (!$pref['plug_installed']['pdf']) return '';
|
||||
$news_item = getcachedvars('current_news_item');
|
||||
return $tp -> parseTemplate("{PDF=".LAN_NEWS_24."^news.".$news_item['news_id']."}");
|
||||
SC_END
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
|
||||
| $Revision: 1.35 $
|
||||
| $Date: 2008-03-11 01:47:02 $
|
||||
| $Author: mcfly_e107 $
|
||||
| $Revision: 1.36 $
|
||||
| $Date: 2008-07-25 19:26:32 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
@ -388,24 +388,24 @@ class e107plugin
|
||||
|
||||
function manage_tables($action, $var)
|
||||
{
|
||||
global $sql;
|
||||
if ($action == 'add')
|
||||
{
|
||||
if (is_array($var))
|
||||
global $sql;
|
||||
switch ($action)
|
||||
{
|
||||
case 'add' :
|
||||
if (is_array($var))
|
||||
{
|
||||
foreach($var as $tab)
|
||||
{
|
||||
foreach($var as $tab)
|
||||
{
|
||||
if (!$sql->db_Query($tab))
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
if (!$sql->db_Query($tab))
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
if ($action == 'upgrade')
|
||||
{
|
||||
}
|
||||
return TRUE;
|
||||
break;
|
||||
case 'upgrade' :
|
||||
if (is_array($var))
|
||||
{
|
||||
foreach($var as $tab)
|
||||
@ -418,9 +418,8 @@ class e107plugin
|
||||
return TRUE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
if ($action == 'remove')
|
||||
{
|
||||
break;
|
||||
case 'remove' :
|
||||
if (is_array($var))
|
||||
{
|
||||
foreach($var as $tab)
|
||||
@ -434,7 +433,8 @@ class e107plugin
|
||||
return TRUE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
function manage_plugin_prefs($action, $prefname, $plugin_folder, $varArray = '')
|
||||
@ -883,7 +883,7 @@ class e107plugin
|
||||
$plug['plug_action'] = 'install';
|
||||
|
||||
// $plug_vars = $this->parse_plugin_php($path);
|
||||
include_once($path.'plugin.php');
|
||||
include_once($_path.'plugin.php');
|
||||
|
||||
$func = $eplug_folder.'_install';
|
||||
if (function_exists($func))
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/userclass_class.php,v $
|
||||
| $Revision: 1.15 $
|
||||
| $Date: 2008-04-25 19:39:43 $
|
||||
| $Revision: 1.16 $
|
||||
| $Date: 2008-07-25 19:26:32 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -108,8 +108,8 @@ class user_class
|
||||
$this->class_tree[$c]['userclass_id'] = $c;
|
||||
$this->class_tree[$c]['userclass_name'] = $d;
|
||||
$this->class_tree[$c]['userclass_description'] = 'Fixed class';
|
||||
$this->class_tree[$c]['userclass_visibility'] = 0;
|
||||
$this->class_tree[$c]['userclass_editclass'] = 0;
|
||||
$this->class_tree[$c]['userclass_visibility'] = e_UC_PUBLIC;
|
||||
$this->class_tree[$c]['userclass_editclass'] = e_UC_MAINADMIN;
|
||||
$this->class_tree[$c]['userclass_accum'] = $c;
|
||||
// $this->class_parents[] = $c;
|
||||
}
|
||||
|
||||
35
install_.php
35
install_.php
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/install_.php,v $
|
||||
| $Revision: 1.11 $
|
||||
| $Date: 2008-07-09 21:38:24 $
|
||||
| $Revision: 1.12 $
|
||||
| $Date: 2008-07-25 19:26:32 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -45,7 +45,13 @@ if(isset($_GET['object']))
|
||||
}
|
||||
|
||||
define("e107_INIT", TRUE);
|
||||
define("e_UC_PUBLIC", 0);
|
||||
define("e_UC_MAINADMIN", 250);
|
||||
define("e_UC_READONLY", 251);
|
||||
define("e_UC_GUEST", 252);
|
||||
define("e_UC_MEMBER", 253);
|
||||
define("e_UC_ADMIN", 254);
|
||||
define("e_UC_NOBODY", 255);
|
||||
|
||||
error_reporting(E_ALL);
|
||||
|
||||
@ -403,6 +409,7 @@ class e_install
|
||||
$opt_writable = $this->check_writable_perms('can_write'); // Some directories CAN optionally be writable
|
||||
$version_fail = false;
|
||||
$perms_errors = "";
|
||||
|
||||
if(count($not_writable))
|
||||
{
|
||||
$perms_pass = false;
|
||||
@ -724,10 +731,8 @@ This file has been generated by the installation script.
|
||||
function check_writable_perms($list = 'must_write')
|
||||
{
|
||||
$bad_files = array();
|
||||
$data['must_write'] = 'e107_config.php';
|
||||
$data['can_write'] = '{$FILES_DIRECTORY}cache/|{$FILES_DIRECTORY}public/|{$FILES_DIRECTORY}public/avatars/|{$PLUGINS_DIRECTORY}|{$THEMES_DIRECTORY}';
|
||||
$data = 'e107_config.php|{$FILES_DIRECTORY}public/temp/|{$FILES_DIRECTORY}public/logs/';
|
||||
$data = '{$CACHE_DIRECTORY}|{$UPLOADS_DIRECTORY}|{$FILES_DIRECTORY}public/avatars/|{$PLUGINS_DIRECTORY}|{$THEMES_DIRECTORY}';
|
||||
$data['must_write'] = 'e107_config.php|{$FILES_DIRECTORY}temp/|{$FILES_DIRECTORY}logs/';
|
||||
$data['can_write'] = '{$CACHE_DIRECTORY}|{$UPLOADS_DIRECTORY}|{$FILES_DIRECTORY}public/avatars/|{$PLUGINS_DIRECTORY}|{$THEMES_DIRECTORY}';
|
||||
if (!isset($data[$list])) return $bad_files;
|
||||
foreach ($this->e107->e107_dirs as $dir_name => $value)
|
||||
{
|
||||
@ -863,21 +868,21 @@ This file has been generated by the installation script.
|
||||
mysql_query("INSERT INTO {$this->previous_steps['mysql']['prefix']}banner VALUES (0, 'e107', 'e107login', 'e107password', 'banner3.png', 'http://e107.org', 0, 0, 0, 0, 0, 0, '', 'campaign_one') ");
|
||||
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (1, 'login_menu', 1, 1, '0', '', 'login_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (3, 'online_menu', 0, 0, '0', '', 'online_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (3, 'online_menu', 0, 0, '0', '', 'online/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (4, 'blogcalendar_menu', 0, 0, '0', '', 'blogcalendar_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (5, 'tree_menu', 0, 0, '0', '', 'tree_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (6, 'search_menu', 0, 0, '0', '', 'search_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (7, 'compliance_menu', 0, 0, '0', '', 'compliance_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (8, 'userlanguage_menu', 0, 0, '0', '', 'userlanguage_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (9, 'powered_by_menu', 2, 2, '0', '', 'powered_by_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (10, 'counter_menu', 0, 0, '0', '', 'counter_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (11, 'usertheme_menu', 0, 0, '0', '', 'usertheme_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (7, 'compliance_menu', 0, 0, '0', '', 'siteinfo_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (8, 'userlanguage_menu', 0, 0, '0', '', 'user_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (9, 'powered_by_menu', 2, 2, '0', '', 'siteinfo_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (10, 'counter_menu', 0, 0, '0', '', 'siteinfo_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (11, 'usertheme_menu', 0, 0, '0', '', 'user_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (12, 'banner_menu', 0, 0, '0', '', 'banner_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (13, 'online_extended_menu', 2, 1, '0', '', 'online_extended_menu/')");
|
||||
// mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (13, 'online_extended_menu', 2, 1, '0', '', 'online_extended_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (14, 'clock_menu', 0, 0, '0', '', 'clock_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (15, 'sitebutton_menu', 0, 0, '0', '', 'sitebutton_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (15, 'sitebutton_menu', 0, 0, '0', '', 'siteinfo_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (16, 'comment_menu', 0, 0, '0', '', 'comment_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (17, 'lastseen_menu', 0, 0, '0', '', 'lastseen/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (17, 'lastseen_menu', 0, 0, '0', '', 'online/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (18, 'other_news_menu', 0, 0, '0', '', 'other_news_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (19, 'other_news2_menu', 0, 0, '0', '', 'other_news_menu/')");
|
||||
mysql_query("INSERT INTO `{$this->previous_steps['mysql']['prefix']}menus` VALUES (20, 'admin_menu', 0, 0, '0', '', 'admin_menu/')");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user