diff --git a/e107_admin/header.php b/e107_admin/header.php index 3fbc6b90f..5e32e4f0b 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -206,6 +206,11 @@ if (isset($eplug_css) && $eplug_css) $e_js->otherCSS($kcss); } } + if(e107::getPref('admincss') == "admin_dark.css") + { + $e_js->coreCSS('bootstrap/css/darkstrap.css'); + + } //NEW - Iframe mod if (!defsettrue('e_IFRAME') && isset($pref['admincss']) && $pref['admincss']) @@ -214,11 +219,7 @@ if (!defsettrue('e_IFRAME') && isset($pref['admincss']) && $pref['admincss']) //echo "\n"; $e_js->themeCSS($css_file); - if(e107::getPref('admincss') == "admin_dark.css") - { - $e_js->coreCSS('bootstrap/css/darkstrap.css'); - - } + } diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 556f76821..817b8116d 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -600,7 +600,11 @@ class admin_shortcodes { $countDisp = ''; } - + + $inboxUrl = e_PLUGIN.'pm/admin_config.php?'.'searchquery=&iframe=1&filter_options=bool__pm_to__'.USERID; + $outboxUrl = e_PLUGIN.'pm/admin_config.php?'.'searchquery=&iframe=1&filter_options=bool__pm_from__'.USERID; + $composeUrl = e_PLUGIN.'pm/admin_config.php?'.'mode=main&iframe=1&action=create'; + $text = ' diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 79b4c6e04..59b1942dc 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -2408,7 +2408,7 @@ class e_parser * Return an Array of all specific tags found in an HTML document and their attributes. * @param $html - raw html code * @param $taglist - comma separated list of tags to search or '*' for all. - * @param $header - if the $html includes the or tags - it should be set to true. + * @param $header - if the $html includes the html head or body tags - it should be set to true. */ public function getTags($html, $taglist='*', $header = false) { diff --git a/e107_plugins/pm/admin_config.php b/e107_plugins/pm/admin_config.php index 173ca6eb8..a4ceb5195 100644 --- a/e107_plugins/pm/admin_config.php +++ b/e107_plugins/pm/admin_config.php @@ -66,13 +66,13 @@ class private_msg_ui extends e_admin_ui protected $pluginName = 'pm'; protected $table = 'private_msg'; protected $pid = 'pm_id'; - protected $perPage = 10; - protected $listQry = ''; + protected $perPage = 5; + protected $listQry = 'SELECT p.*, u.user_name FROM #private_msg AS p LEFT JOIN #user AS u ON u.user_id = p.pm_from '; protected $listOrder = "pm_sent DESC"; protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'pm_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'pm_from' => array ( 'title' => 'From', 'type' => 'number', 'noedit'=>true, 'data' => 'int', 'filter'=>true, 'width' => '10%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'pm_from' => array ( 'title' => 'From', 'type' => 'user', 'noedit'=>true, 'data' => 'int', 'filter'=>true, 'width' => '10%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'pm_to' => array ( 'title' => 'To', 'type' => 'user', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'pm_sent' => array ( 'title' => LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => '10%', 'help' => '', 'readParms' => '', 'writeParms' => 'auto=1&readonly=1', 'class' => 'center', 'thclass' => 'center', ), 'pm_subject' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => '15%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), @@ -99,12 +99,28 @@ class private_msg_ui extends e_admin_ui define('e_IFRAME', true); } + // Prevent snooping of other people's messages. ;-) //XXX Not working Yet. FIXME! if(varset($_GET['filter_options'])) { list($tmp,$field,$id) = explode("__",$_GET['filter_options']); - - + + if($field == 'pm_to') // Inbox + { + + // $this->listQry = "'SELECT p.*, u.user_name FROM #private_msg AS p LEFT JOIN #user AS u ON u.user_id = p.pm_from ';"; + + $this->fields['pm_to']['nolist'] = true; + $this->fields['options']['readParms'] = 'editClass='.e_UC_NOBDY; + + } + + if($field == 'pm_from') // Outbox + { + // $this->fields['pm_from']['nolist'] = true; + $this->fields['options']['readParms'] = 'editClass='.e_UC_NOBDY; + } + // echo "FIELD = ".$field; // $this->getDispatcher()->setRequest('filter_options') @@ -115,7 +131,10 @@ class private_msg_ui extends e_admin_ui if($field == 'pm_from' && $id != USERID) { + echo "

HI THERE

"; + $_GET['filter_options'] = 'batch__pm_from__'.USERID; + } } diff --git a/e107_plugins/tinymce/plugins/e107bbcode/dialog.php b/e107_plugins/tinymce/plugins/e107bbcode/dialog.php index 9a468e3b3..7c32c2b16 100644 --- a/e107_plugins/tinymce/plugins/e107bbcode/dialog.php +++ b/e107_plugins/tinymce/plugins/e107bbcode/dialog.php @@ -15,13 +15,13 @@ e107::css('inline'," .selectEmote { display:inline-block; cursor:pointer;margin:3px } body { text-align:center } - .area { border-left: 1px solid rgb(221, 221, 221); border-bottom: 1px solid rgb(221, 221, 221); - background-color: rgb(246, 246, 246); margin-top:-1px; padding:20px; + .area { + margin-top:-1px; padding:20px; } span.badge { cursor: pointer } span.label { cursor: pointer } ul.glyphicons { list-style:none; margin-left:0px; font-size:120%} - ul.glyphicons li { float:left; border-bottom:1px solid silver; cursor:pointer; width:190px; padding:5px; } + ul.glyphicons li { float:left; cursor:pointer; width:190px; padding:5px; } a, li { outline: 0; } "); @@ -169,7 +169,7 @@ class e_bootstrap Button Url -

".$frm->text('buttonUrl','',255)."

+

".$frm->text('buttonUrl','',255,'size=xxlarge')."

@@ -362,10 +362,13 @@ class e_bootstrap $text .= "
"; $text .= "
Color: ".$frm->selectbox('glyph-color',$sel)." Custom: ".$frm->text('glyph-custom','').$frm->button('glyph-save','Go')."
"; - $text .= "
'); + $('.modal-caption').text(caption); + $('.modal').modal('show'); + }); - /* + + + /* $('a[data-toggle="modal"]').on('click', function() { @@ -154,29 +170,6 @@ $(document).ready(function() $(".adminlist tr:first").addClass("first"); $(".adminlist tr:last").addClass("last"); - - - // Modal Box - uses inline hidden content // NEEDS work - see customize link for admin-infopanel. - - $(".e-modal-iframe").click(function (e) { - var id = $(this).attr("href"); - e.preventDefault(); - var page = $(this).attr("href") - var pagetitle = $(this).attr("title") - var $dialog = $("
") - .html("") - .dialog({ - autoOpen: false, - modal: true, - width:800, - height: 700, - minWidth: 800, - minHeight: 700, - maxHeight: 700, - title: pagetitle - }); - $dialog.dialog("open"); - }); // Admin Prefs Navigation