diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index 11235f328..8465d72da 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -76,6 +76,8 @@ class adminstyle_infopanel
$frm = e107::getForm();
//TODO LANs throughout.
+
+ global $style;
// ---------------------- Start Panel --------------------------------
@@ -123,30 +125,6 @@ class adminstyle_infopanel
// ------------------------------- e107 News --------------------------------
-
- $panelRSS = "
- ";
-
- // TODO Load with Ajax
-
-
- /*
- $xml = e107::getXml();
- $vars = $xml->loadXMLfile('http://www.e107.org/e107_plugins/rss_menu/rss.php?1.2', true, true);
- $text .= print_r($vars,TRUE);
- */
-
- $panelRSS .= "
- RSS News feed from e107.org goes here.
-
- ";
- /*
-
-
-
-
- */
-
$text .= $ns->tablerender("e107 News","","core-infopanel_news",true);
// ---------------------Latest Stuff ---------------------------
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index b717b063e..5c2ae3854 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1169,28 +1169,34 @@ class e_form
{
case 'edit':
$image = ADMIN_EDIT_ICON_PATH;
+ $icon = "e-edit-16";
$options['class'] = $options['class'] == 'action' ? 'action edit' : $options['class'];
break;
case 'delete':
$image = ADMIN_DELETE_ICON_PATH;
+ $icon = "e-delete-16";
$options['class'] = $options['class'] == 'action' ? 'action delete' : $options['class'];
$options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"';
break;
case 'execute':
$image = ADMIN_EXECUTE_ICON_PATH;
+ $icon = "e-execute-16";
$options['class'] = $options['class'] == 'action' ? 'action execute' : $options['class'];
break;
case 'view':
$image = ADMIN_VIEW_ICON_PATH;
+ $icon = "e-view-16";
$options['class'] = $options['class'] == 'action' ? 'action view' : $options['class'];
break;
}
$options['title'] = $title;//shorthand
+
+ // return "get_attributes($options, $name, $value)." > ";
- return "
";
-
+
+/*
+ $value .= "
+ ".ADMIN_EDIT_ICON."
+ ";
+ */
+
+
+
+
$delcls = vartrue($attributes['noConfirm']) ? ' no-confirm' : '';
if(varset($parms['deleteClass']))
{
diff --git a/e107_plugins/download/e_help.php b/e107_plugins/download/e_help.php
index 4a31d895d..e972bdb74 100644
--- a/e107_plugins/download/e_help.php
+++ b/e107_plugins/download/e_help.php
@@ -60,6 +60,7 @@ switch($action) {
break;
}
default : {
+ /*
$text = "Please upload your files into the ".e_DOWNLOAD." folder, your images into the ".e_FILE."downloadimages folder and thumbnail images into the ".e_FILE."downloadthumbs folder.
To submit a download, first create a parent, then create a category under that parent, you will then be able to make the download available.
";
$text .= "";
@@ -68,6 +69,8 @@ switch($action) {
$text .= "
".DOWLAN_124."
";
$text .= "
".DOWLAN_122."
";
$text .= "
";
+ $text .= "
";
$text .= $tp->toHTML($mirror['url']).'
';
}
break;
diff --git a/e107_plugins/log/e_meta.php b/e107_plugins/log/e_meta.php
index 9f2abdcc2..b04ca5606 100644
--- a/e107_plugins/log/e_meta.php
+++ b/e107_plugins/log/e_meta.php
@@ -14,6 +14,7 @@
*/
if (!defined('e107_INIT')) { exit; }
+
if (isset($pref['statActivate']) && $pref['statActivate'])
{
if(!$pref['statCountAdmin'] && ADMIN)
@@ -57,9 +58,63 @@ var logString = 'referer=' + ref + '&colour=' + colord + '&eself=' + eself + '&r
logString = rstr2b64(logString);
document.write('
' );
";
- $e107 = e107::getInstance();
- $e107->getJs()->headerInline($logJS, 5);
+
+$logJS = "
+
+$(function() {
+
+ function rstr2b64(input)
+ {
+ var b64pad = \"=\"; /* base-64 pad character. \"=\" for strict RFC compliance */
+ var tab = \"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/\";
+ var output = \"\";
+ var len = input.length;
+ for(var i = 0; i < len; i += 3)
+ {
+ var triplet = (input.charCodeAt(i) << 16)
+ | (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
+ | (i + 2 < len ? input.charCodeAt(i+2) : 0);
+ for(var j = 0; j < 4; j++)
+ {
+ if(i * 8 + j * 6 > input.length * 8) output += b64pad;
+ else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
+ }
+ }
+ return output;
+ }
+
+
+
+
+
+ var ref =\"\"+escape(top.document.referrer);
+ var colord = window.screen.colorDepth;
+ var res = window.screen.width + \"x\" + window.screen.height;
+ var logString = 'referer=' + ref + '&colour=' + colord + '&eself=' + eself + '&res=' + res + '".$err_flag."';
+ logString = rstr2b64(logString);
+
+ var url = '".e_PLUGIN_ABS."log/log.php';
+ var dataText = 'lv='+logString;
+
+ $.ajax({
+ type: 'get',
+ url: url,
+ data: {'lv' :logString},
+ success: function() {
+ alert(logString);
+ }
+ });
+});
+";
+
+
+
+ if(USER_AREA)
+ {
+ $e107 = e107::getInstance();
+ $e107->getJs()->headerInline($logJS, 5);
+ }
}
diff --git a/e107_plugins/log/log.php b/e107_plugins/log/log.php
index 42d35a1a2..d1fe09628 100644
--- a/e107_plugins/log/log.php
+++ b/e107_plugins/log/log.php
@@ -25,7 +25,7 @@
// Normally the file is 'silent' - if any errors occur, not sure where they'll appear - (file type now text/html instead of text/css)
*/
-error_reporting(0);
+//error_reporting(0);
define('log_INIT', TRUE);
// Array of page names which should have individual query values recorded.
diff --git a/e107_themes/templates/admin_icons_template.php b/e107_themes/templates/admin_icons_template.php
index 23fa4caea..777be80a0 100644
--- a/e107_themes/templates/admin_icons_template.php
+++ b/e107_themes/templates/admin_icons_template.php
@@ -66,56 +66,56 @@
define("ADMIN_SORT_ICON_PATH", e_IMAGE."admin_images/sort_16.png");
*/
+
+
+
+
+ //XXX Do NOT use 'title' attributes - these should go in the
+
+ define("ADMIN_TRUE_ICON", " ![](".e_IMAGE_ABS."admin_images/execute_16.png "Run")
");
+// define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_16.png"); //XXX DEPRECATED
+// define("ADMIN_SORT_ICON", "![](".e_IMAGE_ABS."admin_images/sort_16.png "Sort")
");
- define("ADMIN_EDIT_ICON", "![](".e_IMAGE_ABS."admin_images/edit_16.png "\".LAN_EDIT.\"")
");
- define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_16.png");
-
- define("ADMIN_DELETE_ICON", "![](".e_IMAGE_ABS."admin_images/delete_16.png "\".LAN_DELETE.\"")
");
- define("ADMIN_DELETE_ICON_PATH", e_IMAGE_ABS."admin_images/delete_16.png");
-
- define("ADMIN_UP_ICON", "![](".e_IMAGE_ABS."admin_images/up_16.png "\".LAN_DELETE.\"")
");
- define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png");
-
- define("ADMIN_DOWN_ICON", "![](".e_IMAGE_ABS."admin_images/down_16.png "\".LAN_DELETE.\"")
");
- define("ADMIN_DOWN_ICON_PATH", e_IMAGE_ABS."admin_images/down_16.png");
-
- define("ADMIN_WARNING_ICON", "");
- define("ADMIN_WARNING_ICON_PATH", e_IMAGE_ABS."admin_images/warning_16.png");
-
- define("ADMIN_INFO_ICON", "");
- define("ADMIN_INFO_ICON_PATH", e_IMAGE_ABS."admin_images/info_16.png");
-
- define("ADMIN_CONFIGURE_ICON", "");
- define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE_ABS."admin_images/configure_16.png");
-
- define("ADMIN_ADD_ICON", "");
- define("ADMIN_ADD_ICON_PATH", e_IMAGE_ABS."admin_images/add_16.png");
-
- define("ADMIN_VIEW_ICON", "");
- define("ADMIN_VIEW_ICON_PATH", e_IMAGE_ABS."admin_images/admin_images/search_16.png");
-
- define("ADMIN_URL_ICON", "");
- define("ADMIN_URL_ICON_PATH", e_IMAGE_ABS."admin_images/forums_16.png");
-
- define("ADMIN_INSTALLPLUGIN_ICON", "");
- define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_install_16.png");
-
- define("ADMIN_UNINSTALLPLUGIN_ICON", "");
- define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_unstall_16.png");
-
- define("ADMIN_UPGRADEPLUGIN_ICON", "");
- define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png");
-
- define("ADMIN_EXECUTE_ICON", "