Fixes #5358 Fixed ImageAttribute usage in templates. Added special %% string...

Fixes #5358 Fixed ImageAttribute usage in templates. Added special %% string start for template values

Conflicts:
	include/class_templateHandling.inc

include/class_plugin.inc

@@ -930,6 +930,10 @@ class plugin
    */
   static function tpl_parse_string($string, $attrs, $escapeMethod = NULL)
   {
+    if (preg_match('/^%%/', $string)) {
+      /* Special case: %% at beginning of string means do not touch it. Used by binary attributes. */
+      return preg_replace('/^%%/', '', $string);
+    }
     $offset = 0;
     while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
       $replace  = static::tpl_parse_mask($m[1][0], $attrs);

include/simpleplugin/attributes/class_FileAttribute.inc

@@ -349,4 +349,28 @@ class ImageAttribute extends FileAttribute
     $id = $this->getHtmlId();
     return array($id.'_img',$id,'upload'.$id);
   }
+
+  /*! \brief Fill LDAP value in the attrs array
+   */
+  function fillLdapValue (&$attrs)
+  {
+    if ($this->isInLdap()) {
+      $value = $this->computeLdapValue();
+      if ($value !== '') {
+        if (isset($this->plugin) && $this->plugin->is_template) {
+          /* Add %% to provide template from parsing binary string */
+          $value = '%%'.$value;
+        }
+        $attrs[$this->getLdapName()] = $value;
+      } else {
+        $attrs[$this->getLdapName()] = array();
+      }
+    }
+  }
+
+  function inputValue ($value)
+  {
+    /* Remove %% that might be there in case of templating */
+    return preg_replace('/^%%/', '', $value);
+  }
 }