<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -14,25 +14,44 @@
 				echo '		&lt;link rel=&quot;stylesheet&quot; href=&quot;'.$config-&gt;chyrp_url.'/modules/swfupload/style.css&quot; type=&quot;text/css&quot; media=&quot;screen&quot; title=&quot;no title&quot; charset=&quot;utf-8&quot; /&gt;'.&quot;\n&quot;;
 				echo '		&lt;script type=&quot;text/javascript&quot;&gt;'.&quot;\n&quot;;
 				echo &quot;			$(function(){\n&quot;;
-				foreach ($this-&gt;insert_swfupload as $id =&gt; $extensions) {
+				foreach ($this-&gt;insert_swfupload as $id =&gt; $options) {
+					$upload_url                   = $config-&gt;chyrp_url.&quot;/modules/swfupload/upload_handler.php&quot;;
+					$flash_url                    = $config-&gt;chyrp_url.&quot;/modules/swfupload/lib/FlashDevelop/Flash9/swfupload_f9.swf&quot;;
+					$file_types                   = &quot;*&quot;;
+					$file_types_description       = &quot;All Files&quot;;
+					$debug                        = false;
+					$file_queue_error_handler     = &quot;fileQueueError&quot;;
+					$file_dialog_complete_handler = &quot;fileDialogComplete&quot;;
+					$upload_start_handler         = &quot;uploadStart&quot;;
+					$upload_progress_handler      = &quot;uploadProgress&quot;;
+					$upload_error_handler         = &quot;uploadError&quot;;
+					$upload_success_handler       = &quot;uploadSuccess&quot;;
+					$upload_complete_handler      = &quot;uploadComplete&quot;;
+
+					if (is_string($options))
+						$file_types = $options;
+					else
+						foreach ($options as $key =&gt; $val)
+							$$key = $val;
+
 					echo '				$(&quot;#'.$id.'&quot;).replaceWith(&quot;&lt;input type=\&quot;button\&quot; value=\&quot;Upload\&quot; class=\&quot;swfupload_button\&quot; id=\&quot;'.$id.'\&quot; /&gt;&quot;)'.&quot;\n&quot;;
 					echo &quot;				&quot;.$id.&quot; = new SWFUpload({\n&quot;;
-					echo '					upload_url : &quot;'.$config-&gt;chyrp_url.'/modules/swfupload/upload_handler.php&quot;,'.&quot;\n&quot;;
-					echo '					flash_url : &quot;'.$config-&gt;chyrp_url.'/modules/swfupload/lib/FlashDevelop/Flash9/swfupload_f9.swf&quot;,'.&quot;\n&quot;;
+					echo '					upload_url : &quot;'.$upload_url.'&quot;,'.&quot;\n&quot;;
+					echo '					flash_url : &quot;'.$flash_url.'&quot;,'.&quot;\n&quot;;
 					echo '					post_params: {&quot;PHPSESSID&quot; : &quot;'.session_id().'&quot;, &quot;PHPSESSNAME&quot; : &quot;'.session_name().'&quot;, &quot;ajax&quot; : &quot;true&quot; },'.&quot;\n&quot;;
 					echo '					file_size_limit : &quot;100 MB&quot;,'.&quot;\n&quot;;
-					echo '					file_types : &quot;'.$extensions.'&quot;,'.&quot;\n&quot;;
-					echo '					file_types_description : &quot;All Files&quot;,'.&quot;\n&quot;;
-					#echo '					debug: true,'.&quot;\n&quot;;
-                    echo '					'.&quot;\n&quot;;
-					echo '					// The event handler functions are defined in handlers.js'.&quot;\n&quot;;
-					echo '					file_queue_error_handler : fileQueueError,'.&quot;\n&quot;;
-					echo '					file_dialog_complete_handler : fileDialogComplete,'.&quot;\n&quot;;
-					echo '					upload_start_handler : uploadStart,'.&quot;\n&quot;;
-					echo '					upload_progress_handler : uploadProgress,'.&quot;\n&quot;;
-					echo '					upload_error_handler : uploadError,'.&quot;\n&quot;;
-					echo '					upload_success_handler : uploadSuccess,'.&quot;\n&quot;;
-					echo '					upload_complete_handler : uploadComplete'.&quot;\n&quot;;
+					echo '					file_types : &quot;'.$file_types.'&quot;,'.&quot;\n&quot;;
+					echo '					file_types_description : &quot;'.$file_types_description.'&quot;,'.&quot;\n&quot;;
+					if ($debug)
+						echo '					debug: true,'.&quot;\n&quot;;
+					echo '					'.&quot;\n&quot;;
+					echo '					file_queue_error_handler : '.$file_queue_error_handler.','.&quot;\n&quot;;
+					echo '					file_dialog_complete_handler : '.$file_dialog_complete_handler.','.&quot;\n&quot;;
+					echo '					upload_start_handler : '.$upload_start_handler.','.&quot;\n&quot;;
+					echo '					upload_progress_handler : '.$upload_progress_handler.','.&quot;\n&quot;;
+					echo '					upload_error_handler : '.$upload_error_handler.','.&quot;\n&quot;;
+					echo '					upload_success_handler : '.$upload_success_handler.','.&quot;\n&quot;;
+					echo '					upload_complete_handler : '.$upload_complete_handler.''.&quot;\n&quot;;
 					echo '				})'.&quot;\n&quot;;
 
 					echo '				$(&quot;#'.$id.'&quot;).click(function(){'.&quot;\n&quot;;
@@ -41,22 +60,6 @@
 				}
 				echo &quot;			})\n&quot;;
 				echo &quot;		&lt;/script&gt;\n&quot;;
-				echo '		&lt;style type=&quot;text/css&quot;&gt;'.&quot;\n&quot;;
-				echo '			#progress {'.&quot;\n&quot;;
-				echo '				background: #fff;'.&quot;\n&quot;;
-				echo '				padding: 1px;'.&quot;\n&quot;;
-				echo '				border: 1px solid #ddd;'.&quot;\n&quot;;
-				echo '				display: none;'.&quot;\n&quot;;
-				echo '			}'.&quot;\n&quot;;
-				echo '			#progress .back {'.&quot;\n&quot;;
-				echo '				background: #f0f0f0;'.&quot;\n&quot;;
-				echo '			}'.&quot;\n&quot;;
-				echo '			#progress .fill {'.&quot;\n&quot;;
-				echo '				background-color: #5fb904;'.&quot;\n&quot;;
-				echo '				height: 24px;'.&quot;\n&quot;;
-				echo '				width: 0;'.&quot;\n&quot;;
-				echo '			}'.&quot;\n&quot;;
-				echo '		&lt;/style&gt;'.&quot;\n&quot;;
 			}
 		}
 </diff>
      <filename>modules/swfupload/swfupload.php</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>c69603c4ac41d11e6a3d9135c6454ed1e8cbc7db</id>
    </parent>
  </parents>
  <author>
    <name>Alex Suraci</name>
    <email>i.am@toogeneric.com</email>
  </author>
  <url>http://github.com/vito/chyrp/commit/1203fa4e51119f191077cfe378f5dce80f78faae</url>
  <id>1203fa4e51119f191077cfe378f5dce80f78faae</id>
  <committed-date>2008-08-16T22:43:08-07:00</committed-date>
  <authored-date>2008-08-16T22:43:08-07:00</authored-date>
  <message>Increased flexibility of the SWFUpload module. [#176 state:resolved]</message>
  <tree>0f4e38166fa2def4b4313f9a74ee0a4b37ff8948</tree>
  <committer>
    <name>Alex Suraci</name>
    <email>i.am@toogeneric.com</email>
  </committer>
</commit>
