![]("+urlAssets + "/images/"+json.status+".png)
" + name + " ";
- $.each(json["errors"], function(k,v) {
- p += v;
- });
- p += "
";
+ if (json != null) {
+ css = (json.response["_result"] == 'error') ? "failure" : "success";
+ p += "![]("+urlAssets + "/images/"+css+".png)
" + name + " ";
+ if (json.response["_result"] == "error") {
+ $.each(json.response, function(k,v) {
+ if (k != "_result" && k != "message" && k != "post-values") {
+ field = $("form *[name='fields["+k+"]']");
+ if (errorsInQueue || field.attr('type') == 'file') {
+ p += v._message + " ";
+ }
+ else {
+ // highlight the fields that have errors
+ // if (v._type == "missing") {
+ field = field.parents("label");
+ console.log(field);
+ if (field.parent().attr('id') != 'error') {
+ // field.children(":first").attr("name") + " " + v;
+ field.wrap("");
+ field.parent().append("
" + v._message + "
"); + } + } + } + }); + } + p += ""; + } + else { + p += "An unknown error occurred."; + } $("#file_list").show(); $('p#'+id).replaceWith(p); + }, onFinish: function(total) { failed = $("#MUU-list.failure").size(); total = failed + $("#MUU-list.success").size(); success = total - failed; p = " 0) {
p += "success\">" + Symphony.Language.get('Successfully added a whole slew of entries, {$total} to be exact.', { 'total': total });
p += " \
"+Symphony.Language.get("Create more?")+" \
- "+Symphony.Language.get("View all Entries")+"";
+ "+Symphony.Language.get("View all Entries")+"";
+ // reset the form here maybe
}
else {
p += "error\">" + Symphony.Language.get('Some errors were encountered while attempting to save.');
if (success > 0)
- p += " " + Symphony.Language.get('But {$total} entries were successfully added.', { 'total' : success});
+ p += " " + Symphony.Language.get('However, {$total} entries were successfully added.', { 'total' : success});
$("#file_list")
.animate({ backgroundColor: "#eeee55", opacity: 1.0 }, 200)
.animate({ backgroundColor: "transparent", opacity: 1.0}, 350);
@@ -159,10 +187,10 @@
});
}
else if (fileField.size() > 1) {
- console.log("MUU doesn't work with multiple upload fields");
+ console.log("The Mass Upload Utility doesn't work with multiple upload fields.");
}
else {
- console.log("No upload fields detected");
+ console.log("No upload fields detected.");
}
});
diff --git a/content/content.index.php b/content/content.index.php
index c7de71f..71e8629 100644
--- a/content/content.index.php
+++ b/content/content.index.php
@@ -3,6 +3,9 @@
require_once(TOOLKIT . '/class.administrationpage.php');
require_once(TOOLKIT . '/class.sectionmanager.php');
require_once(TOOLKIT . '/class.entrymanager.php');
+ require_once(CORE . '/class.frontend.php');
+ require_once(EXTENSIONS . '/massuploadutility/events/event.mass_upload_utility_entry.php');
+ require_once(EXTENSIONS . '/massuploadutility/lib/class.xmltoarray.php');
/**
* Called to build the content for the page.
@@ -13,8 +16,8 @@ class contentExtensionMassUploadUtilityIndex extends AdministrationPage {
protected $_valid = false;
protected $_message = '';
- public function getSectionID() {
- $sectionManager = new SectionManager($this->_Parent);
+ public function getSectionId() {
+ $sectionManager = new SectionManager(Frontend::instance());
$section_id = $sectionManager->fetchIDFromHandle(General::sanitize($_REQUEST['MUUsource']));
@@ -24,109 +27,34 @@ public function getSectionID() {
return $section_id;
}
/**
- * ---------------------------------------------------------
- * This functionality is essentially duplicated (and slightly changed)
- * from Symphony's content.publish.php
- * in the function public function __actionNew(){
- * Should that core ever change, this needs to be as well.
*
- * _REQUEST view() are used because jquery.html5_upload.js can't deal
+ * _REQUEST in view() are used because jquery.html5_upload.js can't deal
* with extra variables in the POST
* Should this change, view() will need to be changed to action()
* ---------------------------------------------------------
*/
public function view() {
if (!isset($_REQUEST['MUUsource']) or $_REQUEST['MUUsource'] == '')
- { $this->_message = __("You didn't choose a source, perhaps you don't have any sections with an upload field in them?"); $this->__response(); }
-
- if (($section_id = $this->getSectionID()) === NULL)
- { $this->_message = __('The Section you are looking, %s for could not be found.', $this->_context['section_handle']); $this->__response(); }
- $sectionManager = new SectionManager($this->_Parent);
-
- $entryManager = new EntryManager($this->_Parent);
+ { exit; }
- $entry =& $entryManager->create();
- $entry->set('section_id', $section_id);
- $entry->set('author_id', Administration::instance()->Author->get('id'));
- $entry->set('creation_date', DateTimeObj::get('Y-m-d H:i:s'));
- $entry->set('creation_date_gmt', DateTimeObj::getGMT('Y-m-d H:i:s'));
-
- $fields = $_REQUEST['fields'];
- if ((!$this->__processFilePostData($fields)) === NULL)
- { $this->_message = __("Did you forget to upload some files?"); $this->__response(); }
-
- if(__ENTRY_FIELD_ERROR__ == $entry->checkPostData($fields, $error))
- { $this->_errors[key($error)] = $error[key($error)]; $this->__response(); }
+ if (($section_id = $this->getSectionId()) === NULL)
+ { exit; }
- // setup the data, process it
- // if(__ENTRY_OK__ != $this->setDataFromPost($entry, $fields, $this->_errors, false, false, $entries))
- elseif(__ENTRY_OK__ != $entry->setDataFromPost($fields, $error)) {
- $this->_errors[key($error)] = $error[key($error)];
- $this->__response();
- }
+ $_POST['fields'] = $_REQUEST['fields'];
+ $_POST['action'] = $_REQUEST['action'];
- else {
- Symphony::ExtensionManager()->notifyMembers('EntryPreCreate', '/publish/new/', array('section' => $section, 'entry' => &$entry, 'fields' => &$nfields));
+ $event = new Event_Mass_Upload_Utility_Entry(Frontend::instance(), array());
- $prepopulate_field_id = $prepopulate_value = NULL;
- if(isset($_POST['prepopulate'])){
- $prepopulate_field_id = array_shift(array_keys($_POST['prepopulate']));
- $prepopulate_value = stripslashes(rawurldecode(array_shift($_POST['prepopulate'])));
- }
+ // Borrowed from Nick Dunn
+ $xml = $event->load();
+ if(is_array($xml)) $xml = reset($xml);
+ if($xml instanceOf XMLElement) $xml = $xml->generate(TRUE);
- // commit the entry if we made it
- if(!$entry->commit()){
- define_safe('__SYM_DB_INSERT_FAILED__', true);
- $this->pageAlert(NULL, Alert::ERROR);
- }
- else
- {
- // keep track of it if it was inserted
- $entries[] = $entry->get('id');
- $this->_valid = true;
- Symphony::ExtensionManager()->notifyMembers('EntryPostCreate', '/publish/new/', array('section' => $section, 'entry' => $entry, 'fields' => $nfields));
- }
+ echo(json_encode(XMLToArray::convert($xml)));
- }
-
- $this->__response();
exit;
}
-
- /* main page */
-
-
- public function __processFilePostData(&$fields) {
- if(isset($_FILES['fields'])){
- $filedata = General::processFilePostData($_FILES['fields']);
-
- foreach($filedata as $handle => $data){
- if(!isset($fields[$handle])) $fields[$handle] = $data;
- elseif(isset($data['error']) && $data['error'] == 4) $fields['handle'] = NULL;
- else{
- foreach($data as $ii => $d){
- if(isset($d['error']) && $d['error'] == 4) $fields[$handle][$ii] = NULL;
- elseif(is_array($d) && !empty($d)){
-
- foreach($d as $key => $val)
- $fields[$handle][$ii][$key] = $val;
- }
- }
- }
- }
- return TRUE;
- }
- else
- return NULL;
-
- }
-
-
- private function __response() {
- echo json_encode(array("status"=>$this->_valid, "message"=>$this->_message, "errors" => $this->_errors));
- exit;
- }
}
?>
diff --git a/events/event.mass_upload_utility_entry.php b/events/event.mass_upload_utility_entry.php
index 295d4b0..bdec7c0 100644
--- a/events/event.mass_upload_utility_entry.php
+++ b/events/event.mass_upload_utility_entry.php
@@ -1,8 +1,12 @@
'http://tesoriere.com',
'email' => 'scott@tesoriere.com'),
'version' => '1.0',
- 'release-date' => '2009-11-13T11:35:07+00:00',
+ 'release-date' => '2011-05-12T11:35:07+00:00',
'trigger-condition' => 'action[api]');
}
@@ -28,8 +32,8 @@ public static function documentation(){
return '';
}
- public function load(){
- return $this->__trigger();
+ public function load(){
+ if(isset($_POST['action']['api'])) return $this->__trigger();
}
protected function __trigger(){
diff --git a/lang/lang.de.example.php b/lang/lang.de.example.php
deleted file mode 100644
index 2239301..0000000
--- a/lang/lang.de.example.php
+++ /dev/null
@@ -1,25 +0,0 @@
- 'Deutsch',
- 'author' => array(
- 'name' => 'Scott Tesoriere',
- 'email' => 'scott@tesoriere.com',
- 'website' => 'http://tesoriere.com'
- ),
- 'release-date' => '2011-05-09'
- );
-
- /**
- * Mass Upload Utility
- */
- $dictionary = array(
-
- 'Did you forget to upload some files?' =>
- '',
-
- 'You didn\'t choose a source, perhaps you don\'t have any sections with an upload field in them?' =>
- '',
-
-
- );
diff --git a/lib/class.xmltoarray.php b/lib/class.xmltoarray.php
new file mode 100644
index 0000000..8190702
--- /dev/null
+++ b/lib/class.xmltoarray.php
@@ -0,0 +1,72 @@
+
+https://github.com/nickdunn/rest_api/blob/master/lib/class.xmltoarray.php
+
+Converts a string of XML to a keyed array
+Adapted from http://mysrc.blogspot.com/2007/02/php-xml-to-array-and-backwards.html
+*/
+Class XMLToArray {
+
+ public static function convert($string) {
+ $parser = xml_parser_create();
+ xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+ xml_parse_into_struct($parser, $string, $vals, $index);
+ xml_parser_free($parser);
+
+ $return = array();
+ $ary = &$return;
+
+ foreach ($vals as $r) {
+
+ $t = $r['tag'];
+
+ if ($r['type'] == 'open' || $r['type']=='complete') {
+
+ if (isset($ary[$t])) {
+ if (isset($ary[$t][0])) {
+ $ary[$t][] = array();
+ } else {
+ $ary[$t] = array($ary[$t], array());
+ }
+ $cv = &$ary[$t][count($ary[$t])-1];
+ } else {
+ $cv = &$ary[$t];
+ }
+ if (isset($r['attributes'])) {
+ foreach ($r['attributes'] as $k => $v) {
+ $cv['_' . $k] = $v;
+ }
+ }
+ }
+
+ if ($r['type'] == 'open') {
+ //$cv[] = array();
+ $cv['_p'] = &$ary;
+ $ary = &$cv;
+ }
+ elseif ($r['type']=='complete') {
+ $cv['value'] = (isset($r['value']) ? $r['value'] : '');
+ }
+ elseif ($r['type']=='close') {
+ $ary = &$ary['_p'];
+ }
+ }
+
+ self::deleteParents($return);
+ return $return;
+ }
+
+ // Remove recursion in result array
+ private function deleteParents(&$ary) {
+ foreach ($ary as $k => $v) {
+ if ($k === '_p') {
+ unset($ary[$k]);
+ }
+ elseif (is_array($ary[$k])) {
+ self::deleteParents($ary[$k]);
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index c090d79..96b8ab2 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,7 @@
# Mass Upload Utility
-- Version: 0.9.3
-- Date: 10 May 2011
+- Version: 0.9.5
+- Date: 12 May 2011
- Requirements: Symphony 2.2
- Author: Scott Tesoriere