From f546088ee8e463879c9f5bc71cd190677be27797 Mon Sep 17 00:00:00 2001 From: Deltik Date: Sat, 4 May 2013 11:24:14 -0500 Subject: [PATCH 01/24] [security] Unobtrusive way to stop most spambots for user_template --- .../shortcodes/batch/user_shortcodes.php | 31 +++++++++++++++++-- e107_core/templates/user_template.php | 4 +-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php index a43d74dbb..133cfaa24 100644 --- a/e107_core/shortcodes/batch/user_shortcodes.php +++ b/e107_core/shortcodes/batch/user_shortcodes.php @@ -226,7 +226,9 @@ class user_shortcodes extends e_shortcode function sc_user_email_link($parm) { $tp = e107::getParser(); - return ($this->var['user_hideemail'] && !ADMIN) ? "".LAN_USER_35."" : $tp->parseTemplate("{email={$this->var['user_email']}-link}"); + return /* Condition */ ($this->var['user_hideemail'] && !ADMIN) ? + /* Hidden and Not Admin */ "".LAN_USER_35."" : + /* Not Hidden or Admin */ $tp->parseTemplate("{email={$this->var['user_email']}-link}"); } @@ -234,7 +236,30 @@ class user_shortcodes extends e_shortcode function sc_user_email($parm) { $tp = e107::getParser(); - return ($this->var['user_hideemail'] && !ADMIN) ? "".LAN_USER_35."" : $tp->toHTML($this->var['user_email'],"no_replace"); + return /* Condition */ ($this->var['user_hideemail'] && !ADMIN) ? + /* Hidden and Not Admin */ "".LAN_USER_35."" : + /* Not Hidden or Admin */ "" . strrev($tp->toHTML($this->var['user_email'],"no_replace")) . ""; + ######################################################## + # Security Note - 04 May 2013 # + ######################################################## + # # + # The CSS code direction rtl is an effective way to # + # prevent spam bots from scraping emails that are # + # not hidden. # + # # + # You can find empirical support for this method at # + # . # + # # + # {e_CORE}templates/user_template.php was modified to # + # support this code. In $USER_FULL_TEMPLATE, the # + # LAN_USER_60 value {USER_EMAIL_LINK} was changed to # + # {USER_EMAIL}. I couldn't figure out how the two # + # shortcodes were different, so I took precautions in # + # hopes that the CSS direction won't break actual HTML # + # tags. # + # # + # -- Deltik # + ######################################################## } @@ -745,4 +770,4 @@ class user_shortcodes extends e_shortcode } -?> \ No newline at end of file +?> diff --git a/e107_core/templates/user_template.php b/e107_core/templates/user_template.php index 1b8455441..1e9513ee0 100644 --- a/e107_core/templates/user_template.php +++ b/e107_core/templates/user_template.php @@ -142,7 +142,7 @@ $USER_FULL_TEMPLATE = "{SETIMAGE: w=250}
{USER_EMAIL_ICON} ".LAN_USER_60."
-
{USER_EMAIL_LINK}
+
{USER_EMAIL}
@@ -213,4 +213,4 @@ $USER_EMBED_USERPROFILE_TEMPLATE = " {USER_EMBED_USERPROFILE_CAPTION} {USER_EMBED_USERPROFILE_TEXT}"; -?> \ No newline at end of file +?> From 0cdbd2ee2563708424b59cc97d0848f68109a7d2 Mon Sep 17 00:00:00 2001 From: Nicholas Liu Date: Tue, 7 May 2013 08:43:47 -0500 Subject: [PATCH 02/24] Typo correction on README.md --- README.md | 62 +++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index bcedebe3a..4358011d0 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@ -## e107 [Content Management System][1] (CMS) - v2 - -### What is e107? -e107 is a free (open-source) content management system which allows you to easily manage and publish your content online. Developers can save time in building websites and powerful online applications. Users can avoid programming completely! Blogs, Websites, Intranets - e107 does it all. - -### Requirements - -* PHP v5.3 or higher -* MySQL 4.x or higher - -### Installation - -* Point your browser to the *http://localhost/YOUR FOLDER/install.php* (depending on your webserver setup) -* Follow the installation wizard - -### Reporting Bugs - -Be sure you are using the most recent version prior to reporting an issue. -Your may report any bugs or feature requests on Github (https://github.com/e107inc/e107/issues) - -### Pull-Requests - -* Please submit 1 pull-request for each Github #issue you may work on. -* Make sure that only the lines you have changed actually show up in a file-comparison (diff) ie. some text-editors alter every line so this should be avoided. - -### License - -* e107 is released under the terms and conditions of the GNU General Public License (http://www.gnu.org/licenses/gpl.txt) - - [1]: http://e107.org - [2]: http://www.e107.org +## e107 [Content Management System][1] (CMS) - v2 + +### What is e107? +e107 is a free (open-source) content management system which allows you to easily manage and publish your content online. Developers can save time in building websites and powerful online applications. Users can avoid programming completely! Blogs, Websites, Intranets - e107 does it all. + +### Requirements + +* PHP v5.3 or higher +* MySQL 4.x or higher + +### Installation + +* Point your browser to the *http://localhost/YOUR FOLDER/install.php* (depending on your webserver setup) +* Follow the installation wizard + +### Reporting Bugs + +Be sure you are using the most recent version prior to reporting an issue. +You may report any bugs or feature requests on GitHub (https://github.com/e107inc/e107/issues) + +### Pull-Requests + +* Please submit 1 pull-request for each Github #issue you may work on. +* Make sure that only the lines you have changed actually show up in a file-comparison (diff) ie. some text-editors alter every line so this should be avoided. + +### License + +* e107 is released under the terms and conditions of the GNU General Public License (http://www.gnu.org/licenses/gpl.txt) + + [1]: http://e107.org + [2]: http://www.e107.org From f9c157817aaef73e4b760cbf7293cd92d9b02d59 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 03:27:32 -0700 Subject: [PATCH 03/24] Updated to use "SetEnv E_DEV_MENU true" in .htaccess - Experimental code. --- e107_admin/menus.php | 14 ++++++++++---- e107_core/shortcodes/batch/admin_shortcodes.php | 3 +-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 837594301..cd5e66ed1 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -310,7 +310,7 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) -if($_SERVER['E_ENV_MENUS'] == 'developer') +if($_SERVER['E_DEV_MENU'] == 'true') { if(isset($_GET['configure']) || isset($_GET['iframe'])) { @@ -325,10 +325,16 @@ if($_SERVER['E_ENV_MENUS'] == 'developer') exit; } -if($_SERVER['E_ENV_MENUS'] == 'developer') -{ +// if($_SERVER['E_DEV_MENU'] == 'true') +//{ function e_help() { + if($_SERVER['E_DEV_MENU'] != 'true') + { + return false; + } + + $p = e107::getPref('e_menu_list'); // new storage for xxxxx_menu.php list. $sql = e107::getDb(); @@ -370,7 +376,7 @@ if($_SERVER['E_ENV_MENUS'] == 'developer') return array('caption'=>'Menu Items','text'=>$text); } -} +//} // XXX Menu Manager Re-Write with drag and drop and multi-dimensional array as storage. ($pref) diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index ee8554026..5f522dd60 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -61,9 +61,8 @@ class admin_shortcodes $ns = e107::getRender(); $pref = e107::getPref(); - if(function_exists('e_help')) // new in v2.x for non-admin-ui admin pages. + if(function_exists('e_help') && ($tmp = e_help())) // new in v2.x for non-admin-ui admin pages. { - $tmp = e_help(); return $ns->tablerender($tmp['caption'],$tmp['text'],'e_help',true); } From 72e7040284531caf00d2355b4c4a157cac607921 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 04:22:42 -0700 Subject: [PATCH 04/24] A little closer to drag and drop functioning as intended. --- e107_admin/menus.php | 65 ++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 20 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index cd5e66ed1..f2771a930 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -396,6 +396,39 @@ class e_layout if(vartrue($_GET['configure'])) //ie Inside the IFRAME. { + + e107::js('url',"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js"); + e107::js('url', "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css"); + + + e107::js('inline',' + $(function() + { + + $( "#sortable" ).sortable({ + revert: true + }); + + }); + '); + + + + + e107::js('inline', " + + win = document.getElementById('menu_iframe').contentWindow; + win.jQuery(dragelement,parent.document).draggable({ + connectToSortable : $('#sortable') + }); + + ",'jquery'); + + + + + + $this->curLayout = varsettrue($_GET['configure'], $pref['sitetheme_deflayout']); $this->renderLayout($this->curLayout); } @@ -404,17 +437,19 @@ class e_layout // XXX HELP _ i don't work with iFrames. - e107::js('inline',' - $(function() { + e107::js('inline',' + $(function() + { $( "#sortable" ).sortable({ revert: true }); + $( ".draggable" ).draggable({ - connectToSortable: "#sortable", + connectToSortable: $("#sortable"), helper: "clone", revert: "invalid", cursor: "move", - // iframeFix: true, + iframeFix: true, start: function(ev,ui) { @@ -429,23 +464,12 @@ class e_layout } }); - $( "ul, li" ).disableSelection(); + $( "ul, li" ).disableSelection(); - // Not Working. - $("#menu_iframe").load(function(){ - $("#menu_iframe").contents().find("#sortable").droppable({ - accept: ".drag", - drop: function( event, ui ) { - var html = "
"+ ui.draggable.html() + "
"; - //alert(html); - $(this).append(html); - } - }); + - }); - - }); - '); + }); + ','jquery'); $this->scanForNew(); @@ -472,6 +496,7 @@ class e_layout $this->menuData = ($data); + // print_a($this->menuData); } @@ -540,7 +565,7 @@ class e_layout private function renderMenu($row) { // return print_a($row,true); - $TEMPLATE = '
  • '.$row['name'].'
    • '; // TODO perhaps a simple counter for the id + $TEMPLATE = '
  • '.$row['name'].'
    • '; // TODO perhaps a simple counter for the id return $TEMPLATE; From cf8269dd92e07d284d618968ec523f9360aed5f0 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 17:51:06 -0700 Subject: [PATCH 05/24] More menu manager work --- e107_admin/menus.php | 183 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 153 insertions(+), 30 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index f2771a930..9e37839e3 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -382,6 +382,7 @@ if($_SERVER['E_DEV_MENU'] == 'true') // XXX Menu Manager Re-Write with drag and drop and multi-dimensional array as storage. ($pref) // TODO Get Drag & Drop Working with the iFrame // TODO Sorting, visibility, parameters and delete. +// TODO Get THIS http://jsbin.com/odiqi3 working with iFrames!! XXX XXX class e_layout { @@ -394,6 +395,34 @@ class e_layout $this->convertMenuTable(); + + + if(e_AJAX_REQUEST) + { + if(varset($_POST['data'])) + { + $_SESSION['menuData'] = $_POST['data']; + + $cnf = e107::getConfig('core'); + $existing = $cnf->get('menu_layouts'); + // print_r($existing); + // $data = array_merge($existing,$_POST['data']); + $data = $_POST['data']; + print_r($data); + + e107::getConfig('core')->set('menu_layouts', $data)->save(); + + } + + exit; + + } + + + + + + if(vartrue($_GET['configure'])) //ie Inside the IFRAME. { @@ -405,15 +434,36 @@ class e_layout $(function() { - $( "#sortable" ).sortable({ - revert: true - }); + $( ".sortable" ).sortable({ + + revert: true, + cursor: "move", + distance: 20, + containment: "parent", + update: function(ev,ui) + { + var areaid = $(this).attr("id"); + var formid = "#form-" + areaid; + var form = $(formid); + var data = form.serialize(); + + $.ajax({ + type: "POST", + url: "menus.php", + data: data + + }).done(function( msg ) + { + alert(" Updated in DB "+ msg ); + }); + } + }); }); '); - + /* e107::js('inline', " @@ -425,7 +475,7 @@ class e_layout ",'jquery'); - + */ @@ -436,41 +486,55 @@ class e_layout { // XXX HELP _ i don't work with iFrames. - + // $("#sortable") + //$("iframe").contents().find(".sortable") + + /* e107::js('inline',' $(function() { - $( "#sortable" ).sortable({ + $( ".sortable" ).sortable({ revert: true }); $( ".draggable" ).draggable({ - connectToSortable: $("#sortable"), + connectToSortable: $(".sortable"), helper: "clone", revert: "invalid", cursor: "move", - iframeFix: true, + iframeFix: true - start: function(ev,ui) - { - }, - drag: function(ev,ui) - { - - }, - stop: function(ev, ui) - { - - } + }); $( "ul, li" ).disableSelection(); - + + + $("#menu_frame").load(function(){ + $("#menu_frame").contents().find("#sortable").droppable({ + accept: ".drag", + drop: function( event, ui ) { + var html = "
    "+ ui.draggable.html() + "
    "; + //alert(html); + $(this).append(html); + } + }); + + }); + + + }); + + + + ','jquery'); + */ + $this->scanForNew(); $this->renderInterface(); @@ -483,6 +547,14 @@ class e_layout */ function convertMenuTable() { + if(isset($_SESSION['menuData'])) + { + $this->menuData = $_SESSION['menuData']; + return; + } + + + $sql = e107::getDb(); $sql->select('menus','*','menu_location !=0 ORDER BY menu_location,menu_order'); $data = array(); @@ -533,22 +605,23 @@ class e_layout */ private function renderMenuArea($matches) { - + $frm = e107::getForm(); $area = $matches[1]; // return print_a($this->menuData,true); $text = "
    "; - $text .= "
    Area ".$area."
    "; - + $text .= "
    Area ".$area."
    \n"; + $text .= $frm->open('form-area-'.$area,'post',e_SELF); + $count = 0; if(vartrue($this->menuData[THEME_LAYOUT]) && is_array($this->menuData[THEME_LAYOUT][$area])) { - $text .= "
      "; + $text .= "
        "; foreach($this->menuData[THEME_LAYOUT][$area] as $val) { - $text .= $this->renderMenu($val); - + $text .= $this->renderMenu($val,$area,$count); + $count++; } $text .= "
      "; @@ -556,21 +629,52 @@ class e_layout $text .= "
    "; + // $text .= $frm->button('submit','submit','submit','submit'); + + $text .= $frm->close(); + return $text; } - private function renderMenu($row) + private function renderMenu($row, $area, $count) { // return print_a($row,true); - $TEMPLATE = '
  • '.$row['name'].'
    • '; // TODO perhaps a simple counter for the id + $TEMPLATE = '
  • '.$this->renderMenuOptions($row, $area,$count).'
    • + '; // TODO perhaps a simple counter for the id return $TEMPLATE; } + + + + + private function renderMenuOptions($row,$area,$c) + { + $frm = e107::getForm(); + + $text = $row['name']; + + //TODO Delete, Config etc. + + //$data[$layout][$location][] = array('name'=>$row['menu_name'],'class'=>$row['menu_class'],'path'=>$row['menu_path'],'pages'=>$row['menu_pages'],'parms'=>$row['menu_parms']); + // $area = 'area_'.$area; + + $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][name]',$row['name'] ); + $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][class]',$row['class'] ); + $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][path]',$row['path'] ); + $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][pages]',$row['pages'] ); + $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][parms]',$row['parms'] ); + + return $text; + + } + + /** * Scan Plugin folders for new _menu files. @@ -610,11 +714,30 @@ class e_layout { $ns = e107::getRender(); $tp = e107::getParser(); + $frm = e107::getForm(); $TEMPL = $this->getHeadFoot(); $layouts = array_keys($TEMPL['HEADER']); + e107::js('inline',' + $(function() + { + $(".draggable").draggable({ + connectToSortable: $(".sortable"), + helper: "clone", + revert: "invalid", + cursor: "move", + iframeFix: true, + refreshPositions: true + + }); + })' + ); + + + + $text = '
      '; $active = ' class="active" '; @@ -635,7 +758,7 @@ class e_layout { $text .= '
      - +
      '; $active = ''; From 3685451f6e481d6205d1db663894779ff4aa8d0a Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 20:16:39 -0700 Subject: [PATCH 06/24] More menu manager work --- e107_admin/menus.php | 143 ++++++++++++++++++++++++----------- e107_handlers/menu_class.php | 72 ++++++++++++++++++ 2 files changed, 169 insertions(+), 46 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 9e37839e3..57540c928 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -349,9 +349,24 @@ if($_SERVER['E_DEV_MENU'] == 'true')
        "; + $c = 500; // start high to prevent overwriting of keys after we drag and drop. + foreach($p as $menu => $folder) { - $text .= "
      • ".str_replace("_menu","",$menu)."
        • "; + $text .= "
      • "; + // $text .= str_replace("_menu","",$menu); + + $defaults = array( + 'name' => $menu, + 'path' => $folder, + 'class' => 0 + ); + + $text .= e_layout::renderMenuOptions($defaults,'layout','area',$c); + + $text .= "
        • "; + $c++; + } $text .= "
      @@ -364,7 +379,12 @@ if($_SERVER['E_DEV_MENU'] == 'true') $text .= "
        "; while($row = $sql->fetch()) { - $text .= "
      • ".$row['menu_name']."
        • "; + $text .= "
      • "; + // $text .= $row['menu_name']; + + $text .= e_layout::renderMenuOptions($row); + + $text .= "
        • "; } $text .= "
      "; @@ -374,7 +394,7 @@ if($_SERVER['E_DEV_MENU'] == 'true')
      "; - return array('caption'=>'Menu Items','text'=>$text); + return array('caption'=>'Menu Items','text'=>$text); } //} @@ -434,7 +454,7 @@ class e_layout $(function() { - $( ".sortable" ).sortable({ + $(".sortable").sortable({ revert: true, cursor: "move", @@ -454,10 +474,42 @@ class e_layout }).done(function( msg ) { - alert(" Updated in DB "+ msg ); + alert("POSTED: "+ msg ); }); } }); + + + + + // $( ".draggable", window.top.document).click(function() + // { + // alert("hi there"); + // }); + + // http://jsfiddle.net/DT764/2/ + + + $( ".draggable", window.top.document).draggable({ + connectToSortable: ".sortable", + helper: "clone", + appendTo: ".sortable", // "#area-1", + revert: true, + + cursor: "move", + iframeFix: true, + containment: false, + stop: function(e, ui) { //TODO Rename layout and area in the hidden fields to that of the where the menu was dropped. + // Figure out positioning magic to determine if e.ui.position is in the iframe + var what = $(this).parent().attr("id"); + + alert(what); + } + + }); + + // $( "ul, li", window.top.document ).disableSelection(); + }); '); @@ -489,7 +541,7 @@ class e_layout // $("#sortable") //$("iframe").contents().find(".sortable") - /* + /* e107::js('inline',' $(function() { @@ -497,43 +549,35 @@ class e_layout revert: true }); - $( ".draggable" ).draggable({ - connectToSortable: $(".sortable"), - helper: "clone", - revert: "invalid", - cursor: "move", - iframeFix: true - - - }); - - $( "ul, li" ).disableSelection(); - - - - $("#menu_frame").load(function(){ - $("#menu_frame").contents().find("#sortable").droppable({ - accept: ".drag", - drop: function( event, ui ) { - var html = "
      "+ ui.draggable.html() + "
      "; - //alert(html); - $(this).append(html); - } - }); - - }); - + + $("iframe").load(function(){ + var frameid = $("#iframe-default").contents().find(".sortable").attr("id") + + $( ".draggable" ).draggable({ + connectToSortable: "#" + frameid, + helper: "clone", + revert: "invalid", + cursor: "move", + iframeFix: true + + + }); + + }); + + // $( "ul, li" ).disableSelection(); + }); - - ','jquery'); + */ + - */ + $this->scanForNew(); @@ -620,7 +664,7 @@ class e_layout foreach($this->menuData[THEME_LAYOUT][$area] as $val) { - $text .= $this->renderMenu($val,$area,$count); + $text .= $this->renderMenu($val, THEME_LAYOUT, $area,$count); $count++; } @@ -639,10 +683,10 @@ class e_layout - private function renderMenu($row, $area, $count) + private function renderMenu($row, $layout, $area, $count) { // return print_a($row,true); - $TEMPLATE = '
    • '.$this->renderMenuOptions($row, $area,$count).'
      • + $TEMPLATE = '
    • '.$this->renderMenuOptions($row, $layout, $area,$count).'
      • '; // TODO perhaps a simple counter for the id return $TEMPLATE; @@ -652,23 +696,30 @@ class e_layout - - private function renderMenuOptions($row,$area,$c) + /** + * @param $row (array of data from $pref['menu_layouts'] + * @param $layout . eg. 'default' or 'home' + * @param number $area as in {MENU=x} + * @param incrementor number. + */ + public function renderMenuOptions($row, $layout, $area, $c) { $frm = e107::getForm(); - $text = $row['name']; + $text = str_replace("_menu","",$row['name']); + + //TODO Delete, Config etc. //$data[$layout][$location][] = array('name'=>$row['menu_name'],'class'=>$row['menu_class'],'path'=>$row['menu_path'],'pages'=>$row['menu_pages'],'parms'=>$row['menu_parms']); // $area = 'area_'.$area; - $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][name]',$row['name'] ); - $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][class]',$row['class'] ); - $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][path]',$row['path'] ); - $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][pages]',$row['pages'] ); - $text .= $frm->hidden('data['.THEME_LAYOUT.']['.$area.']['.$c.'][parms]',$row['parms'] ); + $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][name]',$row['name'] ); + $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][class]',$row['class'] ); + $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][path]',$row['path'] ); + $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][pages]',$row['pages'] ); + $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][parms]',$row['parms'] ); return $text; diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php index 3706c1650..b766428b2 100644 --- a/e107_handlers/menu_class.php +++ b/e107_handlers/menu_class.php @@ -71,6 +71,11 @@ class e_menu $menu_data = e107::getCache()->retrieve_sys("menus_".USERCLASS_LIST."_".md5(e_LANGUAGE.$menu_layout_field)); // $menu_data = e107::getCache()->retrieve_sys("menus_".USERCLASS_LIST); $menu_data = e107::getArrayStorage()->ReadArray($menu_data); + + + + + $eMenuArea = array(); // $eMenuList = array(); // $eMenuActive = array(); // DEPRECATED @@ -93,6 +98,11 @@ class e_menu { $eMenuArea = $menu_data['menu_area']; } + + // print_a($eMenuArea); + // $eMenuArea = $this->getData(THEME_LAYOUT); + + $total = array(); foreach($eMenuArea as $area => $val) { @@ -110,9 +120,71 @@ class e_menu } } } + + + + + e107::getRender()->eMenuTotal = $total; } + + + + + + + /** + * V2 Menu Re-Write - retrieve Menu data from $pref['menu_layouts'] + */ + protected function getData($layout) + { + $pref = e107::getPref('menu_layouts'); + + foreach($pref[$layout] as $area=>$v); + { + $c = 0; + + foreach($v as $val) + { + $class = intval($val['class']); + + if(!check_class($class)) + { + continue; + } + + $ret[$area][] = array( + + 'menu_name' => $val['name'], + 'menu_location' => $area, + 'menu_class' => $class, + 'menu_order' => $c, + 'menu_pages' => $val['pages'], + 'menu_path' => $val['path'], + 'menu_layout' => '', + 'menu_parms' => $val['parms'] + + ); + + $c++; + } + + + } + + return $ret; + + } + + + + + + + + + /** * Check visibility of a menu against URL * From bd69875675068aa88b8fa0c2db61d8d563071375 Mon Sep 17 00:00:00 2001 From: Deltik Date: Thu, 9 May 2013 22:48:27 -0500 Subject: [PATCH 07/24] Bad SQL fix in model_class.php ; eMessage class constants created --- README.md | 2 +- e107_handlers/message_handler.php | 19 +++++++++++++++++-- e107_handlers/model_class.php | 6 +++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bcedebe3a..76844f142 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ e107 is a free (open-source) content management system which allows you to easil ### Reporting Bugs Be sure you are using the most recent version prior to reporting an issue. -Your may report any bugs or feature requests on Github (https://github.com/e107inc/e107/issues) +You may report any bugs or feature requests on GitHub (https://github.com/e107inc/e107/issues) ### Pull-Requests diff --git a/e107_handlers/message_handler.php b/e107_handlers/message_handler.php index c276eca10..c01acce55 100644 --- a/e107_handlers/message_handler.php +++ b/e107_handlers/message_handler.php @@ -18,6 +18,10 @@ if (!defined('e107_INIT')) { exit; } /* * Type defines * XXX - convert to eMessage class constants + * @note 07 May 2013: These have been converted to eMessage class constants! + * Example: eMessage::E_MESSAGE_SUCCESS is 'success' + * -- Deltik + * P.S. Now somebody needs to get rid of these universal constants... */ define('E_MESSAGE_INFO', 'info'); define('E_MESSAGE_SUCCESS', 'success'); @@ -39,6 +43,17 @@ define('E_MESSAGE_NODISPLAY', 'nodisplay'); // Appears to be needed by update_ro */ class eMessage { + /** + * Type defines + */ + const E_INFO = 'info'; + const E_SUCCESS = 'success'; + const E_WARNING = 'warning'; + const E_ERROR = 'error'; + const E_DEBUG = 'debug'; + const E_NODISPLAY = 'nodisplay'; + + /** * System Message Array * in format [type][message_stack] = array(message[, ...]) @@ -172,7 +187,7 @@ class eMessage * @param boolean $session * @return eMessage */ - public function add($message, $type = E_MESSAGE_INFO, $session = false) + public function add($message, $type = eMessage::E_INFO, $session = false) { if(empty($message)) return $this; @@ -997,4 +1012,4 @@ function show_emessage($mode, $message, $line = 0, $file = "") { } } -?> \ No newline at end of file +?> diff --git a/e107_handlers/model_class.php b/e107_handlers/model_class.php index 036822066..e59ac2dd2 100644 --- a/e107_handlers/model_class.php +++ b/e107_handlers/model_class.php @@ -3485,7 +3485,7 @@ class e_admin_tree_model extends e_front_tree_model $idstr = implode(', ', $ids); $sql = e107::getDb(); - $res = $sql->db_Delete($this->getModelTable(), $this->getFieldIdName().' IN ('.$idstr.')'); + $res = $sql->db_Delete($this->getModelTable(), $this->getFieldIdName().' IN (\''.$idstr.'\')'); $this->_db_errno = $sql->getLastErrorNumber(); $this->_db_errmsg = $sql->getLastErrorText(); $modelCacheCheck = $this->getParam('clearModelCache'); @@ -3493,7 +3493,7 @@ class e_admin_tree_model extends e_front_tree_model { if($sql->getLastErrorNumber()) { - $this->addMessageError('SQL Delete Error', $session_messages); //TODO - Lan + $this->addMessageError('SQL Delete Error: ' . $sql->getLastQuery(), $session_messages); //TODO - Lan $this->addMessageDebug('SQL Error #'.$sql->getLastErrorNumber().': '.$sql->getLastErrorText()); } } @@ -3561,4 +3561,4 @@ class e_admin_tree_model extends e_front_tree_model } return $ret; } -} \ No newline at end of file +} From 4e3f9bcb00d5728eaa8c39cd5c650c0946e1fa0b Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 22:24:23 -0700 Subject: [PATCH 08/24] Menu Manager drag and drop work and menu Conversion to $pref routines complete. --- e107_admin/menus.php | 173 +++++++++++++++++++++-------------- e107_handlers/menu_class.php | 120 ++++++++++++++++-------- 2 files changed, 187 insertions(+), 106 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 57540c928..0765a3795 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -332,8 +332,9 @@ if($_SERVER['E_DEV_MENU'] == 'true') if($_SERVER['E_DEV_MENU'] != 'true') { return false; - } + } + $p = e107::getPref('e_menu_list'); // new storage for xxxxx_menu.php list. $sql = e107::getDb(); @@ -359,7 +360,7 @@ if($_SERVER['E_DEV_MENU'] == 'true') $defaults = array( 'name' => $menu, 'path' => $folder, - 'class' => 0 + 'class' => '0' ); $text .= e_layout::renderMenuOptions($defaults,'layout','area',$c); @@ -407,41 +408,34 @@ if($_SERVER['E_DEV_MENU'] == 'true') class e_layout { private $menuData = array(); + private $iframe = false; function __construct() { $pref = e107::getPref(); $ns = e107::getRender(); - $this->convertMenuTable(); + // $this->convertMenuTable(); + + + $this->menuData = e107::getPref('menu_layouts'); if(e_AJAX_REQUEST) { + + + if(varset($_POST['data'])) { - $_SESSION['menuData'] = $_POST['data']; - - $cnf = e107::getConfig('core'); - $existing = $cnf->get('menu_layouts'); - // print_r($existing); - // $data = array_merge($existing,$_POST['data']); - $data = $_POST['data']; - print_r($data); - - e107::getConfig('core')->set('menu_layouts', $data)->save(); - + $this->processPost(); } exit; } - - - - - + if(vartrue($_GET['configure'])) //ie Inside the IFRAME. { @@ -453,6 +447,28 @@ class e_layout e107::js('inline',' $(function() { + // post the form back to this script. + var saveData = function(areaid) + { + + var formid = "#form-" + areaid; + var form = $(formid); + var data = form.serialize(); + + $.ajax({ + type: "POST", + url: "menus.php", + data: data + }).done(function( msg ) + { + // alert("POSTED: "+ msg ); + }); + + } + + + + $(".sortable").sortable({ @@ -463,19 +479,7 @@ class e_layout update: function(ev,ui) { var areaid = $(this).attr("id"); - var formid = "#form-" + areaid; - var form = $(formid); - var data = form.serialize(); - - $.ajax({ - type: "POST", - url: "menus.php", - data: data - - }).done(function( msg ) - { - alert("POSTED: "+ msg ); - }); + saveData(areaid); } }); @@ -493,7 +497,7 @@ class e_layout $( ".draggable", window.top.document).draggable({ connectToSortable: ".sortable", helper: "clone", - appendTo: ".sortable", // "#area-1", + appendTo: ".sortable", // "#area-1", //FIXME Needs to be a specific area. revert: true, cursor: "move", @@ -501,14 +505,27 @@ class e_layout containment: false, stop: function(e, ui) { //TODO Rename layout and area in the hidden fields to that of the where the menu was dropped. // Figure out positioning magic to determine if e.ui.position is in the iframe - var what = $(this).parent().attr("id"); + // var what = $(this).parent().attr("id"); - alert(what); + // alert(what); } }); // $( "ul, li", window.top.document ).disableSelection(); + + + $( ".deleteMenu").on("click", function() + { + var deleteId = $(this).attr("data-delete"); + var area = $(this).attr("data-area"); + $("#"+deleteId).hide("slow"); + $("#"+deleteId).remove(); + // alert(deleteId + " " + area); + saveData(area); + }); + + }); @@ -586,39 +603,38 @@ class e_layout } - /** - * Convert from e107_menu table to $pref format. - */ - function convertMenuTable() - { - if(isset($_SESSION['menuData'])) - { - $this->menuData = $_SESSION['menuData']; - return; - } - - - - $sql = e107::getDb(); - $sql->select('menus','*','menu_location !=0 ORDER BY menu_location,menu_order'); - $data = array(); - while($row = $sql->fetch()) + protected function processPost() + { + $cnf = e107::getConfig('core'); + $existing = $cnf->get('menu_layouts'); + + // print_r($existing); + // $data = array_merge($existing,$_POST['data']); + + $data = $_POST['data']; + + $layout = $_POST['layout']; + $area = $_POST['area']; + + $save = array(); + foreach($_POST['data']['layout']['area'] as $v) // reset key values. { - $layout = vartrue($row['menu_layout'],'default'); - $location = $row['menu_location']; - $data[$layout][$location][] = array('name'=>$row['menu_name'],'class'=>$row['menu_class'],'path'=>$row['menu_path'],'pages'=>$row['menu_pages'],'parms'=>$row['menu_parms']); + $save[$layout][$area][] = $v; } - $this->menuData = ($data); + // $save[$layout][$area] = $_POST['data']['layout']['area']; - // print_a($this->menuData); + print_r($save); + // return; + + + e107::getConfig('core')->set('menu_layouts', $save)->save(); //TODO Save directly into multi-dimensional array. ie. $layout / $area / array. } - /** * Substitute all {MENU=X} and Render output. @@ -670,11 +686,20 @@ class e_layout $text .= "
    "; } + else // Empty Menu. + { + $text .= "
      +
    •  
      • +
    "; + + } $text .= ""; // $text .= $frm->button('submit','submit','submit','submit'); - + + $text .= $frm->hidden('layout',THEME_LAYOUT); + $text .= $frm->hidden('area',$area); $text .= $frm->close(); return $text; @@ -686,7 +711,7 @@ class e_layout private function renderMenu($row, $layout, $area, $count) { // return print_a($row,true); - $TEMPLATE = '
  • '.$this->renderMenuOptions($row, $layout, $area,$count).'
    • + $TEMPLATE = '
  • '.$this->renderMenuOptions($row, $layout, $area,$count).'
    • '; // TODO perhaps a simple counter for the id return $TEMPLATE; @@ -707,20 +732,28 @@ class e_layout $frm = e107::getForm(); $text = str_replace("_menu","",$row['name']); - - - + // $layout = 'layout'; + // $area = 'area'; //TODO Delete, Config etc. //$data[$layout][$location][] = array('name'=>$row['menu_name'],'class'=>$row['menu_class'],'path'=>$row['menu_path'],'pages'=>$row['menu_pages'],'parms'=>$row['menu_parms']); // $area = 'area_'.$area; - $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][name]',$row['name'] ); - $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][class]',$row['class'] ); - $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][path]',$row['path'] ); - $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][pages]',$row['pages'] ); - $text .= $frm->hidden('data['.$layout.']['.$area.']['.$c.'][parms]',$row['parms'] ); - + // 'layout' and 'area' will later be substituted. + $text .= $frm->hidden('data[layout][area]['.$c.'][name]',$row['name'] ); + $text .= $frm->hidden('data[layout][area]['.$c.'][class]',$row['class'] ); + $text .= $frm->hidden('data[layout][area]['.$c.'][path]',$row['path'] ); + $text .= $frm->hidden('data[layout][area]['.$c.'][pages]',$row['pages'] ); + $text .= $frm->hidden('data[layout][area]['.$c.'][parms]',$row['parms'] ); + + + if(vartrue($_GET['configure'])) // Iframe Mode. + { + $text .= "×"; // $('.hello').remove(); + } + + + return $text; } @@ -742,7 +775,7 @@ class e_layout { $path = trim(str_replace(e_PLUGIN,"",$file['path']),"/"); - if(e107::isInstalled($path)) + // if(e107::isInstalled($path) ) { $fname = str_replace(".php","",$file['fname']); $data[$fname] = $path; diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php index b766428b2..5910bbcf9 100644 --- a/e107_handlers/menu_class.php +++ b/e107_handlers/menu_class.php @@ -63,45 +63,24 @@ class e_menu return; } - $menu_layout_field = THEME_LAYOUT!=e107::getPref('sitetheme_deflayout') ? THEME_LAYOUT : ""; - - // e107::getCache()->CachePageMD5 = md5(e_LANGUAGE.$menu_layout_field); // Disabled by line 93 of Cache class. - //FIXME add a function to the cache class for this. - - $menu_data = e107::getCache()->retrieve_sys("menus_".USERCLASS_LIST."_".md5(e_LANGUAGE.$menu_layout_field)); - // $menu_data = e107::getCache()->retrieve_sys("menus_".USERCLASS_LIST); - $menu_data = e107::getArrayStorage()->ReadArray($menu_data); - - - - $eMenuArea = array(); - // $eMenuList = array(); - // $eMenuActive = array(); // DEPRECATED - if(!is_array($menu_data)) + // print_a($eMenuArea); + if($_SERVER['E_DEV_MENU'] == 'true') + { + $layouts = e107::getPref('menu_layouts'); + if(!is_array($layouts)) { - $menu_qry = 'SELECT * FROM #menus WHERE menu_location > 0 AND menu_class IN ('.USERCLASS_LIST.') AND menu_layout = "'.$menu_layout_field.'" ORDER BY menu_location,menu_order'; - if(e107::getDb()->db_Select_gen($menu_qry)) - { - while($row = e107::getDb()->db_Fetch()) - { - $eMenuArea[$row['menu_location']][] = $row; - } - } - $menu_data['menu_area'] = $eMenuArea; - $menuData = e107::getArrayStorage()->WriteArray($menu_data, false); - // e107::getCache()->set_sys('menus_'.USERCLASS_LIST, $menuData); - e107::getCache()->set_sys('menus_'.USERCLASS_LIST.'_'.md5(e_LANGUAGE.$menu_layout_field), $menuData); - } - else - { - $eMenuArea = $menu_data['menu_area']; + $converted = $this->convertMenuTable(); + e107::getConfig('core')->set('menu_layouts', $converted)->save(); } + $eMenuArea = $this->getData(THEME_LAYOUT); + } + //print_a($eMenuArea); + //$eMenuArea = $this->getDataLegacy(); + // print_a($eMenuArea); - // $eMenuArea = $this->getData(THEME_LAYOUT); - $total = array(); foreach($eMenuArea as $area => $val) @@ -128,7 +107,25 @@ class e_menu e107::getRender()->eMenuTotal = $total; } - + /** + * Convert from v1.x e107_menu table to v2.x $pref format. + */ + function convertMenuTable() + { + $sql = e107::getDb(); + + $sql->select('menus','*','menu_location !=0 ORDER BY menu_location,menu_order'); + $data = array(); + + while($row = $sql->fetch()) + { + $layout = vartrue($row['menu_layout'],'default'); + $location = $row['menu_location']; + $data[$layout][$location][] = array('name'=>$row['menu_name'],'class'=>$row['menu_class'],'path'=>$row['menu_path'],'pages'=>$row['menu_pages'],'parms'=>$row['menu_parms']); + } + + return $data; + } @@ -143,7 +140,7 @@ class e_menu foreach($pref[$layout] as $area=>$v); { - $c = 0; + $c = 1; foreach($v as $val) { @@ -155,7 +152,7 @@ class e_menu } $ret[$area][] = array( - + 'menu_id' => $c, 'menu_name' => $val['name'], 'menu_location' => $area, 'menu_class' => $class, @@ -179,6 +176,57 @@ class e_menu + + /** + * @DEPRECATED + * Legacy Function to retrieve Menu data from tables. - ie. the old v1.x method. + */ + private function getDataLegacy() + { + $sql = e107::getDb(); + $menu_layout_field = THEME_LAYOUT!=e107::getPref('sitetheme_deflayout') ? THEME_LAYOUT : ""; + + // e107::getCache()->CachePageMD5 = md5(e_LANGUAGE.$menu_layout_field); // Disabled by line 93 of Cache class. + //FIXME add a function to the cache class for this. + + $menu_data = e107::getCache()->retrieve_sys("menus_".USERCLASS_LIST."_".md5(e_LANGUAGE.$menu_layout_field)); + // $menu_data = e107::getCache()->retrieve_sys("menus_".USERCLASS_LIST); + $menu_data = e107::getArrayStorage()->ReadArray($menu_data); + + $eMenuArea = array(); + // $eMenuList = array(); + // $eMenuActive = array(); // DEPRECATED + + + if(!is_array($menu_data)) + { + $menu_qry = 'SELECT * FROM #menus WHERE menu_location > 0 AND menu_class IN ('.USERCLASS_LIST.') AND menu_layout = "'.$menu_layout_field.'" ORDER BY menu_location,menu_order'; + + if($sql->gen($menu_qry)) + { + while($row = $sql->fetch()) + { + $eMenuArea[$row['menu_location']][] = $row; + } + } + + $menu_data['menu_area'] = $eMenuArea; + + $menuData = e107::getArrayStorage()->WriteArray($menu_data, false); + + // e107::getCache()->set_sys('menus_'.USERCLASS_LIST, $menuData); + e107::getCache()->set_sys('menus_'.USERCLASS_LIST.'_'.md5(e_LANGUAGE.$menu_layout_field), $menuData); + + } + else + { + $eMenuArea = $menu_data['menu_area']; + } + + + + return $eMenuArea; + } From 17bc8896c872d8f59da1bbb77192845a6127c3cd Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 23:14:45 -0700 Subject: [PATCH 09/24] Fix for menu-pref saving. --- e107_admin/menus.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 0765a3795..4c12fb243 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -628,8 +628,8 @@ class e_layout print_r($save); // return; - - e107::getConfig('core')->set('menu_layouts', $save)->save(); //TODO Save directly into multi-dimensional array. ie. $layout / $area / array. + e107::getConfig('core')->setPref('menu_layouts/'.$layout, $save)->save(); + // e107::getConfig('core')->set('menu_layouts', $save)->save(); //TODO Save directly into multi-dimensional array. ie. $layout / $area / array. } From 94ae8bcd1d7a79753c7bc5032278d8219b6b7f42 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 23:51:34 -0700 Subject: [PATCH 10/24] Fix for broken banner-menu when no template found in theme folder. --- e107_plugins/banner/banner_menu.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_plugins/banner/banner_menu.php b/e107_plugins/banner/banner_menu.php index c6b8f0d16..5e5eb0b96 100644 --- a/e107_plugins/banner/banner_menu.php +++ b/e107_plugins/banner/banner_menu.php @@ -38,8 +38,9 @@ if(file_exists(THEME.'banner_template.php')) } else { - require_once (e_THEME.'templates/banner_template.php'); + require_once (e_PLUGIN.'banner/banner_template.php'); } + $menu_pref = e107::getConfig('menu')->getPref(''); if(isset($campaign)) From 534861c94956c6225a1740dd370f710b86f1b09f Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 23:52:05 -0700 Subject: [PATCH 11/24] Menu-Manager Drag and Drop fixes. --- e107_admin/menus.php | 14 +++++++++----- e107_handlers/menu_class.php | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 4c12fb243..70c8f2414 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -499,7 +499,9 @@ class e_layout helper: "clone", appendTo: ".sortable", // "#area-1", //FIXME Needs to be a specific area. revert: true, - + containment: "parent", + delay: 0, + revertDuration: 100, cursor: "move", iframeFix: true, containment: false, @@ -620,7 +622,7 @@ class e_layout $save = array(); foreach($_POST['data']['layout']['area'] as $v) // reset key values. { - $save[$layout][$area][] = $v; + $save[$area][] = $v; } // $save[$layout][$area] = $_POST['data']['layout']['area']; @@ -711,7 +713,9 @@ class e_layout private function renderMenu($row, $layout, $area, $count) { // return print_a($row,true); - $TEMPLATE = '
  • '.$this->renderMenuOptions($row, $layout, $area,$count).'
    • + $uniqueId = "menu_".$row['path'].'_'.$count; + + $TEMPLATE = '
  • '.$this->renderMenuOptions($row, $layout, $area,$count,$uniqueId).'
    • '; // TODO perhaps a simple counter for the id return $TEMPLATE; @@ -727,7 +731,7 @@ class e_layout * @param number $area as in {MENU=x} * @param incrementor number. */ - public function renderMenuOptions($row, $layout, $area, $c) + public function renderMenuOptions($row, $layout, $area, $c, $uniqueId) { $frm = e107::getForm(); @@ -749,7 +753,7 @@ class e_layout if(vartrue($_GET['configure'])) // Iframe Mode. { - $text .= "×"; // $('.hello').remove(); + $text .= "×"; // $('.hello').remove(); } diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php index 5910bbcf9..4b01f392a 100644 --- a/e107_handlers/menu_class.php +++ b/e107_handlers/menu_class.php @@ -121,7 +121,7 @@ class e_menu { $layout = vartrue($row['menu_layout'],'default'); $location = $row['menu_location']; - $data[$layout][$location][] = array('name'=>$row['menu_name'],'class'=>$row['menu_class'],'path'=>$row['menu_path'],'pages'=>$row['menu_pages'],'parms'=>$row['menu_parms']); + $data[$layout][$location][] = array('name'=>$row['menu_name'],'class'=> intval($row['menu_class']),'path'=>$row['menu_path'],'pages'=>$row['menu_pages'],'parms'=>$row['menu_parms']); } return $data; From d1780270eb3980424669c1462c010e4b1a084451 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 May 2013 23:59:37 -0700 Subject: [PATCH 12/24] Menu-Manager delete-menu fix. --- e107_admin/menus.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 70c8f2414..6392ed32e 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -521,9 +521,15 @@ class e_layout { var deleteId = $(this).attr("data-delete"); var area = $(this).attr("data-area"); - $("#"+deleteId).hide("slow"); - $("#"+deleteId).remove(); + $("#"+deleteId).hide("slow", function(){ + $("#"+deleteId).remove(); + }); + + + // $("#"+deleteId).remove(); // alert(deleteId + " " + area); + + saveData(area); }); @@ -713,7 +719,8 @@ class e_layout private function renderMenu($row, $layout, $area, $count) { // return print_a($row,true); - $uniqueId = "menu_".$row['path'].'_'.$count; + $frm = e107::getForm(); + $uniqueId = "menu_".$frm->name2id($row['path']).'_'.$count; $TEMPLATE = '
  • '.$this->renderMenuOptions($row, $layout, $area,$count,$uniqueId).'
    • '; // TODO perhaps a simple counter for the id From b61b3cd4bd8c76ab0354ce50d46d71245e0c6b52 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 10 May 2013 00:13:32 -0700 Subject: [PATCH 13/24] Fix for custom menus and better filtering on available menus. --- e107_admin/menus.php | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 6392ed32e..f88b81726 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -383,7 +383,13 @@ if($_SERVER['E_DEV_MENU'] == 'true') $text .= "
  • "; // $text .= $row['menu_name']; - $text .= e_layout::renderMenuOptions($row); + $defaults = array( + 'name' => $row['menu_name'], + 'path' => $row['page_id'], + 'class' => '0' + ); + + $text .= e_layout::renderMenuOptions($defaults,'layout','area',$c); $text .= "
    • "; } @@ -784,9 +790,23 @@ class e_layout foreach($files as $file) { - $path = trim(str_replace(e_PLUGIN,"",$file['path']),"/"); + $valid_menu = false; - // if(e107::isInstalled($path) ) + if (file_exists($file['path'].'/plugin.xml') || file_exists($file['path'].'/plugin.php')) + { + if (e107::isInstalled($parent_dir)) + { + $valid_menu = TRUE; // Whether new or existing, include in list + } + } + else // Just add the menu anyway + { + $valid_menu = TRUE; + } + + $path = trim(str_replace(e_PLUGIN,"",$file['path']),"/"); + + if($valid_menu) { $fname = str_replace(".php","",$file['fname']); $data[$fname] = $path; From 16af1a3b11a2f7ed62ac1fcae2c53d7a356bf135 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 10 May 2013 02:46:09 -0700 Subject: [PATCH 14/24] Removed commented-out code. --- e107_handlers/menu_class.php | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php index 4b01f392a..65dba9f55 100644 --- a/e107_handlers/menu_class.php +++ b/e107_handlers/menu_class.php @@ -65,22 +65,23 @@ class e_menu - // print_a($eMenuArea); - if($_SERVER['E_DEV_MENU'] == 'true') - { - $layouts = e107::getPref('menu_layouts'); - if(!is_array($layouts)) + // print_a($eMenuArea); + if($_SERVER['E_DEV_MENU'] == 'true') // New in v2.x { - $converted = $this->convertMenuTable(); - e107::getConfig('core')->set('menu_layouts', $converted)->save(); + $layouts = e107::getPref('menu_layouts'); + if(!is_array($layouts)) + { + $converted = $this->convertMenuTable(); + e107::getConfig('core')->set('menu_layouts', $converted)->save(); + } + + $eMenuArea = $this->getData(THEME_LAYOUT); } - - $eMenuArea = $this->getData(THEME_LAYOUT); - } - //print_a($eMenuArea); - //$eMenuArea = $this->getDataLegacy(); - - // print_a($eMenuArea); + else // the old v1.x way. + { + $eMenuArea = $this->getDataLegacy(); + } + $total = array(); foreach($eMenuArea as $area => $val) From b74aff7458c99dbf8220a256426304d0f3e56e86 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 10 May 2013 04:38:04 -0700 Subject: [PATCH 15/24] More Menu-Manager work. --- e107_admin/menus.php | 174 +++++++++++++++++++++-------------- e107_handlers/menu_class.php | 6 ++ 2 files changed, 109 insertions(+), 71 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index f88b81726..b807bf408 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -301,6 +301,18 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) color: white; } + + ul.unstyled, ol.unstyled { + margin-left: 0px; + list-style: none outside none; + } + + .pull-right { float: right } + .pull-left { float: left } + + .menuOption { display: none } + + .ui-draggable { background-color: rgb(245, 245, 245); min-width:100px;} ",'jquery'); @@ -308,6 +320,10 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) } + + + + if($_SERVER['E_DEV_MENU'] == 'true') @@ -422,17 +438,11 @@ class e_layout $ns = e107::getRender(); // $this->convertMenuTable(); - - - $this->menuData = e107::getPref('menu_layouts'); - if(e_AJAX_REQUEST) { - - - + if(varset($_POST['data'])) { $this->processPost(); @@ -442,14 +452,25 @@ class e_layout } - + if(vartrue($_GET['configure'])) //ie Inside the IFRAME. { - + + global $HEADER,$FOOTER,$CUSTOMHEADER,$CUSTOMFOOTER,$style; + + $this->HEADER = $HEADER; + $this->FOOTER = $FOOTER; + $this->CUSTOMHEADER = $CUSTOMHEADER; + $this->CUSTOMFOOTER = $CUSTOMFOOTER; + $this->style = $style; + + + unset($HEADER,$FOOTER,$CUSTOMHEADER,$CUSTOMFOOTER,$style); + + e107::js('url',"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js"); e107::js('url', "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css"); - - + e107::js('inline',' $(function() { @@ -467,7 +488,8 @@ class e_layout data: data }).done(function( msg ) { - // alert("POSTED: "+ msg ); + $(".menuOption").show(); + alert("POSTED: "+ msg ); }); } @@ -477,11 +499,11 @@ class e_layout $(".sortable").sortable({ - + connectWith: $("#area-1,#area-2,#area-3,#area-4,#area-5"), revert: true, cursor: "move", distance: 20, - containment: "parent", + // containment: $(".sortable"), update: function(ev,ui) { var areaid = $(this).attr("id"); @@ -503,8 +525,8 @@ class e_layout $( ".draggable", window.top.document).draggable({ connectToSortable: ".sortable", helper: "clone", - appendTo: ".sortable", // "#area-1", //FIXME Needs to be a specific area. - revert: true, + appendTo: $(this), // ".sortable", // "#area-1", //FIXME Needs to be a specific area. + revert: "invalid", containment: "parent", delay: 0, revertDuration: 100, @@ -514,7 +536,7 @@ class e_layout stop: function(e, ui) { //TODO Rename layout and area in the hidden fields to that of the where the menu was dropped. // Figure out positioning magic to determine if e.ui.position is in the iframe // var what = $(this).parent().attr("id"); - + // $(".sortable").draggable( "disable" ); // alert(what); } @@ -559,14 +581,30 @@ class e_layout */ - - - + $this->curLayout = varsettrue($_GET['configure'], $pref['sitetheme_deflayout']); $this->renderLayout($this->curLayout); + + + + } else // Parent - ie. main admin page. { + e107::css('inline'," + .menuOption { display: none } + + "); + + + $theme = e107::getPref('sitetheme'); + require_once(e_THEME.$theme."/theme.php"); + + $this->HEADER = $HEADER; + $this->FOOTER = $FOOTER; + $this->CUSTOMHEADER = $CUSTOMHEADER; + $this->CUSTOMFOOTER = $CUSTOMFOOTER; + $this->style = $style; // XXX HELP _ i don't work with iFrames. // $("#sortable") @@ -606,9 +644,7 @@ class e_layout ','jquery'); */ - - $this->scanForNew(); @@ -617,34 +653,32 @@ class e_layout } - + /** + * Save Menu Pref + */ protected function processPost() { - $cnf = e107::getConfig('core'); - $existing = $cnf->get('menu_layouts'); - - // print_r($existing); - // $data = array_merge($existing,$_POST['data']); - - $data = $_POST['data']; + $cnf = e107::getConfig('core'); + $existing = $cnf->get('menu_layouts'); + $data = $_POST['data']; $layout = $_POST['layout']; $area = $_POST['area']; $save = array(); + + foreach($_POST['data']['layout']['area'] as $v) // reset key values. { - $save[$area][] = $v; + $save[] = $v; } // $save[$layout][$area] = $_POST['data']['layout']['area']; print_r($save); - // return; - - e107::getConfig('core')->setPref('menu_layouts/'.$layout, $save)->save(); - // e107::getConfig('core')->set('menu_layouts', $save)->save(); //TODO Save directly into multi-dimensional array. ie. $layout / $area / array. + e107::getConfig('core')->setPref('menu_layouts/'.$layout."/".$area, $save)->save(); + } @@ -654,15 +688,21 @@ class e_layout * Substitute all {MENU=X} and Render output. */ private function renderLayout($layout='') - { - - global $HEADER,$FOOTER,$style; // included by theme file in class2. + { + $ALL = $this->getHeadFoot(); + + $HEADER = $ALL['HEADER']; + $FOOTER = $ALL['FOOTER']; $tp = e107::getParser(); - + $head = preg_replace_callback("/\{MENU=([\d]{1,3})(:[\w\d]*)?\}/", array($this, 'renderMenuArea'), $HEADER[THEME_LAYOUT]); $foot = preg_replace_callback("/\{MENU=([\d]{1,3})(:[\w\d]*)?\}/", array($this, 'renderMenuArea'), $FOOTER[THEME_LAYOUT]); + global $style; + + $style = $this->style; + echo $tp->parsetemplate($head); // echo "
    MAIN CONTENT
    "; echo $tp->parsetemplate($foot); @@ -685,7 +725,7 @@ class e_layout // return print_a($this->menuData,true); $text = "
    "; $text .= "
    Area ".$area."
    \n"; - $text .= $frm->open('form-area-'.$area,'post',e_SELF); + $count = 0; if(vartrue($this->menuData[THEME_LAYOUT]) && is_array($this->menuData[THEME_LAYOUT][$area])) @@ -764,13 +804,8 @@ class e_layout $text .= $frm->hidden('data[layout][area]['.$c.'][parms]',$row['parms'] ); - if(vartrue($_GET['configure'])) // Iframe Mode. - { - $text .= "×"; // $('.hello').remove(); - } - + $text .= "×"; // $('.hello').remove(); - return $text; } @@ -829,9 +864,10 @@ class e_layout { $ns = e107::getRender(); $tp = e107::getParser(); - $frm = e107::getForm(); + $frm = e107::getForm(); $TEMPL = $this->getHeadFoot(); + $layouts = array_keys($TEMPL['HEADER']); @@ -891,50 +927,46 @@ class e_layout - private function getHeadFoot($_MLAYOUT=null) + private function getHeadFoot() { - $theme = e107::getPref('sitetheme'); - + $H = array(); $F = array(); - require(e_THEME.$theme."/theme.php"); - - - if(is_string($HEADER)) + if(is_string($this->HEADER)) { - $H['default'] = $HEADER; - $F['default'] = $FOOTER; + $H['default'] = $this->HEADER; + $F['default'] = $this->FOOTER; } else { - $H = $HEADER; - $F = $FOOTER; + $H = $this->HEADER; + $F = $this->FOOTER; } + // 0.6 / 0.7-1.x - if(isset($CUSTOMHEADER) && isset($CUSTOMHEADER)) + if(isset($this->CUSTOMHEADER) && isset($this->CUSTOMHEADER)) { - if(!is_array($CUSTOMHEADER)) + if(!is_array($this->CUSTOMHEADER)) { - $H['legacyCustom'] = $CUSTOMHEADER; - $F['legacyCustom'] = $CUSTOMFOOTER; + $H['legacyCustom'] = $this->CUSTOMHEADER; + $F['legacyCustom'] = $this->CUSTOMFOOTER; } else { - foreach($CUSTOMHEADER as $k=>$v) + foreach($this->CUSTOMHEADER as $k=>$v) { - $H[$k] = $v; - $F[$k] = $v; - } + $H[$k] = $v; + } + foreach($this->CUSTOMFOOTER as $k=>$v) + { + $F[$k] = $v; + } } } - - if($_MLAYOUT) - { - // return array('HEADER'=>$H[$_MLAYOUT], 'FOOTER'=>$F[$_MLAYOUT]); - } + return array('HEADER'=>$H, 'FOOTER'=>$F); diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php index 65dba9f55..07ad781b1 100644 --- a/e107_handlers/menu_class.php +++ b/e107_handlers/menu_class.php @@ -138,6 +138,12 @@ class e_menu protected function getData($layout) { $pref = e107::getPref('menu_layouts'); + + if(!varset($pref[$layout])) + { + return array(); + } + foreach($pref[$layout] as $area=>$v); { From 9bc65c50eb65472f8a1bbc63fc75c7a0edb894eb Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 10 May 2013 05:30:07 -0700 Subject: [PATCH 16/24] More Menu-Manager work. --- e107_admin/menus.php | 92 +++++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 23 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index b807bf408..f0d45ccde 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -56,6 +56,11 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) // e107::js('core', 'core/admin.jquery.js', 'jquery', 4); e107::js('core','bootstrap/js/bootstrap-tooltip.js'); // e107::css('core','bootstrap/css/bootstrap.min.css'); + + + + + e107::js('inline', " $(function() { @@ -134,7 +139,7 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) e107::css('inline'," .column { width:100%; padding-bottom: 100px; } - .regularMenu { border-bottom:1px dotted silver; margin-bottom:6px; padding-left:3px; padding-right:3px; padding-bottom:20px } + .regularMenu { cursor:move; border-bottom:1px dotted silver; margin-bottom:6px; padding-left:3px; padding-right:3px; padding-bottom:20px } #core-menumanager-main th {color: silver; font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; font-size:14px; font-weight: bold; line-height:24px; background-color:#2F2F2F } .portlet { margin: 0 1em 1em 0; } .portlet-header { margin: 0.3em; padding-bottom: 4px; padding-left: 0.2em; cursor:move } @@ -158,7 +163,9 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) .icon-search { background-position: -48px 0; } - + .icon-align-justify { + background-position: -336px -48px; + } /* A little bit of bootstrap styling - loading /bootstrap.css could break some themes */ @@ -214,6 +221,13 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } + .btn-mini { + padding: 0px 2px; + font-size: 10.5px; + border-radius: 3px 3px 3px 3px; + } + + .tbox { text-align:left } .menuOptions { @@ -431,6 +445,7 @@ class e_layout { private $menuData = array(); private $iframe = false; + private $cnt = 0; function __construct() { @@ -466,7 +481,8 @@ class e_layout unset($HEADER,$FOOTER,$CUSTOMHEADER,$CUSTOMFOOTER,$style); - + + require_once(e_CORE."templates/admin_icons_template.php"); e107::js('url',"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js"); e107::js('url', "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css"); @@ -489,7 +505,7 @@ class e_layout }).done(function( msg ) { $(".menuOption").show(); - alert("POSTED: "+ msg ); + // alert("POSTED: "+ msg ); }); } @@ -674,7 +690,8 @@ class e_layout } // $save[$layout][$area] = $_POST['data']['layout']['area']; - + echo "\nLAYOUT=".$layout."\n"; + echo "AREA=".$area."\n"; print_r($save); e107::getConfig('core')->setPref('menu_layouts/'.$layout."/".$area, $save)->save(); @@ -725,29 +742,22 @@ class e_layout // return print_a($this->menuData,true); $text = "
    "; $text .= "
    Area ".$area."
    \n"; + $text .= $frm->open('form-area-'.$area,'post',e_SELF); + $text .= "
      +
    •  
      • "; - - $count = 0; if(vartrue($this->menuData[THEME_LAYOUT]) && is_array($this->menuData[THEME_LAYOUT][$area])) { - $text .= "
        "; foreach($this->menuData[THEME_LAYOUT][$area] as $val) { $text .= $this->renderMenu($val, THEME_LAYOUT, $area,$count); - $count++; + $this->cnt++; } - - $text .= "
      "; - } - else // Empty Menu. - { - $text .= "
        -
      •  
        • -
      "; - + } + $text .= "
    "; $text .= "
    "; // $text .= $frm->button('submit','submit','submit','submit'); @@ -766,9 +776,9 @@ class e_layout { // return print_a($row,true); $frm = e107::getForm(); - $uniqueId = "menu_".$frm->name2id($row['path']).'_'.$count; + $uniqueId = "menu_".$frm->name2id($row['path']).'_'.$this->cnt; - $TEMPLATE = '
  • '.$this->renderMenuOptions($row, $layout, $area,$count,$uniqueId).'
    • + $TEMPLATE = '
  • '.$this->renderMenuOptions($row, $layout, $area, $this->cnt, $uniqueId).'
    • '; // TODO perhaps a simple counter for the id return $TEMPLATE; @@ -784,11 +794,13 @@ class e_layout * @param number $area as in {MENU=x} * @param incrementor number. */ - public function renderMenuOptions($row, $layout, $area, $c, $uniqueId) + public function renderMenuOptions($row, $layout, $area, $c , $uniqueId='xxx') { $frm = e107::getForm(); - $text = str_replace("_menu","",$row['name']); + // $text = " "; + $text .= str_replace("_menu","",$row['name']); + // $layout = 'layout'; // $area = 'area'; //TODO Delete, Config etc. @@ -803,8 +815,42 @@ class e_layout $text .= $frm->hidden('data[layout][area]['.$c.'][pages]',$row['pages'] ); $text .= $frm->hidden('data[layout][area]['.$c.'][parms]',$row['parms'] ); + $visibilityLink = e_SELF."?enc=".base64_encode('lay='.$layout.'&vis='.$c.'&iframe=1'); + + + $text .= "×"; // $('.hello').remove(); + + $text .= ''; + + /* + + + $text .= ' + '; - $text .= "×"; // $('.hello').remove(); + if($conf) + { + $text .= ''; + } + + $editLink = e_SELF."?enc=".base64_encode('lay='.$layout.'&parmsId='.$menu_id.'&iframe=1'); + $text .= ''; + + $text .= ' + + '; + */ + + + + + + + + + + return $text; From 04a371979c9b8ed1e011206b820e6fe87d037f4c Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 10 May 2013 05:45:40 -0700 Subject: [PATCH 17/24] Menu-Manager Tweaks --- e107_admin/menus.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/e107_admin/menus.php b/e107_admin/menus.php index f0d45ccde..1f3f0398f 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -139,7 +139,6 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) e107::css('inline'," .column { width:100%; padding-bottom: 100px; } - .regularMenu { cursor:move; border-bottom:1px dotted silver; margin-bottom:6px; padding-left:3px; padding-right:3px; padding-bottom:20px } #core-menumanager-main th {color: silver; font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; font-size:14px; font-weight: bold; line-height:24px; background-color:#2F2F2F } .portlet { margin: 0 1em 1em 0; } .portlet-header { margin: 0.3em; padding-bottom: 4px; padding-left: 0.2em; cursor:move } @@ -324,13 +323,21 @@ if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc'])) .pull-right { float: right } .pull-left { float: left } - .menuOption { display: none } + .menuOption { opacity:0.2 } + .menuOption:hover { opacity:1 } + + .sortable li { border-radius: 4px } + .sortable li:hover { background-color: silver; box-shadow:3px 3px 3px silver } + + .regularMenu { cursor:move; border-bottom:1px dotted silver; margin-bottom:6px; padding-left:3px; padding-right:3px; padding-top:10px; padding-bottom:10px } .ui-draggable { background-color: rgb(245, 245, 245); min-width:100px;} ",'jquery'); + + } @@ -818,9 +825,9 @@ class e_layout $visibilityLink = e_SELF."?enc=".base64_encode('lay='.$layout.'&vis='.$c.'&iframe=1'); - $text .= "×"; // $('.hello').remove(); + $text .= "×"; // $('.hello').remove(); - $text .= ''; + $text .= ''; /* From dbf6c97142e101f504dbe60e2f906a98f952e159 Mon Sep 17 00:00:00 2001 From: Moc Date: Fri, 10 May 2013 15:51:03 +0200 Subject: [PATCH 18/24] Minor LAN change to make changing avatar procedure easier to understand --- e107_handlers/form_handler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index bb7edb6d5..0488ba9f2 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -413,7 +413,7 @@ class e_form if($localonly == true) { $text = ""; - $text .= ""; // TODO LAN + $text .= ""; // TODO LAN } else { @@ -1784,8 +1784,8 @@ class e_form } } else - { - $user_options = array('name' => $name); //required for some of the automated tasks + { + $user_options = array('name' => $name); //required for some of the automated tasks } return array_merge($def_options, $user_options); From fab5911220386c13f2a8c80544b1af52e495d664 Mon Sep 17 00:00:00 2001 From: Moc Date: Fri, 10 May 2013 16:14:19 +0200 Subject: [PATCH 19/24] Typo fix - fatal error on deleting PM --- e107_plugins/pm/pm_class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php index 0073caaf8..604e3dcc4 100755 --- a/e107_plugins/pm/pm_class.php +++ b/e107_plugins/pm/pm_class.php @@ -311,7 +311,7 @@ class private_message { $ret .= str_replace(array('--GOOD--', '--FAIL--'), $aCount, LAN_PM_71).'
    '; } - $sq->delete('private_msg', 'pm_id = '.$pmid); + $sql->delete('private_msg', 'pm_id = '.$pmid); } else { From 24d0aba27ce994b66ee651727378f0da659ba503 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 10 May 2013 15:15:38 -0700 Subject: [PATCH 20/24] Fix for comment icon in bootstrap. --- e107_core/shortcodes/batch/news_shortcodes.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index cea1a2e41..5eab2a6a2 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -125,7 +125,13 @@ class news_shortcodes extends e_shortcode { $NEWIMAGE = $param['image_nonew_small']; } - return (!$news_item['news_allow_comments'] ? ''.($pref['comments_icon'] ? $NEWIMAGE : '')." ".$param['commentlink'].intval($news_item['news_comment_total']).'' : vartrue($param['commentoffstring'],'Disabled') ); + + if(deftrue('e_BOOTSTRAP')) // Should be done with CSS, not like above. + { + $NEWIMAGE = ""; + } + + return (!$news_item['news_allow_comments'] ? ''.($pref['comments_icon'] ? $NEWIMAGE.' ' : '')."".$param['commentlink'].intval($news_item['news_comment_total']).'' : vartrue($param['commentoffstring'],'Disabled') ); } function sc_trackback($parm) From 5b8f347db4088e6c0152c5d2922baf54ad288960 Mon Sep 17 00:00:00 2001 From: Moc Date: Sat, 11 May 2013 12:03:29 +0200 Subject: [PATCH 21/24] Fixes #277 - broken link on user.php to usersettings.php when using SEF --- e107_core/shortcodes/batch/user_shortcodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php index 133cfaa24..2682e79bf 100644 --- a/e107_core/shortcodes/batch/user_shortcodes.php +++ b/e107_core/shortcodes/batch/user_shortcodes.php @@ -446,7 +446,7 @@ class user_shortcodes extends e_shortcode if (USERID == $this->var['user_id']) { //return "".LAN_USER_38.""; - return "".LAN_USER_38.""; // TODO: repair dirty fix for usersettings + return "".LAN_USER_38.""; // TODO: repair dirty fix for usersettings } else if(ADMIN && getperms("4") && !$this->var['user_admin']) { From 100819dc9c6cd8c9637c1ef1f90cda72dce266b9 Mon Sep 17 00:00:00 2001 From: SecretR Date: Sat, 11 May 2013 19:45:59 +0300 Subject: [PATCH 22/24] Remote communication rewrite started, work in progress --- e107_handlers/e_marketplace.php | 458 ++++++++++++++++++++++++++++++++ 1 file changed, 458 insertions(+) create mode 100644 e107_handlers/e_marketplace.php diff --git a/e107_handlers/e_marketplace.php b/e107_handlers/e_marketplace.php new file mode 100644 index 000000000..d521c6dad --- /dev/null +++ b/e107_handlers/e_marketplace.php @@ -0,0 +1,458 @@ +adapter = new $className(); + } + elseif(!class_exists('SoapClient')) $this->adapter = new e_marketplace_adapter_xmlrpc(); + else + { + $this->adapter = new e_marketplace_adapter_wsdl(); + } + } + + /** + * Set authorization key + */ + public function generateAuthKey($username, $password) + { + $this->setAuthKey($this->makeAuthKey($username, $password, true)); + return $this; + } + + /** + * Set authorization key + */ + public function setAuthKey($authkey) + { + $this->adapter->setAuthKey($authkey); + return $this; + } + + public function hasAuthKey() + { + return $this->adapter->hasAuthKey(); + } + + /** + * Make authorization key from user credentials + */ + public function makeAuthKey($username, $password = '', $plain = false) + { + $now = gmdate('y-m-d H'); + if($plain && !empty($password)) $password = md5($password); + return sha1($username.$password.$now); + } + + /** + * Retrieve currently used adapter + * @param e_marketplace_adapter_abstract + */ + public function adapter() + { + return $this->adapter; + } + + /** + * Retrieve currently used adapter + * @param e_marketplace_adapter_abstract + */ + public function call($method, $data, $apply = true) + { + return $this->adapter()->call($method, $data, $apply); + } + + /** + * Direct adapter()->call() execution - experimental stage + */ + public function __call($method, $arguments) + { + if(strpos($method, 'get') === 0 || strpos($method, 'do') === 0) + { + return $this->adapter()->call($method, $arguments); + } + throw new Exception("Error Processing Request", 10); + } + + + public function __destruct() + { + $this->adapter = null; + //echo "Adapter destroyed", PHP_EOL; + } + +} + +abstract class e_marketplace_adapter_abstract +{ + /** + * e107.org download URL + * @var string + */ + protected $downloadUrl = 'http://e107.org/e107_plugins/addons/request.php'; + + /** + * e107.org authorization key + * @var string + */ + protected $authKey = null; + + abstract public function test($input); + abstract public function call($method, $data, $apply); + abstract public function fetch($method, &$result); + + /** + * Set authorization key + */ + public function setAuthKey($authkey) + { + $this->authKey = $authkey; + return $this; + } + + + public function hasAuthKey() + { + return ($this->authKey !== null) ? true : false; + } + public function getAuthKey() + { + return $this->authKey; + } + + + /** + * Download a Plugin or Theme to Temp, then test and move to plugin/theme folder and backup to system backup folder. + * @param string $remotefile URL + * @param string $type plugin or theme + */ + public function download($id, $type='theme') + { + $tp = e107::getParser(); + $id = intval($id); + $qry = 'id='.$id; + $remotefile = $this->downloadUrl."?auth=".$this->getAuthKey()."&".$qry; + + $localfile = md5($remotefile.time()).".zip"; + $status = "Downloading..."; + + $result = $this->getRemoteFile($remotefile, $localfile); + + if(!file_exists(e_TEMP.$localfile)) + { + $status = ADMIN_FALSE_ICON."
    Download Manually"; + + if(E107_DEBUG_LEVEL > 0) + { + $status .= 'local='.$localfile; + } + + echo $status; + exit; + } + else + { + $contents = file_get_contents(e_TEMP.$localfile); + if(strlen($contents) < 400) + { + echo ""; + return; + } + } + + chmod(e_TEMP.$localfile, 0755); + require_once(e_HANDLER."pclzip.lib.php"); + + $archive = new PclZip(e_TEMP.$localfile); + $unarc = ($fileList = $archive -> extract(PCLZIP_OPT_PATH, e_TEMP, PCLZIP_OPT_SET_CHMOD, 0755)); // Store in TEMP first. + $dir = $this->getRootFolder($unarc); + $destpath = ($type == 'theme') ? e_THEME : e_PLUGIN; + $typeDiz = ucfirst($type); + + @copy(e_TEMP.$localfile, e_BACKUP.$dir.".zip"); // Make a Backup in the system folder. + + if($dir && is_dir($destpath.$dir)) + { + $alert = $tp->toJS(ucfirst($type)." Already Installed".$destpath.$dir); + echo ""; + echo "Already Installed"; + @unlink(e_TEMP.$localfile); + exit; + } + + if($dir == '') + { + echo ""; + @unlink(e_TEMP.$localfile); + exit; + } + + if(is_dir(e_TEMP.$dir)) + { + $status = "Unzipping..."; + if(!rename(e_TEMP.$dir,$destpath.$dir)) + { + $alert = $tp->toJS("Couldn't Move ".e_TEMP.$dir." to ".$destpath.$dir." Folder"); + echo ""; + @unlink(e_TEMP.$localfile); + exit; + } + + $alert = $tp->toJS("Download Complete!"); + echo ""; + + // $dir = basename($unarc[0]['filename']); + // $plugPath = preg_replace("/[^a-z0-9-\._]/", "-", strtolower($dir)); + $status = "Done"; // ADMIN_TRUE_ICON; + + } + else + { + $status = ADMIN_FALSE_ICON."
    Download Manually"; + if(E107_DEBUG_LEVEL > 0) + { + $status .= print_a($unarc, true); + } + } + + echo $status; + @unlink(e_TEMP.$localfile); + exit; + } + + // Grab a remote file and save it in the /temp directory. requires CURL + function getRemoteFile($remote_url, $local_file, $type='temp') + { + $path = ($type == 'media') ? e_MEDIA : e_TEMP; + + $fp = fopen($path.$local_file, 'w'); // media-directory is the root. + + $cp = curl_init($remote_url); + curl_setopt($cp, CURLOPT_FILE, $fp); + curl_setopt($cp, CURLOPT_REFERER, e_REQUEST_HTTP); + curl_setopt($cp, CURLOPT_HEADER, 0); + curl_setopt($cp, CURLOPT_USERAGENT, "Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)"); + curl_setopt($cp, CURLOPT_COOKIEFILE, e_SYSTEM.'cookies.txt'); + + $buffer = curl_exec($cp); + + curl_close($cp); + fclose($fp); + + return ($buffer) ? true : false; + } +} + +class e_marketplace_adapter_wsdl extends e_marketplace_adapter_abstract +{ + /** + * e107.org WSDL URL + * @var string + */ + protected $wsdl = 'http://e107.org/e107_plugins/addons/service.php?wsdl'; + + /** + * Soap client instance + * @var SoapClient + */ + protected $client = null; + + public function __construct() + { + e107_ini_set('soap.wsdl_cache_enabled', 0); + e107_ini_set('soap.wsdl_cache_ttl', 0); + + $options = array( + "trace" => true, + 'exception' => true, + "uri" => "http://server.soap.e107.inc.com/", + 'cache_wsdl' => WSDL_CACHE_NONE, + 'connection_timeout' => 10, + ); + + $this->client = new SoapClient($this->wsdl, $options); + + if(function_exists('xdebug_disable')) + { + //xdebug_disable(); + } + } + + public function test($input) + { + try + { + $res = $this->client->get_echo($input); + } + catch(Exception $e) + { + $res = $e->getMessage(); + } + return $res; + + } + + /** + * Generic call method + */ + public function _call($method, $args, $apply = true) + { + $result = array( + 'data' => null, + //'error'=> array('code' => 0, 'message' => null) + ); + $ret = null; + + // authorize on every call, service class decides what to do on every method call + $auth = new stdClass; + $auth->authKey = $this->getAuthKey(); + $header = new SoapHeader('http://e107.org/services/auth', 'checkAuthHeader', $auth); + + try + { + $this->client->__setSoapHeaders(array($header)); + if(is_array($args) && $apply) + { + $ret = call_user_func_array(array($this->client, $method), $args); + } + else $ret = $this->client->$method($args); + + if(isset($ret['exception'])) + { + $result['error']['message'] = "API Exception [call::{$method}]: (#".$ret['exception']['code'].") ".$ret['exception']['message']; + $result['error']['code'] = $ret['exception']['code']; + unset($ret['exception']); + } + $result['data'] = $ret['data']; + } + catch(SoapFault $e) + { + $result['error']['message'] = "SoapFault Exception [call::{$method}]: (#".$e->getCode().") ".$e->getMessage(); + $result['error']['code'] = 'SOAP_'.$e->getCode(); + } + catch(Exception $e) + { + $result['error']['message'] = "Generic Exception [call::{$method}]: (#".$e->getCode().") ".$e->getMessage(); + $result['error']['code'] = 'GEN_'.$e->getCode(); + } + if(E107_DEBUG_LEVEL) + { + print_a($this->client->__getLastRequest()); + } + return $result; + } + + /** + * Public call method + */ + public function call($method, $data, $apply = true) + { + return $this->_call($method, $data, $apply); + } + + /** + * Prepare the result, not needed for WSDL + * SUBJECT OF REMOVAL + */ + public function fetch($method, &$result) + { + if(isset($result['error'])) + { + return $result; + } + + switch ($method) + { + case 'getList': + break; + } + return $result; + } + + public function __destruct() + { + $this->client = null; + //echo "SOAP Client destroyed", PHP_EOL; + } +} + +class e_marketplace_adapter_xmlrpc extends e_marketplace_adapter_abstract +{ + /** + * e107.org XML-rpc service + * @var xmlClass + */ + protected $url = 'http://e107.org/e107_plugins/addons/xservice.php'; + + public function __construct() + { + } + + public function test($input) + { + + } + + public function call($method, $data, $apply = true) + { + $client = $this->client(); + + // settings based on current method + $this->prepareClient($client); + + // authorization data + $data['auth'] = $this->getAuthKey(); + $data['action'] = $method; + + // build the request query + $qry = str_replace(array('s%5B', '%5D'), array('[', ']'), http_build_query($data, null, '&')); + $url = $this->url.'?'.$qry; + + // call it + $result = $client->loadXMLfile($url,'advanced'); + //var_dump($url, $result); + return $result; + } + + public function fetch($method, &$result) + { + + } + + public function prepareClient($method, &$client) + { + switch ($method) + { + case 'getList': + $client->setOptArrayTags('plugin'); + break; + } + } + + public function client() + { + return e107::getXml(false); + } +} From 977ea8be6d51a7594ed5f60302f33fef6dea8311 Mon Sep 17 00:00:00 2001 From: Moc Date: Sat, 11 May 2013 23:53:12 +0200 Subject: [PATCH 23/24] Fixes #276 - blank page on signup.php caused by templates folder move --- signup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signup.php b/signup.php index 65e72f8e4..865a1ec52 100644 --- a/signup.php +++ b/signup.php @@ -778,7 +778,7 @@ function render_email($userInfo, $preview = FALSE) } else { - require_once(e_THEME.'templates/email_template.php'); + require_once(e_CORE.'templates/email_template.php'); } /* Inline images now handled automatically - just include in email template with an absolute link From 20cb65f53936155210ab75475ff1f5f59d1f71b1 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 11 May 2013 21:43:29 -0700 Subject: [PATCH 24/24] Preparation for coreCronUpdate(); --- .../shortcodes/batch/admin_shortcodes.php | 75 +++++++++++++++++++ e107_themes/bootstrap/admin_template.php | 5 +- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 5f522dd60..4f349eef5 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -15,6 +15,81 @@ if (!defined('e107_INIT')) { exit; } class admin_shortcodes { + + function cronUpdateRender($parm,$cacheData) + { + $mes = e107::getMessage(); + + if($cacheData == 'up-to-date') + { + return ''; + } + + $installUrl = "#"; // TODO + + + if($parm=='alert') + { + $text = 'A new update is ready to install! Click to unzip and install v'.$cacheData.'. + Install'; + + $mes->addInfo($text); + return $mes->render(); + } + + if($parm=='icon') + { + + return ' + '; + + + } + + } + + // {ADMIN_COREUPDATE} + function sc_admin_coreupdate($parm='') + { + $che = e107::getCache(); + $mes = e107::getMessage(); + + $che->setMD5(e_LANGUAGE); + + $cacheData = $che->retrieve("releasecheck",3600, TRUE); // 2.0.1 | 'up-to-date' | false ; + + $cacheData = 2.1; // XXX Remove to test for real. + + if($cacheData) + { + return $this->cronUpdateRender($parm, $cacheData); + } + + + require_once(e_HANDLER."cron_class.php"); + $cron = new _system_cron(); + + if($result = $cron->checkCoreUpdate()) + { + return $this->cronUpdateRender($parm, $cacheData); + } + + + } + + + + function sc_admin_credits() { if (!ADMIN) { return ''; } diff --git a/e107_themes/bootstrap/admin_template.php b/e107_themes/bootstrap/admin_template.php index 2e30fbc0b..d0cc49acf 100644 --- a/e107_themes/bootstrap/admin_template.php +++ b/e107_themes/bootstrap/admin_template.php @@ -174,6 +174,7 @@ $ADMIN_HEADER = '
    {ADMIN_NAVIGATION=no-main}
    +
  • {ADMIN_COREUPDATE=icon}
    • {ADMIN_PM} {ADMIN_NAVIGATION=home} {ADMIN_NAVIGATION=language} @@ -213,7 +214,9 @@ $ADMIN_HEADER .= '
    {SETSTYLE=none}
    -
    '; +
    + {ADMIN_COREUPDATE=alert} + '; $ADMIN_FOOTER = '