";
while (list($key, $icon) = each($iconlist)) {
@@ -1659,9 +1659,9 @@ class download
";
$text .= DOWLAN_140."
";
@@ -1828,7 +1828,7 @@ class download
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index b7037e45e..8930f04e8 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -158,7 +158,7 @@ class pluginmanager_form extends e_form
}
else
{
- // $text .= "
plug['plugin_id']}'\" title='".EPL_ADLAN_0."' value='".EPL_ADLAN_0."' />";
+ // $text .= "
plug['plugin_id']}'\" title='".EPL_ADLAN_0."' value='".EPL_ADLAN_0."' />";
// $text .= "
plug['plugin_id']}'\">".EPL_ADLAN_0." ";
$text .= "
plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON." ";
}
@@ -182,7 +182,7 @@ class pluginmanager_form extends e_form
if ($this->plug['plugin_version'] != $this->plug_vars['@attributes']['version'] && $this->plug['plugin_installflag'])
{
- // $text .= "
plug['plugin_id']}'\" title='".EPL_UPGRADE." to v".$this->plug_vars['@attributes']['version']."' value='".EPL_UPGRADE."' />";
+ // $text .= "
plug['plugin_id']}'\" title='".EPL_UPGRADE." to v".$this->plug_vars['@attributes']['version']."' value='".EPL_UPGRADE."' />";
$text .= "
plug_vars['@attributes']['version']."\" >".ADMIN_UPGRADEPLUGIN_ICON." ";
}
@@ -1218,7 +1218,7 @@ class pluginManager{
}
else
{
- // $text .= "
";
+ // $text .= "
";
// $text .= "
".EPL_ADLAN_0." ";
$text .= "
".ADMIN_INSTALLPLUGIN_ICON." ";
}
@@ -1241,7 +1241,7 @@ class pluginManager{
if ($plug['plugin_version'] != $plug_vars['@attributes']['version'] && $plug['plugin_installflag'])
{
- // $text .= "
";
+ // $text .= "
";
$text .= "
".ADMIN_UPGRADEPLUGIN_ICON." ";
}
@@ -1449,8 +1449,8 @@ class pluginManager{
$text .= $frm->admin_button('uninstall_cancel',EPL_ADLAN_62,'cancel');
/*
- $text .= "
-
";
+ $text .= "
+
";
*/
// $frm->admin_button($name, $value, $action = 'submit', $label = '', $options = array());
diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php
index 0eb511761..a4c4b038e 100644
--- a/e107_admin/userclass2.php
+++ b/e107_admin/userclass2.php
@@ -540,8 +540,8 @@ if($params == 'edit')
{
$text .= $frm->admin_button('createclass', UCSLAN_14, 'create');
$text .= $frm->admin_button('updatecancel', LAN_CANCEL, 'cancel');
- // $text .= "
";
- // $text .= "
";
+ // $text .= "
";
+ // $text .= "
";
$text .= "
";
@@ -550,8 +550,8 @@ else
{
$text .= $frm->admin_button('createclass', UCSLAN_15, 'create');
$text .= $frm->admin_button('updatecancel', LAN_CANCEL, 'cancel');
- // $text .= "
- //
";
+ // $text .= "
+ //
";
$text .= "
";
}
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 26faa2184..38904df5e 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -1058,6 +1058,7 @@ class e107
*/
public static function getScBatch($className, $pluginName = null, $overrideClass = null)
{
+ //FIXME URGENT - Check for WRAPPER in template, and place into class.
if(is_string($overrideClass)) $overrideClass .= '_shortcodes';
return self::getScParser()->getScObject($className.'_shortcodes', $pluginName, $overrideClass);
}
@@ -2129,6 +2130,11 @@ class e107
$var = strtoupper($id).'_TEMPLATE';
$regPathInfo = $reg_path.'/info';
$var_info = strtoupper($id).'_INFO';
+
+ $wrapper = strtoupper($id).'_WRAPPER'; // see contact_template.php
+
+ //FIXME XXX URGENT - Add support for _WRAPPER and $sc_style BC. - save in registry and retrieve in getScBatch()?
+ // Use: list($pre,$post) = explode("{---}",$text,2);
if(null === self::getRegistry($regPath))
{
@@ -2145,6 +2151,7 @@ class e107
{
return $ret;
}
+
return ($ret && is_array($ret) && isset($ret[$key]) ? $ret[$key] : '');
}
diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php
index 6eb51665f..2fdf3b2a1 100644
--- a/e107_handlers/mailout_admin_class.php
+++ b/e107_handlers/mailout_admin_class.php
@@ -984,7 +984,7 @@ class mailoutAdminClass extends e107MailManager
$text .= $frm->hidden('mail_source_id',$email_id);
$text .= $frm->admin_button('update_email',LAN_UPDATE);
//$text .= "
";
- //$text .= "
";
+ //$text .= "
";
}
else
{
@@ -1386,14 +1386,14 @@ class mailoutAdminClass extends e107MailManager
$text .= $frm->admin_button('email_sendnow',"Send Now");
$text .= $frm->admin_button('email_send',"Send Later");
- // $text .= "
";
+ // $text .= "
";
if (!$fromHold)
{
$text .= $frm->admin_button('email_hold',LAN_HOLD);
$text .= $frm->admin_button('email_cancel',LAN_CANCEL);
- // $text .= "
";
- // $text .= "
";
+ // $text .= "
";
+ // $text .= "
";
}
$text .= "
diff --git a/e107_handlers/user_select_class.php b/e107_handlers/user_select_class.php
index 204245726..9e365436c 100644
--- a/e107_handlers/user_select_class.php
+++ b/e107_handlers/user_select_class.php
@@ -221,7 +221,7 @@ class user_select
diff --git a/e107_plugins/banner/config.php b/e107_plugins/banner/config.php
index d420c7bcc..7fb6e4ae8 100644
--- a/e107_plugins/banner/config.php
+++ b/e107_plugins/banner/config.php
@@ -144,7 +144,7 @@ for($a = 0; $a <= ($c-1); $a++) {
}
$catidvalues = substr($catidvalues, 0, -1);
$text .= "
diff --git a/e107_plugins/calendar_menu/admin_config.php b/e107_plugins/calendar_menu/admin_config.php
index 05d2de6d1..ba3fc7a2f 100644
--- a/e107_plugins/calendar_menu/admin_config.php
+++ b/e107_plugins/calendar_menu/admin_config.php
@@ -520,7 +520,7 @@ if($action == 'cat')