svn commit: r1773302 - /vcl/trunk/web/.ht-inc/image.php

[jfthomps]

Author: jfthomps
Date: Thu Dec  8 21:47:47 2016
New Revision: 1773302

URL: http://svn.apache.org/viewvc?rev=1773302&view=rev
Log:
VCL-1005 - allow dashes in image names

image.php: modified addEditDialogHTML and validateResourceData: changed error 
message and regexp to allow dashes

Modified:
    vcl/trunk/web/.ht-inc/image.php

Modified: vcl/trunk/web/.ht-inc/image.php
URL: 
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1773302&r1=1773301&r2=1773302&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Thu Dec  8 21:47:47 2016
@@ -349,8 +349,8 @@ class Image extends Resource {
                if(! $add)
                        $h .= "<div style=\"width: 80%; margin-left: 10%; 
overflow: auto; height: 80%;\">\n";
                # name
-               $errmsg = i("Name cannot contain dashes (-), single (') or 
double (&quot;) quotes, less than (&lt;), or greater than (&gt;) and can be 
from 2 to 60 characters long");
-               $h .= labeledFormItem('name', i('Name'), 'text', 
'^([A-Za-z0-9!@#$%^&\*\(\)_=\+\[\]{}\\\|:;,\./\?~` ]){2,60}$',
+               $errmsg = i("Name cannot contain single (') or double (&quot;) 
quotes, less than (&lt;), or greater than (&gt;) and can be from 2 to 60 
characters long");
+               $h .= labeledFormItem('name', i('Name'), 'text', 
'^([-A-Za-z0-9!@#$%^&\*\(\)_=\+\[\]{}\\\|:;,\./\?~` ]){2,60}$',
                                      1, '', $errmsg); 
                # owner
                $extra = array('onKeyPress' => 'setOwnerChecking');
@@ -1654,10 +1654,10 @@ class Image extends Resource {
                        $return['mode'] = 'edit';
 
                $errormsg = array();
-               if(preg_match("/[-'\"]/", $return["name"]) ||
+               if(preg_match("/['\"]/", $return["name"]) ||
                        strlen($return["name"]) > 60 || strlen($return["name"]) 
< 2) {
                        $return['error'] = 1;
-                       $errormsg[] = i("Name must be from 2 to 60 characters 
and cannot contain any dashes (-), single (') or double (\") quotes.");
+                       $errormsg[] = i("Name must be from 2 to 60 characters 
and cannot contain any single (') or double (\") quotes.");
                }
                elseif(! preg_match('/^[\x20-\x7E]+$/', $return["name"])) {
                        $return['error'] = 1;