diff --git a/e107_admin/db.php b/e107_admin/db.php index d81ab22c4..034cc548e 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -1194,7 +1194,7 @@ class system_tools - ".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')." ".LAN_PREFS." + ".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')."  ".LAN_PREFS." ".DBLAN_98." @@ -1202,6 +1202,7 @@ class system_tools "; + //TODO Add support for plugin Prefs. $pref_types = e107::getConfig()->aliases; unset($pref_types['core_old'], $pref_types['core_backup']); @@ -1230,7 +1231,7 @@ class system_tools - ".$frm->checkbox_toggle('check-all-verify', 'xml_tables').DBLAN_97." + ".$frm->checkbox_toggle('check-all-verify', 'xml_tables')."  ".DBLAN_97." ".DBLAN_98." @@ -1630,7 +1631,7 @@ function db_adminmenu() //FIXME - has problems when navigation is on the LEFT in */ function exportXmlFile($prefs,$tables,$package=FALSE,$debug=FALSE) { - $xml = e107::getSingleton('xmlClass'); + $xml = e107::getXml(); $tp = e107::getParser(); $mes = e107::getMessage(); diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index 95ea42131..5b99eee52 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -61,7 +61,24 @@ 0 1 0 - 'social', +)]]> + 'social', +)]]> + 'social', +)]]> + 'news', +)]]> + 'tinymce4', +)]]> + 'news', + 'social' => 'social', 'tinymce4' => 'tinymce4', )]]> 0 @@ -76,19 +93,36 @@ 'tinymce4', + 'rss_menu' => 'rss_menu', )]]> - 'news', + 'page' => 'page', +)]]> + 'news', +)]]> + 'news', 'page' => 'page', )]]> 'featurebox', + 'page' => 'page', 'siteinfo' => 'siteinfo', + 'social' => 'social', )]]> 'news', 'page' => 'page', +)]]> + 'featurebox_sql', + 'rss_menu' => 'rss_sql', +)]]> + 'rss_menu', )]]> default @@ -178,6 +212,11 @@ 'siteinfo' => '1.0', 'social' => '1.0', 'tinymce4' => '1.0', + + 'rss_menu' => '1.3', + 'contact' => '1.0', + 'user' => '1.0', + )]]> 254 254 @@ -204,12 +243,13 @@ 0 3 - 2 + 0 0 0 0 0 + 2 0 0 6 @@ -263,7 +303,7 @@ City, State, Country 253 0 - canvas.css + style.css 75 0 UTC @@ -281,8 +321,6 @@ City, State, Country 'search' => 'core', 'system' => 'core', 'user' => 'core', - 'gallery' => 'plugin/rewrite', - 'tagwords' => 'plugin', )]]> 1 0 @@ -301,8 +339,9 @@ City, State, Country 'page' => array ( 0 => 'core', - 1 => 'core/sef_noid', - 2 => 'core/sef', + 1 => 'core/sef_chapters', + 2 => 'core/sef_noid', + 3 => 'core/sef', ), 'search' => array ( @@ -319,20 +358,6 @@ City, State, Country 0 => 'core', 1 => 'core/rewrite', ), - 'forum' => - array ( - 0 => 'plugin', - 1 => 'plugin/rewrite', - ), - 'gallery' => - array ( - 0 => 'plugin', - 1 => 'plugin/rewrite', - ), - 'tagwords' => - array ( - 0 => 'plugin', - ), )]]> array ( - 0 => 'forum', - 1 => 'gallery', - 2 => 'tagwords', + 0 => 'gallery', ), 'override' => array ( @@ -369,7 +392,19 @@ City, State, Country 1 http://www.e107.org/themeupdate.php - http://www.e107.org/themeupdate.php + http://www.e107.org/themeupdate.php + '#', + 'twitter' => '#', + 'youtube' => '#', + 'google' => '#', + 'linkedin' => '', + 'github' => '', + 'flickr' => '', + 'instagram' => '', + 'pinterest' => '', + 'vimeo' => '', + )]]> !alien !amazed !grr !angry @@ -459,50 +494,128 @@ City, State, Country 60 1 - array ( - 'class' => '254', - 'email' => '', - ), - 'userveri' => - array ( - 'class' => '254', - 'email' => '', - ), 'login' => array ( - 'class' => '254', + 'class' => '255', 'email' => '', + 'include' => '', + 'legacy' => '0', ), 'logout' => array ( - 'class' => '254', + 'class' => '255', 'email' => '', + 'include' => '', + 'legacy' => '0', ), - 'flood' => + 'user_signup_submitted' => array ( - 'class' => '254', + 'class' => '255', 'email' => '', + 'include' => '', + 'legacy' => '0', ), - 'subnews' => + 'user_signup_activated' => array ( - 'class' => '254', + 'class' => '255', 'email' => '', + 'include' => '', + 'legacy' => '0', ), - 'newspost' => + 'user_ban_flood' => array ( - 'class' => '254', + 'class' => '255', 'email' => '', + 'include' => '', + 'legacy' => '0', ), - 'newsupd' => + 'user_news_submit' => array ( - 'class' => '254', + 'class' => '255', 'email' => '', + 'include' => '', + 'legacy' => '0', ), - 'newsdel' => + 'admin_news_created' => array ( - 'class' => '254', + 'class' => '255', 'email' => '', + 'include' => '', + 'legacy' => '0', + ), + 'admin_news_updated' => + array ( + 'class' => '255', + 'email' => '', + 'include' => '', + 'legacy' => '0', + ), + 'admin_news_deleted' => + array ( + 'class' => '255', + 'email' => '', + 'include' => '', + 'legacy' => '0', + ), + 'user_xup_login' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'user_xup_signup' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'user_ban_failed_login' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'user_profile_display' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'admin_password_update' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'admin_user_created' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'admin_user_activated' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'admin_news_notify' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'maildone' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', + ), + 'user_file_upload' => + array ( + 'class' => '255', + 'include' => '', + 'legacy' => '0', ), )]]> @@ -787,6 +900,7 @@ City, State, Country 0 + @@ -1049,11 +1163,12 @@ City, State, Country 1 Welcome to e107 welcome-to-e107 - [p]Welcome to your new website![/p][p]Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin tempus enim vel nisi fringilla, sit amet volutpat enim tincidunt. Vivamus commodo sit amet leo id viverra. Nulla facilisi. Nam et orci sodales tellus aliquet sollicitudin metus.[/p] - + Lorem ipsum dolor sit amet, no meis semper dicunt est, petentium eloquentiam quo ne. At vero facer eam. Ex nam altera oportere, nisl natum prima id pro. Rebum augue dissentiet eum te, vel veniam eirmod option ea, at eos velit repudiare. Ius sumo dicit adolescens id, an cum efficiantur concludaturque.

Summo sensibus cum ne, et duo torquatos conceptam. No aeque elitr constituam qui. Nostro corpora nec no, diam verterem tincidunt has et. Altera accumsan urbanitas pro eu, ei assum voluptaria sed. Eam tibique nominavi consequuntur an.

Ei perfecto delicata usu, quo eius noster blandit te. Eu doctus volumus pri. Meis argumentum an nam, eos odio prima autem an. Te complectitur intellegebat pro, ius id alterum maiestatis. Ea facer accusata sed, ex illum antiopam quo.

Altera putent pri ad, in phaedrum dissentiunt per. Te eum everti dolores. Ut mea vero autem viderer, mel brute harum senserit id. Minim senserit eloquentiam duo in, sit ei justo graece petentium. Sea id homero oporteat invenire.

Pri semper dolorum ad. Cu eius repudiare eos. Eum in eleifend necessitatibus. Ne has mutat intellegebat.

[/html]]]> + Lorem ipsum is a pseudo-Latin text used in web design, typography, layout, and printing in place of English to emphasise design elements over content. It's also called placeholder (or filler) text. It's a convenient tool for mock-ups. It helps to outline the visual elements of a document or presentation, eg typography, font, or layout. Lorem ipsum is mostly a part of a Latin text by the classical author and philosopher Cicero. Its words and letters have been changed by addition or removal, so to deliberately render its content nonsensical; it's not genuine, correct, or comprehensible Latin anymore.

+

While lorem ipsum's still resembles classical Latin, it actually has no meaning whatsoever. As Cicero's text doesn't contain the letters K, W, or Z, alien to latin, these, and others are often inserted randomly to mimic the  typographic appearence of European languages, as are digraphs not to be found in the original.

[/html]]]> welcome,new website - - 1355612400 + Description for Facebook and search engines. + 1454367600 1 1 0 @@ -1062,7 +1177,7 @@ City, State, Country 0 0 0 - + Summary of the news item 0 @@ -1079,8 +1194,6 @@ City, State, Country 0 - - 2 diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index a8cddcc6b..4c70a0ce0 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -3339,10 +3339,12 @@ class e_parser $tp = e107::getParser(); $width = $tp->thumbWidth; $height = ($tp->thumbHeight !== 0) ? $tp->thumbHeight : ""; - + $linkStart = ''; + $linkEnd = ''; if(!isset($userData['user_image']) && USERID) { + $userData['user_id'] = USERID; $userData['user_image'] = USERIMAGE; $userData['user_name'] = USERNAME; } @@ -3379,6 +3381,12 @@ class e_parser { $img = $genericImg; } + + if(($img == $genericImg) && ($userData['user_id'] == USERID)) + { + $linkStart = ""; + $linkEnd = ""; + } $title = (ADMIN) ? $image : $tp->toAttribute($userData['user_name']); $shape = (vartrue($options['shape'])) ? "img-".$options['shape'] : "img-rounded"; @@ -3386,7 +3394,9 @@ class e_parser $heightInsert = empty($height) ? '' : "height='".$height."'"; - $text = ""; + $text = $linkStart; + $text .= ""; + $text .= $linkEnd; // return $img; return $text; diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index 1bfffe83a..434987ddd 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -2412,6 +2412,15 @@ class e107plugin $setup_file = e_PLUGIN.$path.'/'.$path.'_setup.php'; // } + + + if(!is_readable($setup_file) && substr($path,-5) == "_menu") + { + $setup_file = e_PLUGIN.$path.'/'.str_replace("_menu","",$path).'_setup.php'; + } + + e107::getMessage()->addDebug("Checking for SetUp File: ".$setup_file); + if (is_readable($setup_file)) { if(e_PAGE == 'e107_update.php' && E107_DBG_INCLUDES) diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php index 4384bc612..40aa03b4b 100644 --- a/e107_handlers/xml_class.php +++ b/e107_handlers/xml_class.php @@ -1011,7 +1011,7 @@ class xmlClass foreach($tables as $tbl) { $eTable= str_replace(MPREFIX,"",$tbl); - e107::getDB()->db_Select($eTable, "*"); + e107::getDB()->select($eTable, "*"); $text .= "\t\n"; while($row = e107::getDB()-> db_Fetch()) { diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php index 26507419f..c51257860 100644 --- a/e107_plugins/news/templates/news_template.php +++ b/e107_plugins/news/templates/news_template.php @@ -97,6 +97,7 @@ $NEWS_TEMPLATE['default']['item'] = '

{NEWSSUMMARY}

{NEWSVIDEO: item=1} {NEWSBODY} + {EXTENDED}
{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{PDFICON}{SOCIALSHARE}{ADMINOPTIONS: class=btn btn-default}
diff --git a/e107_plugins/rss_menu/admin_prefs.php b/e107_plugins/rss_menu/admin_prefs.php index adc2c4cc7..df55df5bb 100644 --- a/e107_plugins/rss_menu/admin_prefs.php +++ b/e107_plugins/rss_menu/admin_prefs.php @@ -93,10 +93,11 @@ class rss_ui extends e_admin_ui protected $pid = 'rss_id'; protected $perPage = 10; - protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => '', 'data' => '', 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), + protected $fields = array ( + 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => false, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'rss_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'rss_name' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'rss_path' => array ( 'title' => 'Plugin-Dir', 'type' => 'text', 'data' => 'int', 'readonly'=>1, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'rss_name' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'rss_path' => array ( 'title' => 'Plugin-Dir', 'type' => 'text', 'data' => 'str', 'readonly'=>1, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'rss_url' => array ( 'title' => LAN_URL, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'rss_topicid' => array ( 'title' => 'Topic id', 'type' => 'text', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), diff --git a/e107_plugins/rss_menu/rss_setup.php b/e107_plugins/rss_menu/rss_setup.php index 94d00a0cb..5c7189090 100644 --- a/e107_plugins/rss_menu/rss_setup.php +++ b/e107_plugins/rss_menu/rss_setup.php @@ -25,9 +25,20 @@ class rss_menu_setup $mes = e107::getMessage(); $insert = array( - array('rss_id' => 0,'rss_name' => 'News','rss_url' => 'news','rss_topicid' => '','rss_path' => 'news','rss_text' => 'The rss feed of the news','rss_datestamp' => time(),'rss_class' => '0','rss_limit' => '9') + 'rss_id' => 0, + 'rss_name' => 'News', + 'rss_url' => 'news', + 'rss_topicid' => '', + 'rss_path' => 'news', + 'rss_text' => 'The rss feed of the news', + 'rss_datestamp' => time(), + 'rss_class' => '0', + 'rss_limit' => '9' ); - + + + // $mes->addInfo(print_a($insert,true)); + $status = ($sql->insert('rss', $insert)) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR; $mes->add("Adding Default table data to table: rss",$status); //TODO Generic LAN "LAN_DEFAULT_TABLE_DATA" diff --git a/e107_themes/bootstrap3/install/install.xml b/e107_themes/bootstrap3/install/install.xml index 660978304..0df1b049e 100644 --- a/e107_themes/bootstrap3/install/install.xml +++ b/e107_themes/bootstrap3/install/install.xml @@ -113,10 +113,10 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero ipsum; imperdiet at risus non, dictum sagittis odio! Nulla facilisi. Pellentesque adipiscing facilisis pharetra. Morbi imperdiet augue in ligula luctus, et iaculis est porttitor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In ultricies vitae nisi ut porttitor. Curabitur lectus tellus, feugiat a elit vel, gravida iaculis dui. Nulla vulputate turpis dui, ac faucibus enim dignissim non. Ut non tellus suscipit, scelerisque orci sed, scelerisque sapien. Aenean convallis sodales nulla in porttitor. In pretium ante sapien, a tempor eros blandit nec. Nulla non est nibh? Fusce lacinia quam adipiscing magna posuere dapibus. Sed mollis condimentum rhoncus. Morbi sollicitudin tellus a ligula luctus, ac varius arcu ullamcorper. Mauris in aliquet tellus, nec porttitor dui. Quisque interdum euismod mi sed bibendum. Vivamus non odio quis quam lacinia rhoncus in nec nibh. Integer vitae turpis condimentum, laoreet diam nec viverra fusce. - 0 + 1 1371420000 - 0 - 0 + 1 + 1 0 @@ -140,7 +140,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam a nunc eget nulla rutrum fringilla sed vel nisl. Suspendisse at erat a neque pulvinar sodales. Etiam dictum erat erat. Pellentesque dictum convallis massa, eu varius sapien gravida a. Suspendisse auctor, mi a tempor tincidunt, lorem felis gravida libero, nec mattis eros felis eu neque. Etiam vel sagittis ipsum. Morbi at libero accumsan mauris tincidunt adipiscing sed vitae mauris. Aenean suscipit consectetur dignissim. Aliquam ornare diam vitae libero suscipit eget facilisis nisl ultrices? Curabitur luctus turpis ac lorem iaculis id interdum massa blandit! Curabitur placerat massa at neque accumsan porta. Nulla sed tortor id sapien dapibus auctor at eget mi. Sed ultrices lacinia viverra.Mauris in purus mauris. Nulla facilisi. Suspendisse dui enim, dapibus sed accumsan non, gravida eget nulla. Praesent ullamcorper, est ac viverra congue, nisl lacus imperdiet sem, et laoreet velit mauris sed leo. Donec erat mi, luctus quis suscipit pretium, luctus sed orci. Proin eu ultricies sem. Nam mollis turpis non erat fermentum congue.Nullam adipiscing, purus et varius blandit, arcu nisi pretium urna, a euismod eros eros quis turpis! Aliquam quis mi turpis, in varius neque. Aliquam erat volutpat. Vestibulum venenatis ipsum dapibus ante dictum egestas. Pellentesque eget nisi ligula, id accumsan eros. Aenean vitae felis vitae sapien mattis pellentesque non nec dolor. Nulla facilisi.Quisque in tortor turpis, sed venenatis nunc. Nunc tellus elit, suscipit et accumsan ac, mollis et risus. Phasellus consectetur sapien in felis semper non tempor tortor mollis. Ut id leo vel magna rhoncus aliquet. Nunc eget sollicitudin felis. Vestibulum tempor, justo et congue dignissim, augue ipsum malesuada libero, id suscipit felis mi vitae erat. Etiam suscipit lacinia sapien, ac gravida nisi lobortis non. Suspendisse dictum risus in est egestas egestas. Aenean et nisi sed odio sollicitudin placerat vel ut magna. Nulla facilisi. Proin condimentum ultricies vulputate. Morbi dapibus elit a tellus elementum congue! In vitae aliquet leo. Proin tempus tincidunt magna, sit amet malesuada ipsum ornare sed. Sed lorem augue, aliquam sit amet hendrerit sed; venenatis in massa. Sed iaculis amet. - 0 + 1 1366149600 0 0 @@ -304,5 +304,18 @@ Morbi porta leo iaculis, hendrerit lorem interdum, porta dui. Integer tempor con 0 + + + 1 + News + news + 0 + 0 + The rss feed of the news + 1456448477 + 0 + 10 + + \ No newline at end of file diff --git a/e107_themes/bootstrap3/theme.xml b/e107_themes/bootstrap3/theme.xml index d36b1f086..224d77829 100644 --- a/e107_themes/bootstrap3/theme.xml +++ b/e107_themes/bootstrap3/theme.xml @@ -8,6 +8,7 @@ + bootstrap