From 3eae6235f3e609764cc05a6407edbef54c88b0ef Mon Sep 17 00:00:00 2001 From: avl Date: Thu, 21 Aug 2008 16:16:02 +0300 Subject: [PATCH] small issues --- ipf/admin/views.php | 1 + ipf/context.php | 5 +++++ ipf/form/model.php | 3 +-- ipf/form/widget/image.php | 1 + ipf/form/widget/selectinput.php | 6 ++++-- ipf/http/response/notfound.php | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ipf/admin/views.php b/ipf/admin/views.php index e6fe5aa..f951c52 100644 --- a/ipf/admin/views.php +++ b/ipf/admin/views.php @@ -170,6 +170,7 @@ function IPF_Admin_Views_ChangePassword($request, $match){ function IPF_Admin_Views_Login($request, $match){ + $success_url = ''; if (!empty($request->REQUEST['next'])) $success_url = $request->REQUEST['next']; if (trim($success_url)=='') diff --git a/ipf/context.php b/ipf/context.php index ad86528..86af698 100644 --- a/ipf/context.php +++ b/ipf/context.php @@ -19,3 +19,8 @@ function IPF_Context_Version($request) { return array('IPF_VER' => IPF_Version::$name); } + +function IPF_Context_Upload($request) +{ + return array('UPLOAD_URL' => IPF::get('upload_url')); +} diff --git a/ipf/form/model.php b/ipf/form/model.php index 4ddb1a1..bd24198 100644 --- a/ipf/form/model.php +++ b/ipf/form/model.php @@ -28,8 +28,7 @@ class IPF_Form_Model extends IPF_Form else{ foreach($user_fields as $uname){ $add_method = 'add__'.$uname.'__field'; - if (method_exists($this->model,$add_method)){ - //print $add_method; + if (method_exists($this,$add_method)){ $this->$add_method(); continue; } diff --git a/ipf/form/widget/image.php b/ipf/form/widget/image.php index 15ad5d9..e2c3040 100644 --- a/ipf/form/widget/image.php +++ b/ipf/form/widget/image.php @@ -4,6 +4,7 @@ class IPF_Form_Widget_Image extends IPF_Form_Widget_FileInput { public function render($name, $value, $extra_attrs=array()) { + $sim = ''; if ($value!='') $sim = 'Currently: '.$value.'
Change:'; $value = ''; diff --git a/ipf/form/widget/selectinput.php b/ipf/form/widget/selectinput.php index 12b461e..67c3ed2 100644 --- a/ipf/form/widget/selectinput.php +++ b/ipf/form/widget/selectinput.php @@ -6,8 +6,10 @@ class IPF_Form_Widget_SelectInput extends IPF_Form_Widget public function __construct($attrs=array()) { - $this->choices = $attrs['choices']; - unset($attrs['choices']); + if (isset($attrs['choices'])){ + $this->choices = $attrs['choices']; + unset($attrs['choices']); + } parent::__construct($attrs); } diff --git a/ipf/http/response/notfound.php b/ipf/http/response/notfound.php index e23a826..4abbd24 100644 --- a/ipf/http/response/notfound.php +++ b/ipf/http/response/notfound.php @@ -2,7 +2,7 @@ class IPF_HTTP_Response_NotFound extends IPF_HTTP_Response { - function __construct($content='Not Found', $mimetype=null) + function __construct($content='404 Not Found', $mimetype=null) { parent::__construct($content, $mimetype); $this->status_code = 404; -- 2.49.0