Merge commit '0ca5fea0cc893684982894e474a00176853535e6' into cweiske

* commit '0ca5fea0cc893684982894e474a00176853535e6':
  fix missing space in company address
  hide counter reset
  support non-http URLs in labeledURI fields (e.g. xmpp or mailto)
  support multiple URLs

Conflicts:
	inc/functions.php

diff --git a/inc/fields.php b/inc/fields.php
index 25e05085be232fc0d4e70e03a7b528438ad54ab4..0c236be696a51d1d33b7c4cf5938f15719736cc2 100644 (file)
--- a/inc/fields.php
+++ b/inc/fields.php
@@ -38,7 +38,7 @@ $FIELDS = array(
     'homephone'    => 'homePhone',
     'homestreet'   => 'homePostalAddress',
     'photo'        => 'jpegPhoto',
-    'url'          => 'labeledURI',
+    '_url'         => 'labeledURI',
     'note'         => 'description',
     'manager'      => 'manager',                     // aka. key account
     '_mail'        => 'mail',

diff --git a/inc/functions.php b/inc/functions.php
index 301148c63b91a53693e4cf6f29e3667dd3b54297..2032a037e9a888e57c3d4361d7fd85dbd5e557dd 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -526,4 +526,3 @@ function get_fields_from_template($tpl){
     return $return;
 }
 
-?>

diff --git a/inc/smarty/plugins/modifier.http.php b/inc/smarty/plugins/modifier.http.php
index ecb52e76b0f9df53b79f7fdc2c25b22e4d4579e2..f55ccb96dc30d2d8d571a85474cc27038371de61 100644 (file)
--- a/inc/smarty/plugins/modifier.http.php
+++ b/inc/smarty/plugins/modifier.http.php
@@ -22,8 +22,8 @@ function smarty_modifier_http($string){
     list($url,$name) = explode(' ',$string,2);
 
 
-    if(!preg_match('#^\w+://#',$url)){
-        $url = 'http://'.$url;
+    if(!parse_url($url, PHP_URL_SCHEME)) {
+        $url = 'http://' . $url;
     }
 
     if(!$name) $name = $url;

diff --git a/templates/entry_edit.tpl b/templates/entry_edit.tpl
index ddad5dc60c7e868f2d25d932c2885f74effd1d09..9f9fe52b452397d2142937853a4c9973a4a19141 100644 (file)
--- a/templates/entry_edit.tpl
+++ b/templates/entry_edit.tpl
@@ -216,13 +216,20 @@
         <tr>
           <td colspan="2"><h3>{$lang.communication}</h3></td>
         </tr>
-{if $fields.url}
+{if $fields._url}
+        {foreach from=$entry.url|smarty:nodefaults item=url}
         <tr>
-          <th>{$lang.url}:</th>
-          <td><input type="text" class="input" name="entry[url]" value="{$entry.url|h}" /></td>
+          <th>{$lang.url} {counter}:</th>
+          <td><input type="text" class="input" name="entry[url][]" value="{$url|h}" /></td>
+        </tr>
+        {/foreach}
+        <tr>
+          <th>{$lang.url} {counter}:</th>
+          <td><input type="text" class="input" name="entry[url][]" value="" /></td>
         </tr>
 {/if}
 {if $fields._mail}
+        <!--{counter start=0}-->
         {foreach from=$entry.mail|smarty:nodefaults item=mail}
         <tr>
           <th>{$lang.mail} {counter}:</th>

diff --git a/templates/entry_show.tpl b/templates/entry_show.tpl
index 1c4da29b327846c59c815912a1bfa4bae6f34b78..c9e98cab21789cd66f390a1faee73e8f9985eb9c 100644 (file)
--- a/templates/entry_show.tpl
+++ b/templates/entry_show.tpl
@@ -141,7 +141,11 @@
 {if $entry.url}
           <tr>
             <th>{$lang.url}:</th>
-            <td>{$entry.url|http}</td>
+            <td>
+              {foreach from=$entry.url item=url}
+                {$url|http}<br/>
+              {/foreach}
+            </td>
           </tr>
 {/if}
 {if $entry.mail}