Merge branch 'develop' into pr/new-config-format

modules/module/module.controller.php

@@ -1242,9 +1242,14 @@ class moduleController extends module
 
 		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+		if ($vars->filter)
+		{
+			$filter = array_map('trim', explode(',',$vars->filter));
+			if (!in_array($ext, $filter))
+			{
+				return new Object(-1, 'msg_error_occured');
+			}
+		}
 
 		$vars->member_srl = $logged_info->member_srl;
 
@@ -1314,9 +1319,9 @@ class moduleController extends module
 		$args->module_filebox_srl = $vars->module_filebox_srl;
 		$args->comment = $vars->comment;
 
-		// FIXME $args ??
-
-		return executeQuery('module.updateModuleFileBox', $vars);
+		return executeQuery('module.updateModuleFileBox', $args);
+		$output->add('save_filename', $save_filename);
+		return $output;
 	}
 
 

modules/module/schemas/module_filebox.xml

@@ -4,6 +4,6 @@
     <column name="filename" type="varchar" size="250" notnull="notnull" />
     <column name="fileextension" type="varchar" size="4" notnull="notnull" index="idx_fileextension" />
     <column name="filesize" type="number" size="11" default="0" notnull="notnull" />
-    <column name="comment" type="varchar" size="250" />
+    <column name="comment" type="bigtext" />
     <column name="regdate" type="date" />
-</table>
+</table>

modules/module/tpl/adminFileBox.html

@@ -63,6 +63,8 @@
 						</object>
 					<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
 						<img src="{getUrl('')}{$val->filename}" style="max-height:60px" />
+					<!--@else-->
+						<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
 					<!--@end-->
 				</td>
 				<td>

modules/module/tpl/filebox_list.html

@@ -26,6 +26,8 @@
 						
 					<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
 					<img src="{getUrl('')}{$val->filename}" width="100" height="100" />
+					<!--@else-->
+						<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
 					<!--@end-->
 				</div>
 			</td>

modules/module/tpl/filebox_list_html.html

@@ -17,6 +17,8 @@
 					</object>
 				<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
 					<img src="{getUrl('')}{$val->filename}" class="filebox_item" />
+				<!--@else-->
+					<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
 				<!--@end-->
 			</td>
 			<td>

modules/module/tpl/skin_config.html

@@ -117,7 +117,7 @@
 					<!--// colorpicker-->
 					<div cond="$val->type == 'colorpicker'">
 						{@ $use_colorpicker = true; }
-						<input type="text" class="color-indicator" name="{$val->name}" id="{$val->name}" value="{$val->value}" />
+						<input type="color" class="rx-spectrum" name="{$val->name}" id="{$val->name}" value="{$val->value}" />
 						<p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p>
 					</div>
 					<a href="#about_{$val->name}" data-toggle class="x_icon-question-sign" cond="$val->description" style="vertical-align:top;margin-top:5px"|cond="$val->type == 'textarea'">{$lang->help}</a>
@@ -132,5 +132,5 @@
 	</div>
 </form>
 <!--@if($use_colorpicker)-->
-	<!--%load_js_plugin("ui.colorpicker")-->
+	<!--%load_js_plugin("spectrum")-->
 <!--@end-->