From: hickert Date: Wed, 23 Jul 2008 10:51:06 +0000 (+0000) Subject: Moved default.JPG intop plugins/users/images. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0c7b19ca51c1e756f71fb927465ea12ec8df26e5;p=gosa.git Moved default.JPG intop plugins/users/images. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11798 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/html/plugins/users/default.jpg b/gosa-core/html/plugins/users/default.jpg new file mode 100644 index 000000000..c20b08440 Binary files /dev/null and b/gosa-core/html/plugins/users/default.jpg differ diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index dd60b93f0..1446d1f00 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -1267,7 +1267,7 @@ class user extends plugin if((!$data) || ($data == "*removed*")){ /* In case we don't get an entry, load a default picture */ - $this->set_picture ();//"./images/default.jpg"); + $this->set_picture (); $this->jpegPhoto= "*removed*"; }else{ @@ -1320,7 +1320,7 @@ class user extends plugin function set_picture($filename ="") { if (!is_file($filename) || $filename =="" ){ - $filename= "./images/default.jpg"; + $filename= "./plugins/users/images/default.jpg"; $this->jpegPhoto= "*removed*"; } @@ -1445,7 +1445,7 @@ class user extends plugin /* Remove picture? */ if (isset($_POST['picture_remove'])){ $this->jpegPhoto= "*removed*"; - $this->set_picture ("./images/default.jpg"); + $this->set_picture ("./plugins/users/images/default.jpg"); $this->is_modified= TRUE; } diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl index c3bd48504..5706d1525 100644 --- a/gosa-core/plugins/personal/generic/generic.tpl +++ b/gosa-core/plugins/personal/generic/generic.tpl @@ -17,7 +17,7 @@ {if !$userPicture_is_readable} - {t}Personal picture{/t} + {t}Personal picture{/t} {else} {t}Personal picture{/t} {/if} diff --git a/gosa-core/plugins/personal/generic/multiple_generic.tpl b/gosa-core/plugins/personal/generic/multiple_generic.tpl index b1de93432..b29ea4a8c 100644 --- a/gosa-core/plugins/personal/generic/multiple_generic.tpl +++ b/gosa-core/plugins/personal/generic/multiple_generic.tpl @@ -10,7 +10,7 @@
- {t}Personal picture{/t} + {t}Personal picture{/t}