Rev 1199 | Rev 1206 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1199 | Rev 1201 | ||
---|---|---|---|
Line 154... | Line 154... | ||
154 | </form>'; |
154 | </form>'; |
155 | 155 | ||
156 | } catch (\Exception $e) { |
156 | } catch (\Exception $e) { |
157 | 157 | ||
158 | $out['icon'] = 'img/error.png'; |
158 | $out['icon'] = 'img/error.png'; |
- | 159 | $htmlmsg = $e instanceof OIDplusException ? $e->getHtmlMessage() : htmlentities($e->getMessage()); |
|
159 | $out['text'] = _L('Error: %1',$e->getMessage()); |
160 | $out['text'] = _L('Error: %1',$htmlmsg); |
160 | 161 | ||
161 | } |
162 | } |
162 | } else if (explode('$',$id)[0] == 'oidplus:activate_ra') { |
163 | } else if (explode('$',$id)[0] == 'oidplus:activate_ra') { |
163 | $handled = true; |
164 | $handled = true; |
164 | 165 | ||
Line 236... | Line 237... | ||
236 | if ($objParent->userHasWriteRights()) { |
237 | if ($objParent->userHasWriteRights()) { |
237 | $ok = true; |
238 | $ok = true; |
238 | } |
239 | } |
239 | } |
240 | } |
240 | if (!$ok) { |
241 | if (!$ok) { |
241 | throw new OIDplusException(_L('You may not invite this RA. Maybe you need to <a %1>log in</a> again.',OIDplus::gui()->link('oidplus:login'))); |
242 | throw new OIDplusHtmlException(_L('You may not invite this RA. Maybe you need to <a %1>log in</a> again.',OIDplus::gui()->link('oidplus:login'))); |
242 | } |
243 | } |
243 | } |
244 | } |
244 | } |
245 | } |
245 | 246 | ||
246 | /** |
247 | /** |