mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 22:27:34 +02:00
Code Issues Releases Wiki Activity

Default-install fixes. Login Menu Template upgraded

Browse Source
This commit is contained in:
Cameron
2012-12-16 16:02:13 -08:00
parent f63fcb61a8
commit 2990524803
6 changed files with 577 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/db.php
View File

@@ -672,7 +672,7 @@ class system_tools
</table>
<div class='buttons-bar center'>
".$frm->admin_button('exportXmlFile', "Export File", 'exportXmlFile')."
".$frm->admin_button('exportXmlFile', "Export File", 'other')."
</div>
</fieldset>
</form> ";

411
e107_core/xml/default_install.xml
View File

@@ -69,11 +69,22 @@
)]]></core>
<core name="e_jslib_plugin"><![CDATA[array ()]]></core>
<core name="e_jslib_theme"><![CDATA[array ()]]></core>
<core name="e_meta_list"><![CDATA[array (
'tinymce' => 'tinymce',
)]]></core>
<core name="e_shortcode_list"><![CDATA[array (
'siteinfo' => 'siteinfo',
)]]></core>
<core name="e_sitelink_list"><![CDATA[array (
'news' => 'news',
'page' => 'page',
)]]></core>
<core name="email_notify">0</core>
<core name="email_text"></core>
<core name="emotepack">default</core>
<core name="enable_rdns">0</core>
<core name="enable_rdns_on_ban">0</core>
<core name="filter_script">0</core>
<core name="flood_hits">100</core>
<core name="flood_protect">1</core>
<core name="flood_time">30</core>
@@ -86,12 +97,15 @@
<core name="frontpage_force"><![CDATA[array (
0 => '',
)]]></core>
<core name="html_abuse">1</core>
<core name="im_height">80</core>
<core name="im_path">/usr/X11R6/bin/</core>
<core name="im_width">80</core>
<core name="image_post">1</core>
<core name="image_post_class">0</core>
<core name="image_preload">0</core>
<core name="inputdate">%A, %d %b, %Y</core>
<core name="inputtime">%I:%M %p</core>
<core name="install_date">1251664949</core>
<core name="link_replace">0</core>
<core name="link_text"></core>
@@ -102,8 +116,6 @@
<core name="logcode">0</core>
<core name="loginname_maxlength">30</core>
<core name="longdate">%A %d %B %Y - %H:%M:%S</core>
<core name="inputdate">%A, %d %b, %Y</core>
<core name="inputtime">%I:%M %p</core>
<core name="mail_pause">3</core>
<core name="mail_bounce">none</core>
<core name="mail_pausetime">4</core>
@@ -116,7 +128,7 @@
<core name="membersonly_exceptions"><![CDATA[array (
0 => '',
)]]></core>
<core name="menu_wordwrap"></core>
<core name="menu_wordwrap">0</core>
<core name="menuconfig_list"><![CDATA[array (
'login_menu' =>
array (
@@ -139,6 +151,12 @@
<core name="old_np">0</core>
<core name="passwordEncoding">0</core>
<core name="password_CHAP">0</core>
<core name="plug_installed"><![CDATA[array (
'news' => '1.0',
'page' => '1.0',
'siteinfo' => '1.0',
'tinymce' => '1.0',
)]]></core>
<core name="post_html">254</core>
<core name="post_script">250</core>
<core name="filter_script">1</core>
@@ -159,7 +177,7 @@
</core>
<core name="search_highlight">1</core>
<core name="search_restrict">0</core>
<core name="shortdate">%d %b : %H:%M</core>
<core name="shortdate">%d %b %Y : %H:%M</core>
<core name="signcode">0</core>
<core name="signup_disallow_text"></core>
<core name="signup_maxip">3</core>
@@ -190,28 +208,22 @@ City, State, Country
<core name="sitelogo"></core>
<core name="sitename">e107 Website System</core>
<core name="sitetag">e107 Website System</core>
<core name="sitetheme">jayya</core>
<core name="sitetheme_custompages"></core>
<core name="sitetheme_deflayout">3_column</core>
<core name="sitetheme_layouts"><![CDATA[array (
'3_column' =>
array (
'@attributes' =>
array (
'title' => '3 Columns',
'preview' => 'preview.jpg',
'default' => 'true',
),
0 => '',
),
'2_column' =>
<core name='sitename'>My Website</core>
<core name='sitetag'>e107 Website System</core>
<core name='sitetheme'>bootstrap</core>
<core name='sitetheme_custompages'><![CDATA[array (
)]]></core>
<core name='sitetheme_deflayout'>default</core>
<core name='sitetheme_layouts'><![CDATA[array (
'default' =>
array (
'@attributes' =>
array (
'title' => '2 Columns',
'preview' => 'preview.jpg',
'default' => 'true',
),
0 => '',
'custompages' => 'usersettings.php',
0 => NULL,
),
)]]></core>
<core name="sitetheme_pref"></core>
@@ -324,6 +336,7 @@ City, State, Country
<core name="user_reg_veri">1</core>
<core name="user_new_period">3</core>
<core name="user_tracking">cookie</core>
<core name="wm_enclose">1</core>
<core name="wmessage_sc">0</core>
<core name="wysiwyg">1</core>
<core name="xup_enabled">1</core>
@@ -491,15 +504,138 @@ City, State, Country
)]]></notify>
</prefs>
<database>
<dbTable name="core_media_cat">
<item>
<field name="media_cat_id">1</field>
<field name="media_cat_owner">_common</field>
<field name="media_cat_category">_common_image</field>
<field name="media_cat_title">(Common Images)</field>
<field name="media_cat_diz">Media in this category will be available in all areas of admin. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">2</field>
<field name="media_cat_owner">_common</field>
<field name="media_cat_category">_common_file</field>
<field name="media_cat_title">(Common Files)</field>
<field name="media_cat_diz">Media in this category will be available in all areas of admin. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">3</field>
<field name="media_cat_owner">news</field>
<field name="media_cat_category">news</field>
<field name="media_cat_title">News</field>
<field name="media_cat_diz">Will be available in the news area. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">1</field>
</item>
<item>
<field name="media_cat_id">4</field>
<field name="media_cat_owner">page</field>
<field name="media_cat_category">page</field>
<field name="media_cat_title">Custom Pages</field>
<field name="media_cat_diz">Will be available in the custom pages area of admin. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">5</field>
<field name="media_cat_owner">download</field>
<field name="media_cat_category">download_image</field>
<field name="media_cat_title">Download Images</field>
<field name="media_cat_diz"></field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">6</field>
<field name="media_cat_owner">download</field>
<field name="media_cat_category">download_thumb</field>
<field name="media_cat_title">Download Thumbnails</field>
<field name="media_cat_diz"></field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">7</field>
<field name="media_cat_owner">download</field>
<field name="media_cat_category">download_file</field>
<field name="media_cat_title">Download Files</field>
<field name="media_cat_diz"></field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">8</field>
<field name="media_cat_owner">news</field>
<field name="media_cat_category">news_thumb</field>
<field name="media_cat_title">News Thumbnails (Legacy)</field>
<field name="media_cat_diz">Legacy news thumbnails. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">1</field>
</item>
<item>
<field name="media_cat_id">9</field>
<field name="media_cat_owner">_icon</field>
<field name="media_cat_category">_icon_16</field>
<field name="media_cat_title">Icons 16px</field>
<field name="media_cat_diz">Available where icons are used in admin. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">10</field>
<field name="media_cat_owner">_icon</field>
<field name="media_cat_category">_icon_32</field>
<field name="media_cat_title">Icons 32px</field>
<field name="media_cat_diz">Available where icons are used in admin. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">11</field>
<field name="media_cat_owner">_icon</field>
<field name="media_cat_category">_icon_48</field>
<field name="media_cat_title">Icons 48px</field>
<field name="media_cat_diz">Available where icons are used in admin. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
<item>
<field name="media_cat_id">12</field>
<field name="media_cat_owner">_icon</field>
<field name="media_cat_category">_icon_64</field>
<field name="media_cat_title">Icons 64px</field>
<field name="media_cat_diz">Available where icons are used in admin. </field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
</item>
</dbTable>
<dbTable name="generic">
<item>
<field name="gen_id">1</field>
<field name="gen_type">wmessage</field>
<field name="gen_datestamp">1145848343</field>
<field name="gen_user_id">1</field>
<field name="gen_ip"></field>
<field name="gen_ip">Hello World!</field>
<field name="gen_intdata">0</field>
<field name="gen_chardata">Welcome!</field>
<field name="gen_chardata">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque mattis sapien nec velit laoreet pulvinar. Integer sollicitudin risus nec nunc aliquam condimentum. Quisque malesuada posuere vulputate. Aliquam sit amet metus quam? Sed quam sem, condimentum ac convallis vel, posuere at augue. Cras accumsan, erat a laoreet blandit, turpis enim ullamcorper lectus, a tempus justo nunc id orci. Nulla vehicula, dolor vel rhoncus varius, nunc sapien laoreet turpis; id commodo arcu erat fringilla orci. Aenean gravida adipiscing nulla, ut tristique erat interdum porta. Sed at semper felis. Nullam bibendum faucibus gravida. In leo enim, gravida non molestie non, ultricies id nunc. Maecenas placerat interdum luctus. Ut mauris nisi, faucibus eu venenatis ac, lobortis ac velit. Donec sed leo urna, et vehicula neque. Curabitur malesuada auctor ornare.
</field>
</item>
</dbTable>
<dbTable name="links">
@@ -510,10 +646,12 @@ City, State, Country
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_order">1</field>
<field name="link_order">0</field>
<field name="link_parent">0</field>
<field name="link_open">0</field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
</item>
<item>
<field name="link_id">3</field>
@@ -521,11 +659,13 @@ City, State, Country
<field name="link_url">user.php</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_category">2</field>
<field name="link_order">3</field>
<field name="link_parent">0</field>
<field name="link_open">0</field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
</item>
<item>
<field name="link_id">4</field>
@@ -533,11 +673,13 @@ City, State, Country
<field name="link_url">submitnews.php</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_category">2</field>
<field name="link_order">4</field>
<field name="link_parent">0</field>
<field name="link_open">0</field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
</item>
<item>
<field name="link_id">5</field>
@@ -550,6 +692,36 @@ City, State, Country
<field name="link_parent">0</field>
<field name="link_open">0</field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
</item>
<item>
<field name="link_id">6</field>
<field name="link_name">News</field>
<field name="link_url">news.php</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_order">1</field>
<field name="link_parent">0</field>
<field name="link_open">0</field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
</item>
<item>
<field name="link_id">7</field>
<field name="link_name">Content</field>
<field name="link_url">page.php</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_order">2</field>
<field name="link_parent">0</field>
<field name="link_open">0</field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
</item>
</dbTable>
<dbTable name="menus">
@@ -565,7 +737,7 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">3</field>
<field name="menu_id">2</field>
<field name="menu_name">online_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -576,7 +748,7 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">4</field>
<field name="menu_id">3</field>
<field name="menu_name">blogcalendar_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -587,7 +759,7 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">5</field>
<field name="menu_id">4</field>
<field name="menu_name">tree_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -598,7 +770,7 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">6</field>
<field name="menu_id">5</field>
<field name="menu_name">search_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -609,18 +781,18 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">7</field>
<field name="menu_name">compliance_menu</field>
<field name="menu_id">6</field>
<field name="menu_name">counter_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">siteinfo/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">8</field>
<field name="menu_id">7</field>
<field name="menu_name">userlanguage_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -631,29 +803,29 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">9</field>
<field name="menu_name">powered_by_menu</field>
<field name="menu_location">2</field>
<field name="menu_order">2</field>
<field name="menu_class">0</field>
<field name="menu_id">8</field>
<field name="menu_name">compliance_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">siteinfo/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">12</field>
<field name="menu_name">banner_menu</field>
<field name="menu_id">9</field>
<field name="menu_name">other_news_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">banner/</field>
<field name="menu_path">news/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">14</field>
<field name="menu_id">10</field>
<field name="menu_name">clock_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -664,18 +836,18 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">15</field>
<field name="menu_name">sitebutton_menu</field>
<field name="menu_id">11</field>
<field name="menu_name">other_news2_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">siteinfo/</field>
<field name="menu_path">news/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">16</field>
<field name="menu_id">12</field>
<field name="menu_name">comment_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -686,7 +858,7 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">17</field>
<field name="menu_id">13</field>
<field name="menu_name">lastseen_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -697,29 +869,18 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">18</field>
<field name="menu_name">other_news_menu</field>
<field name="menu_id">14</field>
<field name="menu_name">news_months_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">other_news_menu/</field>
<field name="menu_path">news/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">19</field>
<field name="menu_name">other_news2_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class">0</field>
<field name="menu_pages"></field>
<field name="menu_path">other_news_menu/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">20</field>
<field name="menu_id">15</field>
<field name="menu_name">admin_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -730,29 +891,29 @@ City, State, Country
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">24</field>
<field name="menu_name">counter_menu</field>
<field name="menu_id">16</field>
<field name="menu_name">news_categories_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">siteinfo/</field>
<field name="menu_path">news/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">25</field>
<field name="menu_id">17</field>
<field name="menu_name">latestnews_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">siteinfo/</field>
<field name="menu_path">news/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">26</field>
<field name="menu_id">18</field>
<field name="menu_name">usertheme_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
@@ -762,24 +923,60 @@ City, State, Country
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">19</field>
<field name="menu_name">powered_by_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">siteinfo/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">20</field>
<field name="menu_name">sitebutton_menu</field>
<field name="menu_location">0</field>
<field name="menu_order">0</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">siteinfo/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
<item>
<field name="menu_id">21</field>
<field name="menu_name">news_months_menu</field>
<field name="menu_location">1</field>
<field name="menu_order">1</field>
<field name="menu_class"></field>
<field name="menu_pages"></field>
<field name="menu_path">news/</field>
<field name="menu_layout"></field>
<field name="menu_parms"></field>
</item>
</dbTable>
<dbTable name="news">
<item>
<field name="news_id">1</field>
<field name="news_title">Welcome to e107</field>
<field name="news_body">Welcome :-) :-( :-)))</field>
<field name="news_extended"></field>
<field name="news_datestamp">1251665200</field>
<field name="news_sef">welcome-to-e107</field>
<field name="news_body">[p]Welcome [img=style=vertical-align%3A+middle%3B+border%3A+0%3B]{e_IMAGE}emotes/default/smile.png[/img] [img=style=vertical-align%3A+middle%3B+border%3A+0%3B]{e_IMAGE}emotes/default/frown.png[/img] [img=style=vertical-align%3A+middle%3B+border%3A+0%3B]{e_IMAGE}emotes/default/smile.png[/img] ))[/p]</field>
<field name="news_extended">[p] [/p]</field>
<field name="news_meta_keywords"></field>
<field name="news_meta_description"></field>
<field name="news_datestamp">1355612400</field>
<field name="news_author">1</field>
<field name="news_category">1</field>
<field name="news_allow_comments">1</field>
<field name="news_allow_comments">0</field>
<field name="news_start">0</field>
<field name="news_end">0</field>
<field name="news_class">0</field>
<field name="news_render_type">0</field>
<field name="news_comment_total">0</field>
<field name="news_summary"></field>
<field name="news_thumbnail">welcome.png</field>
<field name="news_thumbnail"></field>
<field name="news_sticky">0</field>
</item>
</dbTable>
@@ -787,7 +984,12 @@ City, State, Country
<item>
<field name="category_id">1</field>
<field name="category_name">Misc</field>
<field name="category_sef"></field>
<field name="category_meta_description"></field>
<field name="category_meta_keywords"></field>
<field name="category_manager">254</field>
<field name="category_icon">news_16.png</field>
<field name="category_order">0</field>
</item>
</dbTable>
<dbTable name="page">
@@ -816,56 +1018,5 @@ City, State, Country
<field name="userclass_icon"></field>
</item>
</dbTable>
<dbTable name="core_media_cat">
<item>
<field name="media_cat_id">1</field>
<field name="media_cat_nick">_common</field>
<field name="media_cat_title">(Common Area)</field>
<field name="media_cat_diz"><![CDATA[Media in this category will be available in all areas of admin.]]></field>
<field name="media_cat_class">254</field>
</item>
<item>
<field name="media_cat_id">2</field>
<field name="media_cat_nick">news</field>
<field name="media_cat_title">News</field>
<field name="media_cat_diz"><![CDATA[Will be available in the news area.]]></field>
<field name="media_cat_class">254</field>
</item>
<item>
<field name="media_cat_id">3</field>
<field name="media_cat_nick">page</field>
<field name="media_cat_title">Custom Pages</field>
<field name="media_cat_diz"><![CDATA[Will be available in the custom pages area of admin.]]></field>
<field name="media_cat_class">254</field>
</item>
<item>
<field name="media_cat_id">4</field>
<field name="media_cat_nick">_icon_16</field>
<field name="media_cat_title">Icons 16px</field>
<field name="media_cat_diz"><![CDATA[Available where icons are used in admin.]]></field>
<field name="media_cat_class">254</field>
</item>
<item>
<field name="media_cat_id">5</field>
<field name="media_cat_nick">_icon_32</field>
<field name="media_cat_title">Icons 32px</field>
<field name="media_cat_diz"><![CDATA[Available where icons are used in admin.]]></field>
<field name="media_cat_class">254</field>
</item>
<item>
<field name="media_cat_id">6</field>
<field name="media_cat_nick">_icon_48</field>
<field name="media_cat_title">Icons 48px</field>
<field name="media_cat_diz"><![CDATA[Available where icons are used in admin.]]></field>
<field name="media_cat_class">254</field>
</item>
<item>
<field name="media_cat_id">7</field>
<field name="media_cat_nick">_icon_64</field>
<field name="media_cat_title">Icons 64px</field>
<field name="media_cat_diz"><![CDATA[Available where icons are used in admin.]]></field>
<field name="media_cat_class">254</field>
</item>
</dbTable>
</database>
</e107Export>

2
e107_handlers/online_class.php
View File

@@ -214,7 +214,7 @@ class e_online
}
// Always allow localhost - any problems are usually semi-intentional!
if (($row['online_ip'] != '127.0.0.1') && ($row['online_ip'] != e107::LOCALHOST_IP))
if ((varset($row['online_ip']) != '127.0.0.1') && (varset($row['online_ip']) != e107::LOCALHOST_IP))
{
// Check for excessive access
if ($row['online_pagecount'] > $online_bancount)

9
e107_handlers/xml_class.php
View File

@@ -773,10 +773,11 @@ class xmlClass
*/
public function e107Export($xmlprefs, $tables, $debug = FALSE)
{
error_reporting(0);
require_once(e_ADMIN."ver.php");
$text = "<?xml version='1.0' encoding='utf-8' ?".">\n";
$text .= "<e107Export version='".$e107info['e107_version']."' timestamp='".time()."' >\n";
$text .= "<e107Export version=\"".$e107info['e107_version']."\" timestamp=\"".time()."\" >\n";
if(varset($xmlprefs)) // Export Core Preferences.
{
@@ -789,7 +790,7 @@ class xmlClass
{
if(isset($val))
{
$text .= "\t\t<".$type." name='$key'>".$this->e107ExportValue($val)."</".$type.">\n";
$text .= "\t\t<".$type." name=\"".$key."\">".$this->e107ExportValue($val)."</".$type.">\n";
}
}
}
@@ -803,13 +804,13 @@ class xmlClass
{
$eTable= str_replace(MPREFIX,"",$tbl);
e107::getDB()->db_Select($eTable, "*");
$text .= "\t<dbTable name='$eTable'>\n";
$text .= "\t<dbTable name=\"".$eTable."\">\n";
while($row = e107::getDB()-> db_Fetch())
{
$text .= "\t\t<item>\n";
foreach($row as $key=>$val)
{
$text .= "\t\t\t<field name='".$key."'>".$this->e107ExportValue($val,$key)."</field>\n";
$text .= "\t\t\t<field name=\"".$key."\">".$this->e107ExportValue($val,$key)."</field>\n";
}
$text .= "\t\t</item>\n";

44
e107_plugins/login_menu/login_menu_template.php
View File

@@ -134,7 +134,7 @@ if ( ! isset($LOGIN_MENU_LOGGED))
- LM_STAT_LABEL
- LM_STAT_EMPTY
*/
---------------- Legacy Layout --------------------------------
$sc_style['LM_MAINTENANCE']['pre'] = '<div style="text-align:center"><strong>';
$sc_style['LM_MAINTENANCE']['post'] = '</strong></div><br />';
@@ -165,6 +165,48 @@ if ( ! isset($LOGIN_MENU_LOGGED))
{LM_STATS}
{LM_LISTNEW_LINK}
';
*/
// New Template for v2. Bullets via CSS etc. Login-Menu Stats may require work.
$sc_style['LM_MAINTENANCE']['pre'] = '<li class="login-menu-maintenance">';
$sc_style['LM_MAINTENANCE']['post'] = '</li>';
$sc_style['LM_ADMINLINK']['pre'] = '<li class="login-menu-admin">';
$sc_style['LM_ADMINLINK']['post'] = '</li>';
$sc_style['LM_EXTERNAL_LINKS']['pre'] = '<li class="login-menu-external">';
$sc_style['LM_EXTERNAL_LINKS']['post'] = '</li>';
$sc_style['LM_STATS']['pre'] = '<li class="nav-header login-menu-stats smalltext">'.LOGIN_MENU_L25.':</li><li>';
$sc_style['LM_STATS']['post'] = '</li>';
$sc_style['LM_LISTNEW_LINK']['pre'] = '<li class="login-menu-listnew">';
$sc_style['LM_LISTNEW_LINK']['post'] = '</li>';
$sc_style['LM_ADMIN_CONFIGURE']['pre'] = '<li class="login-menu-admin-config">';
$sc_style['LM_ADMIN_CONFIGURE']['post'] = '</li>';
$sc_style['LM_LOGOUT']['pre'] = '<li class="login-menu-logout">';
$sc_style['LM_LOGOUT']['post'] = '</li>';
$sc_style['LM_LOGOUT']['pre'] = '<li class="login-menu-logout">';
$sc_style['LM_LOGOUT']['post'] = '</li>';
$LOGIN_MENU_LOGGED = '
<ul class="login-menu-logged nav nav-list">
{LM_MAINTENANCE}
{LM_ADMINLINK}
<li class="login-menu-usersettings">{LM_USERSETTINGS}</li>
<li class="login-menu-profile">{LM_PROFILE}</li>
{LM_ADMIN_CONFIGURE}
{LM_EXTERNAL_LINKS}
{LM_LOGOUT}
{LM_STATS}
{LM_LISTNEW_LINK}
</ul>
';
}
if ( ! isset($LOGIN_MENU_EXTERNAL_LINK))

4
install_.php
View File

@@ -593,11 +593,11 @@ class e_install
//TODO Add option to continue install even if DB exists.
if($this->previous_steps['mysql']['createdb'] == 1)
if($this->previous_steps['mysql']['createdb'] == 1 || !$DB_ALREADY_EXISTS)
{
$query = 'CREATE DATABASE '.$this->previous_steps['mysql']['db'].' CHARACTER SET `utf8` ';
}
else
elseif($DB_ALREADY_EXISTS)
{
$query = 'ALTER DATABASE '.$this->previous_steps['mysql']['db'].' CHARACTER SET `utf8` ';
}