From: <be...@us...> - 2012-10-08 17:01:46
|
Revision: 10203 http://sourceforge.net/p/xoops/svn/10203 Author: beckmi Date: 2012-10-08 17:01:42 +0000 (Mon, 08 Oct 2012) Log Message: ----------- Adding 4.3RC2 Modified Paths: -------------- XoopsModules/jobs/trunk/jobs/READ_ME XoopsModules/jobs/trunk/jobs/add_photo.php XoopsModules/jobs/trunk/jobs/addcompany.php XoopsModules/jobs/trunk/jobs/addlisting.php XoopsModules/jobs/trunk/jobs/addresume.php XoopsModules/jobs/trunk/jobs/admin/admin_header.php XoopsModules/jobs/trunk/jobs/admin/category.php XoopsModules/jobs/trunk/jobs/admin/groupperms.php XoopsModules/jobs/trunk/jobs/admin/index.php XoopsModules/jobs/trunk/jobs/admin/map.php XoopsModules/jobs/trunk/jobs/admin/menu.php XoopsModules/jobs/trunk/jobs/admin/mygroupperm.php XoopsModules/jobs/trunk/jobs/admin/upgrade.php XoopsModules/jobs/trunk/jobs/blocks/jobs.php XoopsModules/jobs/trunk/jobs/class/mygrouppermform.php XoopsModules/jobs/trunk/jobs/contact.php XoopsModules/jobs/trunk/jobs/contactresume.php XoopsModules/jobs/trunk/jobs/createresume.php XoopsModules/jobs/trunk/jobs/delpicture.php XoopsModules/jobs/trunk/jobs/delreply.php XoopsModules/jobs/trunk/jobs/display-logo.php XoopsModules/jobs/trunk/jobs/editdesc.php XoopsModules/jobs/trunk/jobs/header.php XoopsModules/jobs/trunk/jobs/include/functions.php XoopsModules/jobs/trunk/jobs/include/gtickets.php XoopsModules/jobs/trunk/jobs/include/notification.inc.php XoopsModules/jobs/trunk/jobs/include/resume_functions.php XoopsModules/jobs/trunk/jobs/include/search.inc.php XoopsModules/jobs/trunk/jobs/include/searchform.php XoopsModules/jobs/trunk/jobs/index.php XoopsModules/jobs/trunk/jobs/language/english/admin.php XoopsModules/jobs/trunk/jobs/language/english/blocks.php XoopsModules/jobs/trunk/jobs/language/english/mail_template/jobs_listing_approve.tpl XoopsModules/jobs/trunk/jobs/language/english/mail_template/jobs_listing_contact.tpl XoopsModules/jobs/trunk/jobs/language/english/mail_template/jobs_listing_expired.tpl XoopsModules/jobs/trunk/jobs/language/english/mail_template/jobs_listing_newpost_notify.tpl XoopsModules/jobs/trunk/jobs/language/english/mail_template/jobs_listing_res_newpost_notify.tpl XoopsModules/jobs/trunk/jobs/language/english/main.php XoopsModules/jobs/trunk/jobs/language/english/modinfo.php XoopsModules/jobs/trunk/jobs/members.php XoopsModules/jobs/trunk/jobs/modjob.php XoopsModules/jobs/trunk/jobs/modresume.php XoopsModules/jobs/trunk/jobs/print.php XoopsModules/jobs/trunk/jobs/replies.php XoopsModules/jobs/trunk/jobs/search.php XoopsModules/jobs/trunk/jobs/sendfriend.php XoopsModules/jobs/trunk/jobs/sql/mysql.sql XoopsModules/jobs/trunk/jobs/templates/blocks/jobs_block_new.html XoopsModules/jobs/trunk/jobs/templates/jobs_addresume.html XoopsModules/jobs/trunk/jobs/templates/jobs_adlist.html XoopsModules/jobs/trunk/jobs/templates/jobs_category.html XoopsModules/jobs/trunk/jobs/templates/jobs_index.html XoopsModules/jobs/trunk/jobs/templates/jobs_index2.html XoopsModules/jobs/trunk/jobs/templates/jobs_item.html XoopsModules/jobs/trunk/jobs/templates/jobs_members.html XoopsModules/jobs/trunk/jobs/templates/jobs_replies.html XoopsModules/jobs/trunk/jobs/templates/jobs_res_adlist.html XoopsModules/jobs/trunk/jobs/templates/jobs_res_category.html XoopsModules/jobs/trunk/jobs/templates/jobs_resume.html XoopsModules/jobs/trunk/jobs/view_photos.php XoopsModules/jobs/trunk/jobs/viewresume.php XoopsModules/jobs/trunk/jobs/xoops_version.php Added Paths: ----------- XoopsModules/jobs/trunk/jobs/admin/addcomp.php XoopsModules/jobs/trunk/jobs/admin/addregion.php XoopsModules/jobs/trunk/jobs/admin/addresume.php XoopsModules/jobs/trunk/jobs/admin/company.php XoopsModules/jobs/trunk/jobs/admin/delcomp.php XoopsModules/jobs/trunk/jobs/admin/docs.php XoopsModules/jobs/trunk/jobs/admin/error_log XoopsModules/jobs/trunk/jobs/admin/header.php XoopsModules/jobs/trunk/jobs/admin/include/ XoopsModules/jobs/trunk/jobs/admin/include/canada.php XoopsModules/jobs/trunk/jobs/admin/include/england.php XoopsModules/jobs/trunk/jobs/admin/include/france.php XoopsModules/jobs/trunk/jobs/admin/include/index.html XoopsModules/jobs/trunk/jobs/admin/include/italy.php XoopsModules/jobs/trunk/jobs/admin/include/usstates.php XoopsModules/jobs/trunk/jobs/admin/jobs_doc_1.php XoopsModules/jobs/trunk/jobs/admin/lists.php XoopsModules/jobs/trunk/jobs/admin/modcomp.php XoopsModules/jobs/trunk/jobs/admin/modresume.php XoopsModules/jobs/trunk/jobs/admin/region.php XoopsModules/jobs/trunk/jobs/admin/submitlisting.php XoopsModules/jobs/trunk/jobs/blocks/jobs2.php XoopsModules/jobs/trunk/jobs/blocks/jobs_b_premium.php XoopsModules/jobs/trunk/jobs/blocks/resumes.php XoopsModules/jobs/trunk/jobs/class/grouppermform.php XoopsModules/jobs/trunk/jobs/class/jobtree.php XoopsModules/jobs/trunk/jobs/class/restree.php XoopsModules/jobs/trunk/jobs/delcompany.php XoopsModules/jobs/trunk/jobs/delcreated.php XoopsModules/jobs/trunk/jobs/deljob.php XoopsModules/jobs/trunk/jobs/delresume.php XoopsModules/jobs/trunk/jobs/error_log XoopsModules/jobs/trunk/jobs/images/arrow.gif XoopsModules/jobs/trunk/jobs/images/backarrow.gif XoopsModules/jobs/trunk/jobs/images/down_active.gif XoopsModules/jobs/trunk/jobs/images/left_both.gif XoopsModules/jobs/trunk/jobs/images/modadminbg.gif XoopsModules/jobs/trunk/jobs/images/right_both.gif XoopsModules/jobs/trunk/jobs/images/up_active.gif XoopsModules/jobs/trunk/jobs/jobscat.php XoopsModules/jobs/trunk/jobs/language/english/docs.php XoopsModules/jobs/trunk/jobs/language/english/mail_template/jobs_company_newpost_notify.tpl XoopsModules/jobs/trunk/jobs/modcompany.php XoopsModules/jobs/trunk/jobs/modcreated.php XoopsModules/jobs/trunk/jobs/myresume.php XoopsModules/jobs/trunk/jobs/resumecat.php XoopsModules/jobs/trunk/jobs/resumes.php XoopsModules/jobs/trunk/jobs/templates/blocks/jobs_b2.html XoopsModules/jobs/trunk/jobs/templates/blocks/jobs_block_premium.html XoopsModules/jobs/trunk/jobs/templates/blocks/resume_block_new.html XoopsModules/jobs/trunk/jobs/templates/jobs_choose_company.html XoopsModules/jobs/trunk/jobs/templates/jobs_modcompany.html XoopsModules/jobs/trunk/jobs/templates/jobs_modify.html XoopsModules/jobs/trunk/jobs/templates/jobs_modresume.html XoopsModules/jobs/trunk/jobs/templates/jobs_premium.html XoopsModules/jobs/trunk/jobs/viewjobs.php XoopsModules/jobs/trunk/jobs/whatcompany.php XoopsModules/jobs/trunk/must_include/ XoopsModules/jobs/trunk/must_include/2.4/ XoopsModules/jobs/trunk/must_include/2.4/class/ XoopsModules/jobs/trunk/must_include/2.4/class/xoopsform/ XoopsModules/jobs/trunk/must_include/2.4/class/xoopsform/formselect.php XoopsModules/jobs/trunk/must_include/2.5/ XoopsModules/jobs/trunk/must_include/2.5/class/ XoopsModules/jobs/trunk/must_include/2.5/class/xoopsform/ XoopsModules/jobs/trunk/must_include/2.5/class/xoopsform/formselect.php XoopsModules/jobs/trunk/must_include/233b/ XoopsModules/jobs/trunk/must_include/233b/class/ XoopsModules/jobs/trunk/must_include/233b/class/xoopsform/ XoopsModules/jobs/trunk/must_include/233b/class/xoopsform/formselect.php XoopsModules/jobs/trunk/must_include/233b/include/ XoopsModules/jobs/trunk/must_include/233b/include/cp_header.php Removed Paths: ------------- XoopsModules/jobs/trunk/htdocs/ XoopsModules/jobs/trunk/jobs/admin/admin.php XoopsModules/jobs/trunk/jobs/admin/mymenu.php XoopsModules/jobs/trunk/jobs/class/xoopstree.php XoopsModules/jobs/trunk/jobs/editcomp.php XoopsModules/jobs/trunk/jobs/editresume.php XoopsModules/jobs/trunk/jobs/images/Thumbs.db XoopsModules/jobs/trunk/jobs/include/basic_mailtags.php XoopsModules/jobs/trunk/jobs/include/preferences.inc.php XoopsModules/jobs/trunk/jobs/index2.php XoopsModules/jobs/trunk/jobs/listing-p-f.php XoopsModules/jobs/trunk/jobs/photo/midsize/php.ini XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_11_4790083d6ce1f.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_11_4790916bd292e.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_13_480d3127adcf2.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_13_480d31a0d66c6.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_13_480d31f3e5fed.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_2_477ae03313947.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_2_477ae1cef1687.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_2_477ae796bbfde.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_2_477ae7de24e28.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_2_477aeb6b4966c.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_2_4780d5fbbaf93.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_2_4780ea75cb136.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_2_47a055e888735.jpg XoopsModules/jobs/trunk/jobs/photo/midsize/resized_pic_4_47b376989bd81.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/php.ini XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_11_4790083d6ce1f.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_11_4790916bd292e.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_13_480d3127adcf2.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_13_480d31a0d66c6.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_13_480d31f3e5fed.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_2_477ae03313947.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_2_477ae1cef1687.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_2_477ae796bbfde.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_2_477ae7de24e28.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_2_477aeb6b4966c.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_2_4780d5fbbaf93.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_2_4780ea75cb136.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_2_47a055e888735.jpg XoopsModules/jobs/trunk/jobs/photo/thumbs/thumb_pic_4_47b376989bd81.jpg Modified: XoopsModules/jobs/trunk/jobs/READ_ME =================================================================== --- XoopsModules/jobs/trunk/jobs/READ_ME 2012-10-08 16:57:16 UTC (rev 10202) +++ XoopsModules/jobs/trunk/jobs/READ_ME 2012-10-08 17:01:42 UTC (rev 10203) @@ -7,22 +7,27 @@ 1) NEW INSTALL - Upload the jobs folder inside the Xoops modules folder, go to modules administration and install. + 1. Upload the jobs folder inside the Xoops modules folder, go to modules administration and install. + 2. Replace the class/xoopsform/formselect.php file with the one provided for your Xoops version. + 3. For Xoops version 2.3.3b Replace the class/xoopsform/formselect.php file and include/cp_header.php file with the ones provided. - 2) UPGRADING FROM ANY PREVIOUS VERSION BACKUP YOUR DATABASE BEFORE THIS UPGRADE. DON'T SAY YOU WEREN'T WARNED. 1. Overwrite the jobs folder with the new files. - 2. Update module, in module admin and you are done + 2. Replace the class/xoopsform/formselect.php file with the one provided for your Xoops version. + 3. For Xoops version 2.3.3b Replace the class/xoopsform/formselect.php file and include/cp_header.php file with the ones provided. + 4. Run the upgrade script as admin. point browser to "http://yoursite/modules/jobs/admin/upgrade.php" + 5. Update module, in module admin and you are done IMPORTANT!!! You must create a category in resumes before trying to set permissions. +IMPORTANT!!! You must create states or regions unless you don't use states in the preferences. +IMPORTANT!!! You must replace class/xoopsform/formselect.php and for 2.3.3b include/cp_header.php - Donations will allow this software to continue, without them probably not. Report any problems at www.jlmzone.com Modified: XoopsModules/jobs/trunk/jobs/add_photo.php =================================================================== --- XoopsModules/jobs/trunk/jobs/add_photo.php 2012-10-08 16:57:16 UTC (rev 10202) +++ XoopsModules/jobs/trunk/jobs/add_photo.php 2012-10-08 17:01:42 UTC (rev 10203) @@ -95,7 +95,7 @@ $xoopsDB->queryF("UPDATE ".$xoopsDB->prefix("jobs_resume")." SET rphoto=rphoto+1 WHERE lid = ".mysql_real_escape_string($lid).""); } else { - redirect_header(XOOPS_URL."/modules/$mydirname/view_photos.php?uid=".$xoopsUser->getVar('uid'),10,constant($main_lang."_NOCACHACA")); + redirect_header(XOOPS_URL."/modules/$mydirname/view_photos.php?uid=".$xoopsUser->getVar('uid'),3,constant($main_lang."_NOCACHACA")); } } Modified: XoopsModules/jobs/trunk/jobs/addcompany.php =================================================================== --- XoopsModules/jobs/trunk/jobs/addcompany.php 2012-10-08 16:57:16 UTC (rev 10202) +++ XoopsModules/jobs/trunk/jobs/addcompany.php 2012-10-08 17:01:42 UTC (rev 10203) @@ -1,5 +1,5 @@ <?php -// $Id: addcompany.php,v 1.12 2007/03/27 17:11:07 jlm69 Exp $ +// $Id: addcompany.php,v 4.1 2010/02/6 08:11:07 jlm69 Exp $ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // // Copyright (c) 2000 XOOPS.org // @@ -24,90 +24,163 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------ // - include "header.php"; +$mydirname = basename( dirname( __FILE__ ) ) ; $myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object -include_once XOOPS_ROOT_PATH."/class/xoopstree.php"; include_once XOOPS_ROOT_PATH."/class/module.errorhandler.php"; -include("include/functions.php"); - +include XOOPS_ROOT_PATH."/modules/$mydirname/include/functions.php"; +include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php"; $erh = new ErrorHandler; //ErrorHandler object -$mytree = new XoopsTree($xoopsDB->prefix("jobs_categories"),"cid","pid"); if (empty($xoopsUser)) { - redirect_header(XOOPS_URL."/user.php",2,_JOBS_MUSTREGFIRST); + redirect_header(XOOPS_URL."/modules/profile/",3,_JOBS_MUSTREGFIRST); exit(); } +$module_id = $xoopsModule->getVar('mid'); +if (is_object($xoopsUser)) { + $groups = $xoopsUser->getGroups(); +} else { + $groups = XOOPS_GROUP_ANONYMOUS; +} +$gperm_handler =& xoops_gethandler('groupperm'); +if (isset($_POST['item_id'])) { + $perm_itemid = intval($_POST['item_id']); +} else { + $perm_itemid = 0; +} +if (!$gperm_handler->checkRight("jobs_submit", $perm_itemid, $groups, $module_id)) { + redirect_header(XOOPS_URL."/index.php", 3, _NOPERM); + exit(); +} +if (!$gperm_handler->checkRight("jobs_premium", $perm_itemid, $groups, $module_id)) { + $premium = 0; +} else { + $premium = 1; +} + $member_usid = $xoopsUser->getVar("uid", "E"); -$member_comp = getCompany($member_usid); +$member_comp = jobs_getCompany($member_usid); if ($member_comp) { - redirect_header(XOOPS_URL."/modules/$mydirname/index.php",2,_JOBS_COMPANY_EXISTS); + redirect_header(XOOPS_URL."/modules/$mydirname/index.php",3,_JOBS_COMPANY_EXISTS); } - if (!empty($_POST['submit'])) { - $comp_usid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0; + if (!$GLOBALS['xoopsSecurity']->check(true, $_REQUEST['token'])) { + redirect_header(XOOPS_URL."/modules/$mydirname/index.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } - // Check if Title exist - if ($_POST["comp_name"]=="") { - $erh->show("1001"); - } + $destination = XOOPS_ROOT_PATH."/modules/$mydirname/logo_images"; + $photomax = $xoopsModuleConfig['jobs_maxfilesize']; + $maxwide = $xoopsModuleConfig['jobs_resized_width']; + $maxhigh = $xoopsModuleConfig['jobs_resized_height']; + $date = time(); - //$notify = !empty($_POST['notify']) ? 1 : 0; + $comp_usid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0; - //if ( !empty($_POST['cid']) ) { - // $cid = intval($_POST['cid']); - //} else { - // $cid = 0; - //} + $_SESSION['comp_name'] = $_POST['comp_name']; + $_SESSION['comp_address'] = $_POST['comp_address']; + $_SESSION['comp_address2'] = $_POST['comp_address2']; + $_SESSION['comp_city'] = $_POST['comp_city']; + $_SESSION['comp_state'] = $_POST['comp_state']; + $_SESSION['comp_zip'] = $_POST['comp_zip']; + $_SESSION['comp_phone'] = $_POST['comp_phone']; + $_SESSION['comp_fax'] = $_POST['comp_fax']; + $_SESSION['comp_url'] = $_POST['comp_url']; + $_SESSION['comp_usid'] = $_POST['comp_usid']; + $_SESSION['comp_user1'] = $_POST['comp_user1']; + $_SESSION['comp_user2'] = $_POST['comp_user2']; + $_SESSION['comp_contact'] = $_POST['comp_contact']; + $_SESSION['comp_user1_contact'] = $_POST['comp_user1_contact']; + $_SESSION['comp_user2_contact'] = $_POST['comp_user2_contact']; - // $url = urlencode($url); - + $comp_name = $myts->addSlashes($_POST["comp_name"]); + $comp_address = $myts->addSlashes($_POST["comp_address"]); + $comp_address2 = $myts->addSlashes($_POST["comp_address2"]); + $comp_city = $myts->addSlashes($_POST["comp_city"]); + $comp_state = $myts->addSlashes($_POST["comp_state"]); + $comp_zip = $myts->addSlashes($_POST["comp_zip"]); + $comp_phone = $myts->addSlashes($_POST["comp_phone"]); + $comp_fax = $myts->addSlashes($_POST["comp_fax"]); + $comp_url = $myts->addSlashes($_POST["comp_url"]); + $comp_usid = $myts->addSlashes($_POST["comp_usid"]); + $comp_user1 = $myts->addSlashes($_POST["comp_user1"]); + $comp_user2 = $myts->addSlashes($_POST["comp_user2"]); + $comp_contact = $myts->addSlashes($_POST["comp_contact"]); - $comp_name = $myts->makeTboxData4Save($_POST["comp_name"]); - $comp_address = $myts->makeTboxData4Save($_POST["comp_address"]); - $comp_address2 = $myts->makeTboxData4Save($_POST["comp_address2"]); - $comp_city = $myts->makeTboxData4Save($_POST["comp_city"]); - $comp_state = $myts->makeTboxData4Save($_POST["comp_state"]); - $comp_zip = $myts->makeTboxData4Save($_POST["comp_zip"]); - $comp_phone = $myts->makeTboxData4Save($_POST["comp_phone"]); - $comp_fax = $myts->makeTboxData4Save($_POST["comp_fax"]); - $comp_url = $myts->makeTboxData4Save($_POST["comp_url"]); - $comp_usid = $myts->makeTboxData4Save($_POST["comp_usid"]); + if ($premium == "1") { -// $comp_user1 = $myts->makeTboxData4Save($_POST["comp_user1"]); -// $comp_user2 = $myts->makeTboxData4Save($_POST["comp_user2"]); +// START - check new entries for company users are OK - GreenFlatDog +$comp_users = array(); +// get user id for the name entered for company user 1 +if (empty($_POST["comp_user1"])) { + $comp_userid1 = ""; +} else { + $comp_userid1 = jobs_getIdFromUname($_POST["comp_user1"]); + // put name, id, what's entered and problem into an array + $comp_users[$comp_user1]['name'] = $_POST["comp_user1"]; + $comp_users[$comp_user1]['id'] = $comp_userid1; + $comp_users[$comp_user1]['entry'] = "?cuser1="; + $comp_users[$comp_user1]['prob'] = "&prob1="; +} +// get user id for the name entered for company user 2 +if (empty($_POST["comp_user2"])) { + $comp_userid2 = ""; +} else { + $comp_userid2 = jobs_getIdFromUname($_POST["comp_user2"]); + // put name, id, what's entered and problem into an array + $comp_users[$comp_user2]['name'] = $_POST["comp_user2"]; + $comp_users[$comp_user2]['id'] = $comp_userid2; + $comp_users[$comp_user2]['entry'] = "?cuser2="; + $comp_users[$comp_user2]['prob'] = "&prob2="; +} +if (!empty($comp_users)) { + // we have checks to make + $gperm_handler =& xoops_gethandler('groupperm'); + $errs = ""; + foreach ($comp_users as $u) { + if ($u['id']) { + // we have user id for name entered + $xu = new XoopsUser($u['id']); + $grps = $xu->getGroups(); + if (!$gperm_handler->checkRight("jobs_submit", 0, $grps, $module_id)) { + // no submit permission + $errs .= $u['entry'] . $u['name'] . $u['prob'] . "p"; + } + } else { + // no user id for name entered + $errs .= $u['entry'] . $u['name'] . $u['prob'] . "n"; - $comp_user1 = getIdFromUname($_POST["comp_user1"]); - $comp_user2 = getIdFromUname($_POST["comp_user2"]); + } + } + if ($errs) { + // we are going to re-open the form and request corrections + // add to the query string the comp user(s) with their usernames and what problems they have e.g. + // name1=xyz and prob1=p (no submit permission) or prob1=n (not there) + redirect_header("addcompany.php$errs", 5, "Correction required"); + exit(); + } +} +// END - check new entries for company users are OK - GreenFlatDog + $comp_user1_contact = $myts->addSlashes($_POST["comp_user1_contact"]); + $comp_user2_contact = $myts->addSlashes($_POST["comp_user2_contact"]); + } else { + $comp_userid1 = ""; + $comp_userid2 = ""; + $comp_user1_contact = ""; + $comp_user2_contact = ""; - - - - - - - - $comp_contact = $myts->makeTboxData4Save($_POST["comp_contact"]); - $comp_user1_contact = $myts->makeTboxData4Save($_POST["comp_user1_contact"]); - $comp_user2_contact = $myts->makeTboxData4Save($_POST["comp_user2_contact"]); - $date = time(); - - - $photomax=$xoopsModuleConfig['jobs_maxfilesize']; - $maxwide=$xoopsModuleConfig['jobs_resized_width']; - $maxhigh=$xoopsModuleConfig['jobs_resized_height']; - - + } + + $filename = ""; if ( !empty($_FILES['comp_img']['name']) ) { include_once XOOPS_ROOT_PATH."/class/uploader.php"; $updir = 'logo_images/'; - $allowed_mimetypes = array('image/gif', 'image/jpg', 'image/jpeg', 'image/pjpeg', 'image/x-png'); + $allowed_mimetypes = array('image/gif', 'image/jpg', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png'); $uploader = new XoopsMediaUploader($updir, $allowed_mimetypes, $photomax, $maxwide, $maxhigh); $uploader->setTargetFileName($date.'_'.$_FILES['comp_img']['name']); $uploader->fetchMedia('comp_img'); @@ -121,91 +194,142 @@ } } + $newid = $xoopsDB->genId($xoopsDB->prefix("jobs_companies")."_comp_id_seq"); + $sql = sprintf("INSERT INTO %s (comp_id, comp_name, comp_address, comp_address2, comp_city, comp_state, comp_zip, comp_phone, comp_fax, comp_url, comp_img, comp_usid, comp_user1, comp_user2, comp_contact, comp_user1_contact, comp_user2_contact, comp_date_added) VALUES (%u, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%u', '%s', '%s', '%s', '%s', '%s', '%s')", $xoopsDB->prefix("jobs_companies"), $newid, $comp_name, $comp_address, $comp_address2, $comp_city, $comp_state, $comp_zip, $comp_phone, $comp_fax, $comp_url, $filename, $comp_usid, $comp_userid1, $comp_userid2, $comp_contact, $comp_user1_contact, $comp_user2_contact, $date); + $xoopsDB->query($sql) or $erh->show("0013"); + unset ($_SESSION['comp_name']); + unset ($_SESSION['comp_address']); + unset ($_SESSION['comp_address2']); + unset ($_SESSION['comp_city']); + unset ($_SESSION['comp_state']); + unset ($_SESSION['comp_zip']); + unset ($_SESSION['comp_phone']); + unset ($_SESSION['comp_fax']); + unset ($_SESSION['comp_url']); + unset ($_SESSION['comp_usid']); + unset ($_SESSION['comp_user1']); + unset ($_SESSION['comp_user2']); + unset ($_SESSION['comp_contact']); + unset ($_SESSION['comp_user1_contact']); + unset ($_SESSION['comp_user2_contact']); - - - - $newid = $xoopsDB->genId($xoopsDB->prefix("jobs_companies")."_comp_id_seq"); - - $sql = sprintf("INSERT INTO %s (comp_id, comp_name, comp_address, comp_address2, comp_city, comp_state, comp_zip, comp_phone, comp_fax, comp_url, comp_img, comp_usid, comp_user1, comp_user2, comp_contact, comp_user1_contact, comp_user2_contact, comp_date_added) VALUES (%u, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%u', '%s', '%s', '%s', '%s', '%s', '%s')", $xoopsDB->prefix("jobs_companies"), $newid, $comp_name, $comp_address, $comp_address2, $comp_city, $comp_state, $comp_zip, $comp_phone, $comp_fax, $comp_url, $filename, $comp_usid, $comp_user1, $comp_user2, $comp_contact, $comp_user1_contact, $comp_user2_contact, $date); - $xoopsDB->query($sql) or $erh->show("0013"); - - redirect_header("addlisting.php",2,_JOBS_RECEIVED); - + redirect_header("addlisting.php",3,_JOBS_RECEIVED); exit(); - } else { - - - //$xoopsOption['template_main'] = 'jobs_add_company.html'; $xoopsOption['template_main'] = 'jobs_add_company.html'; include XOOPS_ROOT_PATH."/header.php"; - include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php"; + include_once XOOPS_ROOT_PATH."/modules/jobs/class/jobtree.php"; - - //$xoopsTpl->assign('xoops_module_header', $xoops_module_header); - //Query datatypes that match the categories selected. If not category selected. + $token = $GLOBALS['xoopsSecurity']->createToken(); + +if (isset($_GET['cuser1']) && $_GET['cuser1'] != "") { + $cuser1 = $_GET['cuser1']; + $prob1 = $_GET['prob1']; + $alert_message = _JOBS_PLS_CORRECT; +} +if (isset($_GET['cuser2']) && $_GET['cuser2'] != "") { + $cuser2 = $_GET['cuser2']; + $prob2 = $_GET['prob2']; + $alert_message = _JOBS_PLS_CORRECT; +} + + $alert1 = ""; + $alert2 = ""; + +$_SESSION['comp_name'] = !empty($_SESSION['comp_name']) ? $_SESSION['comp_name'] : ""; +$_SESSION['comp_address'] = !empty($_SESSION['comp_address']) ? $_SESSION['comp_address'] : ""; +$_SESSION['comp_address2'] = !empty($_SESSION['comp_address2']) ? $_SESSION['comp_address2'] : ""; +$_SESSION['comp_city'] = !empty($_SESSION['comp_city']) ? $_SESSION['comp_city'] : ""; +$_SESSION['comp_state'] = !empty($_SESSION['comp_state']) ? $_SESSION['comp_state'] : ""; +$_SESSION['comp_zip'] = !empty($_SESSION['comp_zip']) ? $_SESSION['comp_zip'] : ""; +$_SESSION['comp_phone'] = !empty($_SESSION['comp_phone']) ? $_SESSION['comp_phone'] : ""; +$_SESSION['comp_fax'] = !empty($_SESSION['comp_fax']) ? $_SESSION['comp_fax'] : ""; +$_SESSION['comp_url'] = !empty($_SESSION['comp_url']) ? $_SESSION['comp_url'] : ""; +$_SESSION['comp_usid'] = !empty($_SESSION['comp_usid']) ? $_SESSION['comp_usid'] : ""; +$_SESSION['comp_user1'] = !empty($_SESSION['comp_user1']) ? $_SESSION['comp_user1'] : ""; +$_SESSION['comp_user2'] = !empty($_SESSION['comp_user2']) ? $_SESSION['comp_user2'] : ""; +$_SESSION['comp_contact'] = !empty($_SESSION['comp_contact']) ? $_SESSION['comp_contact'] : ""; +$_SESSION['comp_user1_contact'] = !empty($_SESSION['comp_user1_contact']) ? $_SESSION['comp_user1_contact'] : ""; +$_SESSION['comp_user2_contact'] = !empty($_SESSION['comp_user2_contact']) ? $_SESSION['comp_user2_contact'] : ""; + + $result = $xoopsDB->query("select rid,name from ".$xoopsDB->prefix("jobs_region")." order by rid ASC"); + ob_start(); $form = new XoopsThemeForm(_JOBS_ADD_COMPANY, 'companyform', 'addcompany.php'); $form->setExtra('enctype="multipart/form-data"'); + $GLOBALS['xoopsGTicket']->addTicketXoopsFormElement( $form , __LINE__ , 1800 , 'token' ) ; - $form->addElement(new XoopsFormText(_JOBS_COMPANY_NAME, "comp_name", 20, 50, ""), true); - $form->addElement(new XoopsFormText(_JOBS_COMPANY_ADDRESS, "comp_address", 50, 50, ""), true); - $form->addElement(new XoopsFormText(_JOBS_COMPANY_ADDRESS2, "comp_address2", 50, 50, ""), false); - $form->addElement(new XoopsFormText(_JOBS_COMPANY_CITY, "comp_city", 50, 50, ""), true); - $form->addElement(new XoopsFormText(_JOBS_COMPANY_STATE, "comp_state", 50, 50, ""), true); - $form->addElement(new XoopsFormText(_JOBS_COMPANY_ZIP, "comp_zip", 50, 50, ""), true); - $form->addElement(new XoopsFormText(_JOBS_COMPANY_PHONE, "comp_phone", 30, 30, ""), true); - $form->addElement(new XoopsFormText(_JOBS_COMPANY_FAX, "comp_fax", 30, 30, ""), false); - $form->addElement(new XoopsFormText(_JOBS_COMPANY_SITEURL, "comp_url", 50, 50, "http://"), false); + $form->addElement(new XoopsFormText(_JOBS_COMPANY_NAME, "comp_name", 20, 50, "".$_SESSION['comp_name'].""), true); + $form->addElement(new XoopsFormText(_JOBS_COMPANY_ADDRESS, "comp_address", 50, 50,"".$_SESSION['comp_address'].""), true); + $form->addElement(new XoopsFormText(_JOBS_COMPANY_ADDRESS2, "comp_address2", 50, 50, "".$_SESSION['comp_address2'].""), false); + $form->addElement(new XoopsFormText(_JOBS_COMPANY_CITY, "comp_city", 50, 50, "".$_SESSION['comp_city'].""), true); + + $state_form= new XoopsFormSelect(_JOBS_STATE, "comp_state", "".$_SESSION['comp_state']."", "0", false); + while (list($rid,$name) = $xoopsDB->fetchRow($result) ) { + $state_form->addOption('',_JOBS_SELECT_STATE); + $state_form->addOption($rid, $name); + } + $form->addElement($state_form,true); + + $form->addElement(new XoopsFormText(_JOBS_COMPANY_ZIP, "comp_zip", 50, 50, "".$_SESSION['comp_zip'].""), true); + $form->addElement(new XoopsFormText(_JOBS_COMPANY_PHONE, "comp_phone", 30, 30, "".$_SESSION['comp_phone'].""), true); + $form->addElement(new XoopsFormText(_JOBS_COMPANY_FAX, "comp_fax", 30, 30, "".$_SESSION['comp_fax'].""), false); + $form->addElement(new XoopsFormText(_JOBS_COMPANY_SITEURL, "comp_url", 50, 50, "".$_SESSION['comp_url'].""), false); $form->addElement(new XoopsFormFile(_JOBS_COMPANY_LOGO, 'comp_img', 0), false); - $form->addElement(new XoopsFormTextArea(_JOBS_COMPANY_CONTACT, 'comp_contact', '', 6, 40), false); - + $form->addElement(new XoopsFormTextArea(_JOBS_COMPANY_CONTACT, 'comp_contact', "".$_SESSION['comp_contact']."", 6, 40), false); $form->insertBreak(); + if ($premium == "1") { $form->insertBreak(_JOBS_COMPANY_OTHERS, "head"); $form->insertBreak(); - - $form->addElement(new XoopsFormText(_JOBS_COMPANY_USER1, "comp_user1", 50, 50, ""), false); - $form->addElement(new XoopsFormTextArea(_JOBS_USER1_CONTACT, 'comp_user1_contact', '', 6, 40), false); +// START - check new entries for company users are OK - contributed by GreenFlatDog + $alert = "<br /><span style='color:#f00'>%s%s</span>"; - $form->addElement(new XoopsFormText(_JOBS_COMPANY_USER2, "comp_user2", 50, 50, ""), false); - $form->addElement(new XoopsFormTextArea(_JOBS_USER2_CONTACT, 'comp_user2_contact', '', 6, 40), false); + if (isset($_GET['cuser1']) && $_GET['cuser1'] != "") { + if ($cuser1) { + $prob = ($prob1 == "n") ? _JOBS_COMP_USER_NOTTHERE : _JOBS_COMP_USER_NOPERM; + $alert1 = sprintf($alert, $cuser1, $prob); + unset($prob); + } + } + if ($alert1) { + $form->addElement(new XoopsFormText(_JOBS_COMPANY_USER1.$alert1, "comp_user1", 50, 50, "".$_SESSION['comp_user1'].""), false); + } else { + $form->addElement(new XoopsFormText(_JOBS_COMPANY_USER1, "comp_user1", 50, 50, "".$_SESSION['comp_user1'].""), false); + } + $form->addElement(new XoopsFormTextArea(_JOBS_USER1_CONTACT, 'comp_user1_contact', "".$_SESSION['comp_user1_contact']."", 6, 40), false); + + if (isset($_GET['cuser2']) && $_GET['cuser2'] != "") { + if ($cuser2) { + $prob = ($prob2 == "n") ? _JOBS_COMP_USER_NOTTHERE : _JOBS_COMP_USER_NOPERM; + $alert2 = sprintf($alert, $cuser2, $prob); + unset($prob); + } + } + if ($alert2) { + $form->addElement(new XoopsFormText(_JOBS_COMPANY_USER2.$alert2, "comp_user2", 50, 50, "".$_SESSION['comp_user2'].""), false); + } else { + $form->addElement(new XoopsFormText(_JOBS_COMPANY_USER2, "comp_user2", 50, 50, "".$_SESSION['comp_user2'].""), false); + } + $form->addElement(new XoopsFormTextArea(_JOBS_USER2_CONTACT, 'comp_user2_contact', "".$_SESSION['comp_user2_contact']."", 6, 40), false); + } else { + + $form->addElement(new XoopsFormHidden('comp_user1', "")); + $form->addElement(new XoopsFormHidden('comp_user2', "")); + $form->addElement(new XoopsFormHidden('comp_user1_contact', "")); + $form->addElement(new XoopsFormHidden('comp_user2_contact', "")); + } + $form->addElement(new XoopsFormHidden('token', $token)); $form->addElement(new XoopsFormButton('', 'submit', _JOBS_SUBMIT, 'submit')); $form->addElement(new XoopsFormHidden('comp_usid', $xoopsUser->getVar('uid'))); $form->display(); $xoopsTpl->assign('submit_form', ob_get_contents()); ob_end_clean(); - //$comp_usid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0; - $xoopsTpl->assign('lang_add_company', _JOBS_ADD_COMPANY); - $xoopsTpl->assign('lang_submitcomp', _JOBS_COMPANY_ADD); - $xoopsTpl->assign('lang_sitetitle', $xoopsConfig['sitename']); - $xoopsTpl->assign('lang_comp_name', _JOBS_COMPANY_NAME); - $xoopsTpl->assign('lang_comp_address', _JOBS_COMPANY_ADDRESS); - $xoopsTpl->assign('lang_comp_address2', _JOBS_COMPANY_ADDRESS2); - $xoopsTpl->assign('lang_comp_location', _JOBS_COMPANY_LOCATION); - $xoopsTpl->assign('lang_comp_city', _JOBS_COMPANY_CITY); - $xoopsTpl->assign('lang_comp_state', _JOBS_COMPANY_STATE); - $xoopsTpl->assign('lang_comp_zip', _JOBS_COMPANY_ZIP); - $xoopsTpl->assign('lang_comp_phone', _JOBS_COMPANY_PHONE); - $xoopsTpl->assign('lang_comp_fax', _JOBS_COMPANY_FAX); - $xoopsTpl->assign('lang_comp_siteurl', _JOBS_COMPANY_SITEURL); - $xoopsTpl->assign('lang_comp_submit', _JOBS_SUBMIT); - $xoopsTpl->assign('lang_comp_cancel', _JOBS_COMPANY_CANCEL); - $xoopsTpl->assign('lang_comp_others', _JOBS_COMPANY_OTHERS); - $xoopsTpl->assign('lang_comp_user1', _JOBS_COMPANY_USER1); - $xoopsTpl->assign('lang_comp_user2', _JOBS_COMPANY_USER2); - $xoopsTpl->assign('lang_user1_contact', _JOBS_USER1_CONTACT); - $xoopsTpl->assign('lang_user2_contact', _JOBS_USER2_CONTACT); - $xoopsTpl->assign('lang_comp_contact', _JOBS_COMPANY_CONTACT); - - - include XOOPS_ROOT_PATH.'/footer.php'; -} + } ?> \ No newline at end of file Modified: XoopsModules/jobs/trunk/jobs/addlisting.php =================================================================== --- XoopsModules/jobs/trunk/jobs/addlisting.php 2012-10-08 16:57:16 UTC (rev 10202) +++ XoopsModules/jobs/trunk/jobs/addlisting.php 2012-10-08 17:01:42 UTC (rev 10203) @@ -1,5 +1,5 @@ <?php -// $Id: addcompany.php,v 1.12 2007/03/27 17:11:07 jlm69 Exp $ +// $Id: addcompany.php,v 1.12 2010/02/06 08:11:07 jlm69 Exp $ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // // Copyright (c) 2000 XOOPS.org // @@ -24,16 +24,13 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------ // - include "header.php"; $mydirname = basename( dirname( __FILE__ ) ) ; $myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object require_once( XOOPS_ROOT_PATH."/modules/$mydirname/include/gtickets.php" ) ; -include_once XOOPS_ROOT_PATH."/class/xoopstree.php"; -include_once XOOPS_ROOT_PATH."/class/module.errorhandler.php"; -include("include/functions.php"); +include_once XOOPS_ROOT_PATH."/modules/$mydirname/class/jobtree.php"; +include_once (XOOPS_ROOT_PATH."/modules/$mydirname/include/functions.php"); -$erh = new ErrorHandler; //ErrorHandler object $module_id = $xoopsModule->getVar('mid'); if (is_object($xoopsUser)) { $groups = $xoopsUser->getGroups(); @@ -47,7 +44,7 @@ $perm_itemid = 0; } if (!$gperm_handler->checkRight("jobs_submit", $perm_itemid, $groups, $module_id)) { - redirect_header(XOOPS_URL."/user.php", 3, _NOPERM); + redirect_header(XOOPS_URL."/index.php", 3, _NOPERM); exit(); } if (!$gperm_handler->checkRight("jobs_premium", $perm_itemid, $groups, $module_id)) { @@ -56,98 +53,100 @@ $premium = 1; } - //$token = $GLOBALS['xoopsSecurity']->createToken(); - include_once (XOOPS_ROOT_PATH."/modules/$mydirname/include/functions.php"); - require_once( XOOPS_ROOT_PATH."/modules/$mydirname/include/gtickets.php" ) ; - include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php"; - include_once (XOOPS_ROOT_PATH."/class/xoopstree.php"); - $mytree = new XoopsTree($xoopsDB->prefix("jobs_categories"),"cid","pid"); +$mytree = new JobTree($xoopsDB->prefix("jobs_categories"),"cid","pid"); -if (isset($_POST["cid"])) { - $cid = intval($_POST["cid"]); -} else if (isset($_GET["cid"])) { - $cid = intval($_GET["cid"]); -} -if (isset($_POST["comp_id"])) { - $comp_id = intval($_POST["comp_id"]); -} else if (isset($_GET["comp_id"])) { - $comp_id = intval($_GET["comp_id"]); -} + if (isset($_POST["cid"])) { + $cid = intval($_POST["cid"]); + } else if (isset($_GET["cid"])) { + $cid = intval($_GET["cid"]); + } + if (isset($_POST["comp_id"])) { + $comp_id = intval($_POST["comp_id"]); + } else if (isset($_GET["comp_id"])) { + $comp_id = intval($_GET["comp_id"]); + } -if (empty($xoopsUser)) { - redirect_header(XOOPS_URL."/user.php",2,_JOBS_MUSTREGFIRST); + if (empty($xoopsUser)) { + redirect_header(XOOPS_URL."modules/profile/",3,_JOBS_MUSTREGFIRST); exit(); -} + } -$member_usid = $xoopsUser->getVar("uid", "E"); -$all_comp = getCompany($member_usid); -if (!$all_comp) { + $member_usid = $xoopsUser->getVar("uid", "E"); + + $all_comp = jobs_getCompany($member_usid); + if (!$all_comp) { redirect_header(XOOPS_URL."/modules/$mydirname/addcompany.php",2,_JOBS_MUSTADD_COMPANY); -} + } -if (!empty($_POST['submit']) ) { + if (empty($comp_id)) { + $count = jobs_getCompCount($member_usid); + if ($count > 1) { + redirect_header(XOOPS_URL."/modules/$mydirname/whatcompany.php",1,_JOBS_WHAT_COMPANY); + } + } + if (!empty($_POST['submit']) ) { + $jobsdays=$xoopsModuleConfig['jobs_days']; if ( ! $xoopsGTicket->check( true , 'token' ) ) { redirect_header(XOOPS_URL.'/',3,$xoopsGTicket->getErrors()); } +// if ($xoopsModuleConfig["jobs_use_captcha"] == '1') { +// $x24plus = jobs_isX24plus(); +// if ($x24plus) { +// xoops_load("xoopscaptcha"); +// $xoopsCaptcha = XoopsCaptcha::getInstance(); +// if( !$xoopsCaptcha->verify() ) { +// redirect_header( XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/index.php", 3, $xoopsCaptcha->getMessage() ); +// } +// } else { +// xoops_load("captcha"); +// $xoopsCaptcha = XoopsCaptcha::getInstance(); +// if( !$xoopsCaptcha->verify() ) { +// redirect_header( XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/index.php", 3, $xoopsCaptcha->getMessage() ); +// } +// } +// } - // Check if Title exist - if ($_POST["title"]=="") { - $erh->show("1001"); - } + $title = $myts->addSlashes($_POST["title"]); + $status = $myts->addSlashes($_POST["status"]); + $expire = $myts->addSlashes($_POST["expire"]); + $type = $myts->addSlashes($_POST["type"]); + $company = $myts->addSlashes($_POST["company"]); + if ($xoopsModuleConfig['jobs_form_options'] == 'dhtmltextarea' || $xoopsModuleConfig['jobs_form_options'] == 'dhtml') { + $desctext = $myts->displayTarea($_POST["desctext"],0,0,0,0,0); + } else { + $desctext = $myts->displayTarea($_POST["desctext"],1,1,1,1,1); + } + if ($xoopsModuleConfig['jobs_form_options'] == 'dhtmltextarea' || $xoopsModuleConfig['jobs_form_options'] == 'dhtml') { + $requirements = $myts->displayTarea($_POST["requirements"],0,0,1,0,0); + } else { + $requirements = $myts->displayTarea($_POST["requirements"], 1,1,1,1,1); + } - $title = $myts->makeTboxData4Save($_POST["title"]); - $status = $myts->makeTboxData4Save($_POST["status"]); - $expire = $myts->makeTboxData4Save($_POST["expire"]); - $type = $myts->makeTboxData4Save($_POST["type"]); - $company = $myts->makeTboxData4Save($_POST["company"]); - $desctext = $myts->makeTboxData4Save($_POST["desctext"]); - $requirements = $myts->makeTboxData4Save($_POST["requirements"]); - $tel = $myts->makeTboxData4Save($_POST["tel"]); - $price = $myts->makeTboxData4Save($_POST["price"]); - $typeprice = $myts->makeTboxData4Save($_POST["typeprice"]); - $contactinfo = $myts->makeTboxData4Save($_POST["contactinfo"]); - $submitter = $myts->makeTboxData4Save($_POST["submitter"]); - $usid = $myts->makeTboxData4Save($member_usid); - $town = $myts->makeTboxData4Save($_POST["town"]); - $state = $myts->makeTboxData4Save($_POST["state"]); - $valid = $myts->makeTboxData4Save($_POST["valid"]); - $email = $myts->makeTboxData4Save($_POST["email"]); + $tel = $myts->addSlashes($_POST["tel"]); + $price = $myts->addSlashes($_POST["price"]); + $typeprice = $myts->addSlashes($_POST["typeprice"]); + $contactinfo = $myts->displayTarea($_POST["contactinfo"],0,0,0,0,0); + $contactinfo1 = $myts->displayTarea($_POST["contactinfo1"],0,0,0,0,0); + $contactinfo2 = $myts->displayTarea($_POST["contactinfo2"],0,0,0,0,0); + $submitter = $myts->addSlashes($_POST["submitter"]); + $usid = $myts->addSlashes($member_usid); + $town = $myts->addSlashes($_POST["town"]); + $state = $myts->addSlashes($_POST["state"]); + $valid = $myts->addSlashes($_POST["valid"]); + $email = $myts->addSlashes($_POST["email"]); $view = 0; $photo = ''; $date = time(); - $photomax=$xoopsModuleConfig['jobs_maxfilesize']; - $maxwide=$xoopsModuleConfig['jobs_resized_width']; - $maxhigh=$xoopsModuleConfig['jobs_resized_height']; - - - if ( !empty($_FILES['comp_img']['name']) ) { - include_once XOOPS_ROOT_PATH."/class/uploader.php"; - $updir = 'logo_images/'; - $allowed_mimetypes = array('image/gif', 'image/jpg', 'image/jpeg', 'image/pjpeg', 'image/x-png'); - $uploader = new XoopsMediaUploader($updir, $allowed_mimetypes, $photomax, $maxwide, $maxhigh); - $uploader->setTargetFileName($date.'_'.$_FILES['comp_img']['name']); - $uploader->fetchMedia('comp_img'); - if (!$uploader->upload()) { - $errors = $uploader->getErrors(); - redirect_header("addcompany.php", 3, $errors); - return False; - exit(); - } else { - $filename = $uploader->getSavedFileName(); - } - } - $newid = $xoopsDB->genId($xoopsDB->prefix("jobs_listing")."_lid_seq"); - $sql = sprintf("INSERT INTO %s (lid, cid, title, status, expire, type, company, desctext, requirements, tel, price, typeprice, contactinfo, date, email, submitter, usid, town, state, valid, photo, view) VALUES (%u, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", $xoopsDB->prefix("jobs_listing"), $newid, $cid, $title, $status, $expire, $type, $company, $desctext, $requirements, $tel, $price, $typeprice, $contactinfo, $date, $email, $submitter, $usid, $town, $state, $valid, $photo, $view); - $xoopsDB->query($sql) or $erh->show("0013"); + $sql = sprintf("INSERT INTO ".$xoopsDB->prefix("jobs_listing")." (lid, cid, title, status, expire, type, company, desctext, requirements, tel, price, typeprice, contactinfo, contactinfo1, contactinfo2, date, email, submitter, usid, town, state, valid, photo, view) VALUES ('$newid', '$cid', '$title', '$status', '$expire', '$type', '$company', '$desctext', '$requirements', '$tel', '$price', '$typeprice', '$contactinfo', '$contactinfo1', '$contactinfo2', '$date', '$email', '$submitter', '$usid', '$town', '$state', '$valid', '$photo', '$view')"); + $xoopsDB->query($sql); - if($valid == 'Yes'){ $notification_handler =& xoops_gethandler('notification'); @@ -157,139 +156,173 @@ $tags['TITLE'] = $title; $tags['TYPE'] = $type; $tags['DESCTEXT'] = $desctext; + $tags['COMPANY_TITLE'] = stripslashes($company); $tags['HELLO'] = _JOBS_HELLO; $tags['ADDED_TO_CAT'] = _JOBS_ADDED_TO_CAT; + $tags['ADDED_BY_COMPANY'] = _JOBS_ADDED_BY_COMPANY; $tags['FOLLOW_LINK'] = _JOBS_FOLLOW_LINK; $tags['RECIEVING_NOTIF'] = _JOBS_RECIEVING_NOTIF; $tags['ERROR_NOTIF'] = _JOBS_ERROR_NOTIF; - $tags['LINK_URL'] = XOOPS_URL . '/modules/'.$mydirname.'/index.php?pa=viewlistings'. '&lid=' . addslashes($lid); + $tags['WEBMASTER'] = _JOBS_WEBMASTER; + $tags['LINK_URL'] = XOOPS_URL . '/modules/'.$mydirname.'/viewjobs.php'. '?lid=' . addslashes($lid); $sql = "SELECT title FROM " . $xoopsDB->prefix("jobs_categories") . " WHERE cid=" . addslashes($cid); $result = $xoopsDB->query($sql); $row = $xoopsDB->fetchArray($result); $tags['CATEGORY_TITLE'] = $row['title']; - $tags['CATEGORY_URL'] = XOOPS_URL . '/modules/'.$mydirname.'/index.php?pa=jobsview&cid="' . addslashes($cid); + $tags['CATEGORY_URL'] = XOOPS_URL . '/modules/'.$mydirname.'/jobscat.php?cid="' . addslashes($cid); $notification_handler =& xoops_gethandler('notification'); $notification_handler->triggerEvent('global', 0, 'new_job', $tags); - $notification_handler->triggerEvent('category', $cid, 'new_job_cat', $tags); - $notification_handler->triggerEvent ('listing', $lid, 'new_job', $tags ); + $notification_handler->triggerEvent('category', $cid, 'new_jobs_cat', $tags); + $notification_handler->triggerEvent('company_listing', $comp_id, 'new_jobs_comp', $tags); + $notification_handler->triggerEvent ('job_listing', $lid, 'new_job', $tags ); } - - redirect_header("index.php",3,_JOBS_JOBADDED); - exit(); -} else { + } else { + $xoopsOption['template_main'] = 'jobs_addlisting.html'; include XOOPS_ROOT_PATH."/header.php"; + include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php"; - include_once (XOOPS_ROOT_PATH."/class/xoopstree.php"); - $mytree = new XoopsTree($xoopsDB->prefix("jobs_categories"),"cid","pid"); - $member_usid = $xoopsUser->getVar("uid", "E"); + if (isset($_POST["cid"])) { + $cid = intval($_POST["cid"]); + } else if (isset($_GET["cid"])) { + $cid = intval($_GET["cid"]); + } else { + $cid = 0; + } + + $member_usid = $xoopsUser->uid(); $member_email =$xoopsUser->getVar("email", "E"); $member_uname =$xoopsUser->getVar("uname", "E"); - $count = getCompCount($member_usid); - $thiscompany = getCompany($member_usid); $email = $member_email; + $temp_premium = "0"; + if (empty($comp_id)) { + $thiscompany = jobs_getCompany($member_usid); + } else { + $extra_user = jobs_getXtraUsers($comp_id, $member_usid); + if (!empty($extra_user)) { + $temp_premium = "1"; + } + + $thiscompany = jobs_getThisCompany($comp_id, $member_usid); + } + $result = $xoopsDB->query("select nom_type from ".$xoopsDB->prefix("jobs_type")." order by nom_type"); $result1 = $xoopsDB->query("select nom_price from ".$xoopsDB->prefix("jobs_price")." order by id_price"); + $result2 = $xoopsDB->query("select rid,name from ".$xoopsDB->prefix("jobs_region")." order by rid"); ob_start(); - $form = new XoopsThemeForm(_JOBS_ADD_LISTING, 'submitform', 'addlisting.php'); + $form = new XoopsThemeForm(_JOBS_ADD_LISTING, 'submit_form', 'addlisting.php'); $form->setExtra('enctype="multipart/form-data"'); - $GLOBALS['xoopsGTicket']->addTicketXoopsFormElement( $form , __LINE__ , 1800 , 'token' ) ; - if ($premium == 1) { + if (($premium == "1") || ($temp_premium == "1")) { echo ""._JOBS_PREMIUM_MEMBER." ". $xoopsModuleConfig['jobs_days']." "._JOBS_PREMIUM2.""; } else { echo ""; } - $form->addElement(new XoopsFormText(_JOBS_SUBMITTER, 'submitter', 50,50, $member_uname), true); - if ($xoopsModuleConfig['jobs_show_company'] == '1') { - if ($count = 0) { - $form->addElement(new XoopsFormText(_JOBS_COMPANY, "company", 40, 50, ""), true); - } - if ($count = 1) { - $form->addElement(new XoopsFormText(_JOBS_COMPANY, "company", 40, 50, $thiscompany["comp_name"]), true); - } - if ($count > 1) { - $form->addElement(new XoopsFormText(_JOBS_COMPANY, "company", 40, 50, ""), true); - } - + + $form->addElement(new XoopsFormLabel(_JOBS_SUBMITTER, $member_uname)); + $form->addElement(new XoopsFormHidden('submitter', $member_uname)); + + if ($xoopsModuleConfig['jobs_show_company'] == '1') { + $form->addElement(new XoopsFormLabel(_JOBS_COMPANY, $thiscompany["comp_name"])); + $form->addElement(new XoopsFormHidden('company', $thiscompany["comp_name"])); } + $form->addElement(new XoopsFormText(_JOBS_EMAIL, 'email', 50,100, $email), true); + $form->addElement(new XoopsFormText(_JOBS_TOWN, 'town', 50,50, $thiscompany["comp_city"]), false); - $form->addElement(new XoopsFormText(_JOBS_TOWN, 'town', 50,50, $thiscompany["comp_city"]), false); - $form->addElement(new XoopsFormText(_JOBS_STATE, 'state', 50,50, $thiscompany["comp_state"]), false); + if ($xoopsModuleConfig['jobs_show_state'] == '1') { + $state_form= new XoopsFormSelect(_JOBS_STATE, "state", $thiscompany["comp_state"], "0", false); + while (list($rid,$name) = $xoopsDB->fetchRow($result2) ) { + $state_form->addOption('',_JOBS_SELECT_STATE); + $state_form->addOption($rid, $name); + } + $form->addElement($state_form,true); + } + $form->addElement(new XoopsFormText(_JOBS_TEL, "tel", 30, 30, $thiscompany["comp_phone"]), false); - ob_start(); - $mytree->makeMySelBox("title", "title",$cid,"cid"); - $form->addElement(new XoopsFormLabel(_JOBS_CAT, ob_get_contents())); - ob_end_clean(); + $cat_form = (new XoopsFormSelect(_JOBS_CAT , 'cid','')); + $cattree = $mytree->getChildTreeArray(0,"title ASC"); + $cat_form->addOption('',_JOBS_SELECTCAT); + foreach ($cattree as $branch ) { + $branch['prefix'] = substr($branch['prefix'], 0, -1); + $branch['prefix'] = str_replace(".","--",$branch['prefix']); + $cat_form->addOption($branch['cid'],$branch['prefix'].$branch['title']); + } + $form->addElement($cat_form,true); -if ($premium == 1) { + if (($premium == "1") || ($temp_premium == "1")) { - $form->addElement(new XoopsFormText(_JOBS_HOW_LONG, "expire", 3, 3, $xoopsModuleConfig['jobs_days']), true); + $form->addElement(new XoopsFormText(_JOBS_HOW_LONG, "expire", 3, 3, $xoopsModuleConfig['jobs_days']), true); - } else { - $form->addElement(new XoopsFormLabel(_JOBS_NON_HOW_LONG, $xoopsModuleConfig['jobs_days'])); - $form->addElement(new XoopsFormHidden('expire', $xoopsModuleConfig['jobs_days'])); - } + } else { + $form->addElement(new XoopsFormLabel(_JOBS_NON_HOW_LONG, $xoopsModuleConfig['jobs_days'])); + $form->addElement(new XoopsFormHidden('expire', $xoopsModuleConfig['jobs_days'])); + } - $type_form= new XoopsFormSelect(_JOBS_JOB_TYPE, "type", "", "1", false); - while (list($nom_type) = $xoopsDB->fetchRow($result) ) { - $type_form->addOption($nom_type, $nom_type); - } - $form->addElement($type_form); + $type_form= new XoopsFormSelect(_JOBS_JOB_TYPE, "type", "", "0", false); + while (list($nom_type) = $xoopsDB->fetchRow($result) ) { + $type_form->addOption($nom_type, $nom_type); + } + $form->addElement($type_form); -if ($premium == "1") { + if (($premium == "1") || ($temp_premium == "1")) { $radio = new XoopsFormRadio(_JOBS_STATUS, 'status', ""); $options["0"]=_JOBS_ACTIVE; $options["1"]=_JOBS_INACTIVE; $radio->addOptionArray($options); $form->addElement($radio,true); + } else { + $form->addElement(new XoopsFormHidden('status', "0")); } + $form->addElement(new XoopsFormText(_JOBS_TITLE, "title", 40, 50, ""), true); + $form->addElement(jobs_getEditor(_JOBS_DESC, "desctext", "", "100%", "300px",""), true); + $form->addElement(jobs_getEditor(_JOBS_REQUIRE, "requirements", "", "100%", "300px",""), true); + $form->addElement(new XoopsFormText(_JOBS_PRICE2, "price", 40, 50, ""), false); + $sel_form= new XoopsFormSelect(_JOBS_SALARYTYPE, "typeprice", "", "1", false); + while (list($nom_price) = $xoopsDB->fetchRow($result1)) { + $sel_form->addOption($nom_price, $nom_price); + } + $form->addElement($sel_form); - $form->addElement(new XoopsFormText(_JOBS_TITLE, "title", 40, 50, ""), true); + $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO, "contactinfo", "".$myts->undoHtmlSpecialChars($myts->displayTarea($thiscompany["comp_contact"],0,0,0,0,0))."", 6, 40), true); - $form->addElement(getEditor(_JOBS_DESC, "desctext", "", 5, 40), true); - $form->addElement(new XoopsFormTextArea(_JOBS_REQUIRE, "requirements", "", 6, 40), false); - - $form->addElement(new XoopsFormText(_JOBS_PRICE2, "price", 40, 50, ""), false); - - $sel_form= new XoopsFormSelect(_JOBS_SALARYTYPE, "typeprice", "", "1", false); - while (list($nom_price) = $xoopsDB->fetchRow($result1)) { - $sel_form->addOption($nom_price, $nom_price); - } - $form->addElement($sel_form); - - $form->addElement(new XoopsFormText(_JOBS_EMAIL, 'email', 50,100, $email), true); - - $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO, 'contactinfo', "".$thiscompany["comp_contact"]."", 6, 40), false); - + if (($premium == "1") || ($temp_premium == "1")) { if ($thiscompany["comp_user1_contact"]) { - $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO, 'contactinfo', "".$thiscompany["comp_user1_contact"]."", 6, 40), false); + $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO1, "contactinfo1", "".$thiscompany["comp_user1_contact"]."", 6, 40), false); + } else { + $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO1, "contactinfo1", "", 6, 40), false); } if ($thiscompany["comp_user2_contact"]) { - $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO, 'contactinfo', "".$thiscompany["comp_user2_contact"]."", 6, 40), false); + $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO2, "contactinfo2", "".$thiscompany["comp_user2_contact"]."", 6, 40), false); + } else { + $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO2, "contactinfo2", "", 6, 40), false); } - + } else { + $form->addElement(new XoopsFormHidden('contactinfo1', "")); + $form->addElement(new XoopsFormHidden('contactinfo2', "")); + } +// if ($xoopsModuleConfig['jobs_use_captcha'] == '1') { +// $form->addElement(new XoopsFormCaptcha(_JOBS_CAPTCHA, "xoopscaptcha", false), true); +// } if ($xoopsModuleConfig['jobs_moderated'] == 0) { - $form->addElement(new XoopsFormHidden("valid", "Yes"), false); + $form->addElement(new XoopsFormHidden("valid", "Yes"), false); } else { - $form->addElement(new XoopsFormHidden("valid", "No"), false); + $form->addElement(new XoopsFormHidden("valid", "No"), false); } + $form->addElement(new XoopsFormHidden("comp_id", $thiscompany["comp_id"]), false); + $form->addElement(new XoopsFormButton('', 'submit', _JOBS_SUBMIT, 'submit')); + $form->display(); + $xoopsTpl->assign('submit_form', ob_get_contents()); + ob_end_clean(); + $xoopsTpl->assign('lang_comp_city', _JOBS_COMPANY_CITY); + } + include XOOPS_ROOT_PATH.'/footer.php'; - $form->addElement(new XoopsFormButton('', 'submit', _JOBS_SUBMIT, 'submit')); - $form->display(); - $xoopsTpl->assign('submit_form', ob_get_contents()); - ob_end_clean(); - - $xoopsTpl->assign('lang_comp_city', _JOBS_COMPANY_CITY); - - include XOOPS_ROOT_PATH.'/footer.php'; -} ?> \ No newline at end of file Modified: XoopsModules/jobs/trunk/jobs/addresume.php =================================================================== --- XoopsModules/jobs/trunk/jobs/addresume.php 2012-10-08 16:57:16 UTC (rev 10202) +++ XoopsModules/jobs/trunk/jobs/addresume.php 2012-10-08 17:01:42 UTC (rev 10203) @@ -1,24 +1,18 @@ <?php // ----------------------------------------------------------------------- // -// Jobs for Xoops 2.0x // -// By John Mordo from the myAds 2.04 Module // -// All Original credits left below this // -// // -// // -// // - // +// Jobs Module for Xoops // +// John Mordo - jlm69 at Xoops // +// Licence Type : GPL // // ------------------------------------------------------------------------- // -// E-Xoops: Content Management for the Masses // -// < http://www.e-xoops.com > // -// ------------------------------------------------------------------------- // -// Original Author: Pascal Le Boustouller -// Author Website : pas...@pe... -// Licence Type : GPL -// ------------------------------------------------------------------------- // + include("header.php"); $mydirname = basename( dirname( __FILE__ ) ) ; require_once( XOOPS_ROOT_PATH."/modules/$mydirname/include/gtickets.php" ) ; +include_once (XOOPS_ROOT_PATH."/modules/$mydirname/include/resume_functions.php"); +include_once XOOPS_ROOT_PATH."/modules/$mydirname/class/restree.php"; + $myts =& MyTextSanitizer::getInstance(); + $module_id = $xoopsModule->getVar('mid'); if (is_object($xoopsUser)) { $groups = $xoopsUser->getGroups(); @@ -33,208 +27,77 @@ } //If no access if (!$gperm_handler->checkRight("resume_submit", $perm_itemid, $groups, $module_id)) { - redirect_header(XOOPS_URL."/user.php", 3, _NOPERM); + redirect_header(XOOPS_URL."/modules/$mydirname/resumes.php", 3, _NOPERM); exit(); } -//Check if user already has a resume submitted // -function resumeexists($usid) -{ - global $xoopsDB, $xoopsConfig, $xoopsUser, $xoopsTheme, $xoopsLogger, $xoopsModule, $mydirname; + if (isset($_POST["cid"])) { + $cid = intval($_POST["cid"]); + } else if (isset($_GET["cid"])) { + $cid = intval($_GET["cid"]); + } - $member_id =$xoopsUser->getVar("uid", "E"); + $member_usid = $xoopsUser->getVar("uid", "E"); - $result=$xoopsDB->query("select lid, cid, usid FROM ".$xoopsDB->prefix("jobs_resume")." WHERE usid = ".mysql_real_escape_string($member_id).""); - $recordexist = $xoopsDB->getRowsNum($result); + if (!empty($_POST['submit']) ) { - if ($recordexist) { - list($lid, $cid, $usid)=$xoopsDB->fetchRow($result); - redirect_header("index2.php?pa=viewResume&lid=".addslashes($lid)."", 5, _JOBS_RES_EXISTS); - exit(); - }else{ -addresume($cid); -} -} - -function addresume($cid) -{ - global $xoopsDB, $xoopsConfig, $xoopsUser, $xoopsTheme, $xoopsLogger, $xoopsModule, $xoopsModuleConfig, $mydirname; - -$member_id =$xoopsUser->getVar("uid", "E"); -//$token = $GLOBALS['xoopsSecurity']->createToken(); -include_once (XOOPS_ROOT_PATH."/modules/$mydirname/include/functions.php"); -include_once (XOOPS_ROOT_PATH."/class/xoopstree.php"); -$mytree = new XoopsTree($xoopsDB->prefix("jobs_res_categories"),"cid","pid"); - - $resdays=$xoopsModuleConfig['jobs_res_days']; - $resumesize=$xoopsModuleConfig['jobs_resumesize']; - $resumesize1=$xoopsModuleConfig['jobs_resumesize']/1024; - $photomax=$xoopsModuleConfig['jobs_maxfilesize']; - $photomax1=$xoopsModuleConfig['jobs_maxfilesize']/1024; - - echo "<script type=\"text/javascript\"> - function verify() { - var msg = \""._JOBS_VALIDERORMSG."\\n__________________________________________________\\n\\n\"; - var errors = \"FALSE\"; - - if (document.add.type.value == \"0\") { - errors = \"TRUE\"; - msg += \""._JOBS_VALIDTYPE."\\n\"; - } - if (document.add.cid.value == \"\") { - errors = \"TRUE\"; - msg += \""._JOBS_VALIDCAT."\\n\"; - } - - if (document.add.title.value == \"\") { - errors = \"TRUE\"; - msg += \""._JOBS_VALIDTITLE."\\n\"; - } - if (document.add.submitter.value == \"\") { - errors = \"TRUE\"; - msg += \""._JOBS_VALIDSUBMITTER."\\n\"; - } - - if (document.add.email.value == \"\") { - errors = \"TRUE\"; - msg += \""._JOBS_VALIDEMAIL."\\n\"; - } - if (errors == \"TRUE\") { - msg += \"__________________________________________________\\n\\n"._JOBS_VALIDMSG."\\n\"; - alert(msg); - return false; - } - } - </script>"; - - list($numrows) = $xoopsDB->fetchRow($xoopsDB->query("select cid, title, affprice from ".$xoopsDB->prefix("jobs_res_categories")."")); - - if ($numrows>0) { - //OpenTable(); - echo "<table width='100%' border='0' cellspacing='1' cellpadding='8'><tr class='bg4'><td valign='top'>\n"; - if ($xoopsModuleConfig['jobs_moderate_resume'] == '1') { - echo "<b>"._JOBS_RES_ADDLISTING3."</b><br /><br /><center>"._JOBS_RES_JOBMODERATE." $resdays <br />"._JOBS_RES_MODERATE2."</center><br /><br />"; - } else { - echo "<b>"._JOBS_RES_ADDL... [truncated message content] |