mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-09-02 10:53:29 +02:00
Code Issues Releases Wiki Activity

Make custom title a general field (rather than forum), more work on usersettings

Browse Source
This commit is contained in:
e107steved
2008-01-06 21:16:37 +00:00
parent 92ad2b1d2e
commit 982a65736d
8 changed files with 82 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/prefs.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $
| $Revision: 1.8 $
| $Date: 2007-11-07 22:34:47 $
| $Revision: 1.9 $
| $Date: 2008-01-06 21:16:16 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -580,8 +580,8 @@ $text .= "<div id='signup' style='display:none; text-align:center'>
<td class='forumheader'>".CUSTSIG_14."</td>
</tr>";
$signup_option_title = array(CUSTSIG_2, CUSTSIG_6, CUSTSIG_7, CUSTSIG_8, CUSTSIG_17);
$signup_option_names = array("signup_option_realname", "signup_option_signature", "signup_option_image", "signup_option_timezone", "signup_option_class");
$signup_option_title = array(CUSTSIG_2, CUSTSIG_6, CUSTSIG_7, CUSTSIG_8, CUSTSIG_17, CUSTSIG_20);
$signup_option_names = array("signup_option_realname", "signup_option_signature", "signup_option_image", "signup_option_timezone", "signup_option_class", 'signup_option_customtitle');
foreach($signup_option_names as $key => $value)
{

21
e107_admin/update_routines.php
View File

@@ -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.14 $
| $Date: 2007-12-30 18:20:54 $
| $Revision: 1.15 $
| $Date: 2008-01-06 21:16:16 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -183,7 +183,7 @@ function update_706_to_800($type='')
global $sql,$ns, $pref;
// List of unwanted $pref values which can go
$obs_prefs = array('frontpage_type','rss_feeds', 'log_lvcount', 'zone', 'upload_allowedfiletype', 'real');
$obs_prefs = array('frontpage_type','rss_feeds', 'log_lvcount', 'zone', 'upload_allowedfiletype', 'real', 'forum_user_customtitle');
// List of DB tables not required (includes a few from 0.6xx)
$obs_tables = array('flood', 'headlines', 'stat_info', 'stat_counter', 'stat_last');
@@ -208,11 +208,20 @@ function update_706_to_800($type='')
'chatbox' => 'cb_ip'
);
$db_parser = new db_table_admin; // Class to read table defs and process them
$do_save = FALSE;
$db_parser = new db_table_admin; // Class to read table defs and process them
$do_save = FALSE; // Set TRUE to update prefs when update complete
$just_check = $type == 'do' ? FALSE : TRUE; // TRUE if we're just seeing if an update is needed
if (isset($pref['forum_user_customtitle']) && !isset($pref['signup_option_customtitle']))
{
if ($just_check) return update_needed();
$pref['signup_option_customtitle'] = $pref['forum_user_customtitle'];
unset($pref['forum_user_customtitle']);
$do_save = TRUE;
}
//change menu_path for usertheme_menu
if($sql->db_Select("menus", "menu_path", "menu_path='usertheme_menu' || menu_path='usertheme_menu/'"))
{