";
$text .= $frm->checkbox("e-mymenus[]", $row['menu_name'], $checked);
$text .= $row['menu_name'];
diff --git a/e107_handlers/mysql_class.php b/e107_handlers/mysql_class.php
index 0e6cc374c..e89b57536 100644
--- a/e107_handlers/mysql_class.php
+++ b/e107_handlers/mysql_class.php
@@ -9,8 +9,8 @@
* mySQL Handler
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/mysql_class.php,v $
- * $Revision: 1.46 $
- * $Date: 2009-09-05 18:58:56 $
+ * $Revision: 1.47 $
+ * $Date: 2009-09-05 23:02:23 $
* $Author: e107coders $
*/
@@ -61,7 +61,7 @@ $db_ConnectionID = NULL; // Stores ID for the first DB connection used - which s
* MySQL Abstraction class
*
* @package e107
-* @version $Revision: 1.46 $
+* @version $Revision: 1.47 $
* @author $Author: e107coders $
*/
class db {
@@ -838,8 +838,10 @@ class db {
function db_Select_gen($query, $debug = FALSE, $log_type = '', $log_remark = '')
{
$this->tabset = FALSE;
+ $query .= " "; // temp fix for failing regex below, when there is no space after the table name;
+
if(strpos($query,'`#') !== FALSE)
- {
+ {
$query = preg_replace_callback("/\s`#([\w]*?)`\W/", array($this, 'ml_check'), $query);
}
elseif(strpos($query,'#') !== FALSE)
@@ -865,7 +867,7 @@ class db {
}
function ml_check($matches)
- {
+ {
$table = $this->db_IsLang($matches[1]);
if($this->tabset == false)
{
diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php
index 127484223..a459762d4 100644
--- a/e107_handlers/xml_class.php
+++ b/e107_handlers/xml_class.php
@@ -9,8 +9,8 @@
* Simple XML Parser
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/xml_class.php,v $
- * $Revision: 1.21 $
- * $Date: 2009-09-03 22:27:32 $
+ * $Revision: 1.22 $
+ * $Date: 2009-09-05 23:02:23 $
* $Author: e107coders $
*/
@@ -27,6 +27,7 @@ if (!defined('e107_INIT')) { exit; }
*/
class xmlClass
{
+
/**
* Loaded XML string
*
@@ -65,6 +66,19 @@ class xmlClass
*/
public $stripComments = true;
+ /**
+ * Log of all paths replaced.
+ * @var
+ */
+ public $fileConvertLog = array();
+
+ public $convertFilePaths = FALSE;
+
+ public $filePathDestination = FALSE;
+
+ public $convertFileTypes = array("jpg","gif","png","jpeg");
+
+
/**
* Add root element to the result array
* Exmple:
@@ -121,6 +135,10 @@ class xmlClass
*/
protected $_optValueKey = '@value';
+
+
+
+
/**
* Constructor - set defaults
*
@@ -526,9 +544,26 @@ class xmlClass
return false;
}
+ function replaceFilePaths($text)
+ {
+ $fullpath = e107::getParser()->replaceConstants($text[1]);
+ $this->fileConvertLog[] = $fullpath;
+ $file = basename($fullpath);
+
+ return $this->filePathDestination.$file;
+
+ }
+
+
private function e107ExportValue($val)
{
+ if($this->convertFilePaths)
+ {
+ $types = implode("|",$this->convertFileTypes);
+ $val = preg_replace_callback("#({e_.*?\.(".$types."))#i", array($this,'replaceFilePaths'), $val);
+ }
+
if(is_array($val))
{
return "WriteArray($val,FALSE)."]]>";
@@ -604,17 +639,33 @@ class xmlClass
if($debug==TRUE)
{
- echo "
".htmlentities($text)."
";
+ echo "
".htmlentities($text)."
";
+ return TRUE;
}
else
{
+ if(!$text)
+ {
+ return FALSE;
+ }
+
+ $path = e107::getParser()->replaceConstants($this->filePathDestination);
+ if($path)
+ {
+ file_put_contents($path."install.xml",$text,FILE_TEXT);
+ return true;
+ }
+
header('Content-type: application/xml', TRUE);
header("Content-disposition: attachment; filename= e107Export_" . date("Y-m-d").".xml");
header("Cache-Control: max-age=30");
header("Pragma: public");
echo $text;
- exit;
+ exit;
+
}
+
+
}
/**