X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;ds=inline;f=inc%2Fclass.eq.inc.php;h=328b1ab47fc75869b61cdffb2a98c073a631d945;hb=759d76b818ce63f221215f8521b246fd61ab3976;hp=9b59778a16192a093c58ed19d00f7b3c79536323;hpb=5b890635d41024cad8348023e9fccae419ddaaca;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 9b59778..328b1ab 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -2554,15 +2554,22 @@ class eq
$date = get_var('date',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
$eqpresppi = get_var('eqpresppi',array('GET','POST'));
-
- $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer;
+
+ $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
$this->db2->query($sql,__LINE__,__FILE__);
- $this->db2->next_record();
- $interviewer_name = $this->db2->f('name');
- $this->t->set_var('interviewer',$interviewer . ' selected');
- $this->t->set_var('interviewer_name',$interviewer_name);
- $this->t->set_var('eqpresppi_checked','');
- $this->t->fp('int_list','interviewer_list',True);
+ while ($this->db2->next_record())
+ {
+ $elder = $this->db2->f('elder');
+ $interviewer_name = $this->db2->f('name');
+ if($elder == $interviewer) {
+ $this->t->set_var('interviewer',$interviewer . ' selected');
+ } else {
+ $this->t->set_var('interviewer',$interviewer);
+ }
+ $this->t->set_var('interviewer_name',$interviewer_name);
+ $this->t->set_var('eqpresppi_checked','');
+ $this->t->fp('int_list','interviewer_list',True);
+ }
if($action == 'save')
{
@@ -2886,25 +2893,21 @@ class eq
$date = get_var('date',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
$eqpresppi = get_var('eqpresppi',array('GET','POST'));
-
- $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- while ($this->db->next_record())
- {
- $supervisor = $this->db->f('supervisor');
- $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor;
- $this->db2->query($sql,__LINE__,__FILE__);
- $this->db2->next_record();
- $interviewer_name = $this->db2->f('name');
-
- if($supervisor == $interviewer) {
- $this->t->set_var('interviewer',$supervisor . ' selected');
- } else {
- $this->t->set_var('interviewer',$interviewer);
- }
- $this->t->set_var('interviewer_name',$interviewer_name);
- $this->t->fp('int_list','interviewer_list',True);
- }
+
+ $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ while ($this->db2->next_record())
+ {
+ $elder = $this->db2->f('elder');
+ $interviewer_name = $this->db2->f('name');
+ if($elder == $interviewer) {
+ $this->t->set_var('interviewer',$interviewer . ' selected');
+ } else {
+ $this->t->set_var('interviewer',$interviewer);
+ }
+ $this->t->set_var('interviewer_name',$interviewer_name);
+ $this->t->fp('int_list','interviewer_list',True);
+ }
if($action == 'save')
{
@@ -4050,6 +4053,12 @@ class eq
if(!move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path)) {
$uploadstatus = " -E- Unable to move the uploaded file to ";
$uploadstatus.= "the target path (check the path and permissions) of: $target_path";
+ $uploadstatus = "The following file was uploaded successfully:
";
+ $uploadstatus.= "Tmp Filename : " . $_FILES['uploadedfile']['tmp_name'] . "
";
+ $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "
";
+ $uploadstatus.= "Type : " . $_FILES['uploadedfile']['type'] . "
";
+ $uploadstatus.= "Size : " . $_FILES['uploadedfile']['size'] . "
";
+ $uploadstatus.= "Error : " . $_FILES['uploadedfile']['error'] . "
";
$this->t->set_var('uploadstatus',$uploadstatus);
$this->t->pfp('uploadhandle','upload',True);
return 0;