diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 0311cd50d..7f537e770 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -2602,13 +2602,13 @@ class pluginBuilder
foreach($list as $addon)
{
-
+ $addonDest = str_replace("_blank",$this->pluginName,$addon);
$source = e_PLUGIN."_blank/".$addon.".php";
- $destination = e_PLUGIN.$this->pluginName. "/".$addon.".php";
+ $destination = e_PLUGIN.$this->pluginName. "/".$addonDest.".php";
if(file_exists($destination))
{
- $result[] = "Skipped (already exists) : ".$addon;
+ $result[] = "Skipped (already exists) : ".$addonDest;
continue;
}
@@ -2620,12 +2620,12 @@ class pluginBuilder
{
if(file_put_contents($destination,$content))
{
- $result[] = LAN_CREATED." : ".$addon;
+ $result[] = LAN_CREATED." : ".$addonDest;
}
}
else
{
- $result[] = "Skipped (already exists) : ".$addon;
+ $result[] = "Skipped (already exists) : ".$addonDest;
}
}
else
@@ -2649,12 +2649,24 @@ class pluginBuilder
$frm = e107::getForm();
$text = "
";
- $setupDiz = "Create default table data during install, upgrade, uninstall etc";
- array_unshift($list,$this->pluginName.'_setup');
+ //Todo LANS
+ $dizOther = array(
+ '_blank' => "Simple frontend script",
+ '_blank_setup' => "Create default table data during install, upgrade, uninstall etc",
+ '_blank_menu' => "Menu item for use in the menu manager."
+ );
+
+ array_unshift($list,'_blank', '_blank_setup', '_blank_menu');
$templateFiles = scandir(e_PLUGIN."_blank");
+
+
+ //print_a($list);
+ // $list[] = "_blank";
+ // $list[] = "_blank_setup";
+
foreach($list as $v)
{
@@ -2663,12 +2675,13 @@ class pluginBuilder
continue;
}
-
- $diz = ($v == $this->pluginName.'_setup') ? $setupDiz : $plg->getAddonsDiz($v);
+ $diz = !empty($dizOther[$v]) ? $dizOther[$v] : $plg->getAddonsDiz($v);
+ $label = str_replace("_blank", $this->pluginName, $v);
+ $id = str_replace('_blank', 'blank', $v);
$text .= "";
- $text .= "".$frm->checkbox('addons[]',$v,false, $v)." | ";
- $text .= " | ";
+ $text .= "".$frm->checkbox('addons[]',$v,false,$label)." | ";
+ $text .= " | ";
$text .= "
";
}
@@ -2915,7 +2928,7 @@ class pluginBuilder
$required = true;
$size = 130;
$placeholder= " ";
- $pattern = "[A-Za-z \.0-9]*";
+ $pattern = "[A-Za-z -\.0-9]*";
$xsize = 'block-level';
break;
@@ -2940,7 +2953,7 @@ class pluginBuilder
$required = true;
$size = 100;
$placeholder = " ";
- $pattern = "[A-Za-z \.0-9]*";
+ $pattern = "[A-Za-z -\.0-9]*";
$xsize = 'block-level';
break;
diff --git a/e107_plugins/_blank/_blank.php b/e107_plugins/_blank/_blank.php
index 48c63fdf9..f21439d69 100644
--- a/e107_plugins/_blank/_blank.php
+++ b/e107_plugins/_blank/_blank.php
@@ -9,36 +9,63 @@
* e107 Blank Plugin
*
*/
-require_once("../../class2.php");
-
-
-e107::js('_blank','js/my.js','jquery'); // Load Plugin javascript and include jQuery framework
-e107::css('_blank','css/my.css'); // load css file
-e107::lan('_blank'); // load language file ie. e107_plugins/_blank/languages/English.php
-e107::meta('keywords','some words'); // add meta data to
-
-require_once(HEADERF); // render the header (everything before the main content area)
-
-
-$sql = e107::getDB(); // mysql class object
-$tp = e107::getParser(); // parser for converting to HTML and parsing templates etc.
-$frm = e107::getForm(); // Form element class.
-$ns = e107::getRender(); // render in theme box.
-
-$text = "";
-
-if($rows = $sql->retrieve('blank','*',false,'',true)) // combined select and fetch function - returns an array.
+if (!defined('e107_INIT'))
{
- // print_a($rows);
- foreach($rows as $key=>$value) // loop throug
+ require_once("../../class2.php");
+}
+
+
+
+class _blank_front
+{
+
+ function __construct()
{
- $text .= $tp->toHtml($value['blank_type'])."
";
+ e107::js('_blank','js/my.js','jquery'); // Load Plugin javascript and include jQuery framework
+ e107::css('_blank','css/my.css'); // load css file
+ e107::lan('_blank'); // load language file ie. e107_plugins/_blank/languages/English.php
+ e107::meta('keywords','some words'); // add meta data to
+
}
-
- $ns->tablerender("My Caption", $text);
+
+
+ public function run()
+ {
+
+ $sql = e107::getDB(); // mysql class object
+ $tp = e107::getParser(); // parser for converting to HTML and parsing templates etc.
+ $frm = e107::getForm(); // Form element class.
+ $ns = e107::getRender(); // render in theme box.
+
+ $text = '';
+
+ if($rows = $sql->retrieve('blank','*',false,'',true)) // combined select and fetch function - returns an array.
+ {
+ // print_a($rows);
+ foreach($rows as $key=>$value) // loop throug
+ {
+ $text .= $tp->toHtml($value['blank_type'])."
";
+ }
+
+ $ns->tablerender("My Caption", $text);
+
+ }
+
+
+
+ }
+
+
+
+
+
}
+
+$_blankFront = new _blank_front;
+require_once(HEADERF); // render the header (everything before the main content area)
+$_blankFront->run();
require_once(FOOTERF); // render the footer (everything after the main content area)
exit;
diff --git a/e107_plugins/_blank/_blank_menu.php b/e107_plugins/_blank/_blank_menu.php
new file mode 100644
index 000000000..a1472d00d
--- /dev/null
+++ b/e107_plugins/_blank/_blank_menu.php
@@ -0,0 +1,35 @@
+tablerender("_blank", $text);
+
+
+
+
+
+
+?>
\ No newline at end of file