|
From: <be...@us...> - 2013-07-09 22:51:15
|
Revision: 11820
http://sourceforge.net/p/xoops/svn/11820
Author: beckmi
Date: 2013-07-09 22:51:11 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Merging 4.4 Beta 2 into trunk
Modified Paths:
--------------
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/addcomp.php
XoopsModules/jobs/trunk/jobs/admin/addregion.php
XoopsModules/jobs/trunk/jobs/admin/addresume.php
XoopsModules/jobs/trunk/jobs/admin/admin_header.php
XoopsModules/jobs/trunk/jobs/admin/category.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/groupperms.php
XoopsModules/jobs/trunk/jobs/admin/header.php
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/italy.php
XoopsModules/jobs/trunk/jobs/admin/include/usstates.php
XoopsModules/jobs/trunk/jobs/admin/index.php
XoopsModules/jobs/trunk/jobs/admin/jobs_doc_1.php
XoopsModules/jobs/trunk/jobs/admin/lists.php
XoopsModules/jobs/trunk/jobs/admin/map.php
XoopsModules/jobs/trunk/jobs/admin/menu.php
XoopsModules/jobs/trunk/jobs/admin/modcomp.php
XoopsModules/jobs/trunk/jobs/admin/modresume.php
XoopsModules/jobs/trunk/jobs/admin/mygroupperm.php
XoopsModules/jobs/trunk/jobs/admin/region.php
XoopsModules/jobs/trunk/jobs/admin/submitlisting.php
XoopsModules/jobs/trunk/jobs/admin/upgrade.php
XoopsModules/jobs/trunk/jobs/blocks/jobs.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/mygrouppermform.php
XoopsModules/jobs/trunk/jobs/class/pagenav.php
XoopsModules/jobs/trunk/jobs/class/pictures.php
XoopsModules/jobs/trunk/jobs/class/restree.php
XoopsModules/jobs/trunk/jobs/contact.php
XoopsModules/jobs/trunk/jobs/contactresume.php
XoopsModules/jobs/trunk/jobs/createresume.php
XoopsModules/jobs/trunk/jobs/delcompany.php
XoopsModules/jobs/trunk/jobs/delcreated.php
XoopsModules/jobs/trunk/jobs/deljob.php
XoopsModules/jobs/trunk/jobs/delpicture.php
XoopsModules/jobs/trunk/jobs/delreply.php
XoopsModules/jobs/trunk/jobs/delresume.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/gd.class.php
XoopsModules/jobs/trunk/jobs/include/gtickets.php
XoopsModules/jobs/trunk/jobs/include/notification.inc.php
XoopsModules/jobs/trunk/jobs/include/onupdate.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/include/updateblock.inc.php
XoopsModules/jobs/trunk/jobs/include/waiting.plugin.php
XoopsModules/jobs/trunk/jobs/include/yogurt.css
XoopsModules/jobs/trunk/jobs/index.php
XoopsModules/jobs/trunk/jobs/ip_image.php
XoopsModules/jobs/trunk/jobs/jobscat.php
XoopsModules/jobs/trunk/jobs/language/english/admin.php
XoopsModules/jobs/trunk/jobs/language/english/blocks.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/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_expires.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/mail_template/jobs_send_friend.tpl
XoopsModules/jobs/trunk/jobs/language/english/mail_template/jobs_send_resume.tpl
XoopsModules/jobs/trunk/jobs/language/english/main.php
XoopsModules/jobs/trunk/jobs/language/english/modinfo.php
XoopsModules/jobs/trunk/jobs/language/english/waiting.php
XoopsModules/jobs/trunk/jobs/lightbox/css/index.html
XoopsModules/jobs/trunk/jobs/lightbox/css/lightbox.css
XoopsModules/jobs/trunk/jobs/lightbox/js/effects.js
XoopsModules/jobs/trunk/jobs/lightbox/js/index.html
XoopsModules/jobs/trunk/jobs/lightbox/js/lightbox.js
XoopsModules/jobs/trunk/jobs/lightbox/js/prototype.js
XoopsModules/jobs/trunk/jobs/lightbox/js/scriptaculous.js
XoopsModules/jobs/trunk/jobs/members.php
XoopsModules/jobs/trunk/jobs/modcompany.php
XoopsModules/jobs/trunk/jobs/modcreated.php
XoopsModules/jobs/trunk/jobs/modjob.php
XoopsModules/jobs/trunk/jobs/modresume.php
XoopsModules/jobs/trunk/jobs/myresume.php
XoopsModules/jobs/trunk/jobs/notification_update.php
XoopsModules/jobs/trunk/jobs/print.php
XoopsModules/jobs/trunk/jobs/replies.php
XoopsModules/jobs/trunk/jobs/resumecat.php
XoopsModules/jobs/trunk/jobs/resumes.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_b2.html
XoopsModules/jobs/trunk/jobs/templates/blocks/jobs_block_new.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_add_company.html
XoopsModules/jobs/trunk/jobs/templates/jobs_addlisting.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_choose_company.html
XoopsModules/jobs/trunk/jobs/templates/jobs_editcomp.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_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/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/templates/jobs_view_created.html
XoopsModules/jobs/trunk/jobs/templates/jobs_view_photos.html
XoopsModules/jobs/trunk/jobs/view_photos.php
XoopsModules/jobs/trunk/jobs/viewjobs.php
XoopsModules/jobs/trunk/jobs/viewresume.php
XoopsModules/jobs/trunk/jobs/whatcompany.php
XoopsModules/jobs/trunk/jobs/xoops_version.php
Added Paths:
-----------
XoopsModules/jobs/trunk/jobs/admin/about.php
XoopsModules/jobs/trunk/jobs/admin/admin_footer.php
XoopsModules/jobs/trunk/jobs/admin/job_categories.php
XoopsModules/jobs/trunk/jobs/admin/jobs.php
XoopsModules/jobs/trunk/jobs/admin/main.php
XoopsModules/jobs/trunk/jobs/admin/map - Copy.php
XoopsModules/jobs/trunk/jobs/admin/modjobs.php
XoopsModules/jobs/trunk/jobs/admin/resume_categories.php
XoopsModules/jobs/trunk/jobs/admin/resumes.php
XoopsModules/jobs/trunk/jobs/class/jobs_categories.php
XoopsModules/jobs/trunk/jobs/class/jobs_res_categories.php
XoopsModules/jobs/trunk/jobs/docs/
XoopsModules/jobs/trunk/jobs/docs/changelog.txt
XoopsModules/jobs/trunk/jobs/docs/credits.txt
XoopsModules/jobs/trunk/jobs/docs/index.html
XoopsModules/jobs/trunk/jobs/docs/install.txt
XoopsModules/jobs/trunk/jobs/docs/lang_diff.txt
XoopsModules/jobs/trunk/jobs/docs/license.txt
XoopsModules/jobs/trunk/jobs/docs/readme.txt
XoopsModules/jobs/trunk/jobs/images/16/
XoopsModules/jobs/trunk/jobs/images/16/index.html
XoopsModules/jobs/trunk/jobs/images/32/
XoopsModules/jobs/trunk/jobs/images/32/index.html
XoopsModules/jobs/trunk/jobs/images/jobs_slogo.png
XoopsModules/jobs/trunk/jobs/language/english/help/
XoopsModules/jobs/trunk/jobs/language/english/help/help.html
XoopsModules/jobs/trunk/jobs/language/english/help/index.html
Modified: XoopsModules/jobs/trunk/jobs/add_photo.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/add_photo.php 2013-07-09 18:21:40 UTC (rev 11819)
+++ XoopsModules/jobs/trunk/jobs/add_photo.php 2013-07-09 22:51:11 UTC (rev 11820)
@@ -24,9 +24,9 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-$main_lang = '_' . strtoupper( $mydirname ) ;
-$lid = !isset($_REQUEST['lid'])? NULL : $_REQUEST['lid'];
+$mydirname = basename(dirname(dirname(__FILE__)));
+$main_lang = '_' . strtoupper($mydirname);
+$lid = !isset($_REQUEST['lid']) ? NULL : $_REQUEST['lid'];
/**
* Xoops header ...
@@ -36,71 +36,80 @@
include_once("../../header.php");
/**
- * Modules class includes
+ * Modules class includes
*/
include("class/pictures.php");
/**
- * Factory of pictures created
+ * Factory of pictures created
*/
$album_factory = new Xoopsjlm_picturesHandler($xoopsDB);
/**
- * Getting the title
+ * Getting the title
*/
$title = $_POST['caption'];
/**
- * Getting parameters defined in admin side
+ * Getting parameters defined in admin side
*/
-$path_upload = $xoopsModuleConfig["jobs_path_upload"];
-$pictwidth = $xoopsModuleConfig["jobs_resized_width"];
-$pictheight = $xoopsModuleConfig["jobs_resized_height"];
-$thumbwidth = $xoopsModuleConfig["jobs_thumb_width"];
-$thumbheight = $xoopsModuleConfig["jobs_thumb_height"];
-$maxfilebytes = $xoopsModuleConfig["jobs_maxfilesize"];
-$maxfileheight = $xoopsModuleConfig["jobs_max_original_height"];
-$maxfilewidth = $xoopsModuleConfig["jobs_max_original_width"];
+$path_upload = $xoopsModuleConfig["jobs_path_upload"];
+$pictwidth = $xoopsModuleConfig["jobs_resized_width"];
+$pictheight = $xoopsModuleConfig["jobs_resized_height"];
+$thumbwidth = $xoopsModuleConfig["jobs_thumb_width"];
+$thumbheight = $xoopsModuleConfig["jobs_thumb_height"];
+$maxfilebytes = $xoopsModuleConfig["jobs_maxfilesize"];
+$maxfileheight = $xoopsModuleConfig["jobs_max_original_height"];
+$maxfilewidth = $xoopsModuleConfig["jobs_max_original_width"];
/**
- * If we are receiving a file
+ * If we are receiving a file
*/
-if ($_POST['xoops_upload_file'][0]=='sel_photo'){
+if ($_POST['xoops_upload_file'][0] == 'sel_photo') {
- /**
- * Check if using Xoops or XoopsCube (by jlm69)
- */
+ /**
+ * Check if using Xoops or XoopsCube (by jlm69)
+ */
-$xCube=false;
-if(preg_match("/^XOOPS Cube/",XOOPS_VERSION)) // XOOPS Cube 2.1x
-{
-$xCube=true;
-}
-if ($xCube) {
- if ( ! $xoopsGTicket->check( true , 'token' ) ) {
- redirect_header(XOOPS_URL.'/',3,$xoopsGTicket->getErrors());
- }
-} else {
- if (!($GLOBALS['xoopsSecurity']->check())){
- redirect_header($_SERVER['HTTP_REFERER'], 3, constant($main_lang."_TOKENEXPIRED"));
- }
-}
- /**
- * Try to upload picture resize it insert in database and then redirect to index
- */
- if ($album_factory->receivePicture($title,$path_upload, $thumbwidth, $thumbheight, $pictwidth, $pictheight, $maxfilebytes,$maxfilewidth,$maxfileheight)){
- header("Location: ".XOOPS_URL."/modules/$mydirname/view_photos.php?lid=$lid&uid=".$xoopsUser->getVar('uid'));
+ $xCube = FALSE;
+ if (preg_match("/^XOOPS Cube/", XOOPS_VERSION)) // XOOPS Cube 2.1x
+ {
+ $xCube = TRUE;
+ }
+ if ($xCube) {
+ if (!$xoopsGTicket->check(TRUE, 'token')) {
+ redirect_header(XOOPS_URL . '/', 3, $xoopsGTicket->getErrors());
+ }
+ } else {
+ if (!($GLOBALS['xoopsSecurity']->check())) {
+ redirect_header($_SERVER['HTTP_REFERER'], 3, constant($main_lang . "_TOKENEXPIRED"));
+ }
+ }
+ /**
+ * Try to upload picture resize it insert in database and then redirect to index
+ */
+ if ($album_factory->receivePicture($title, $path_upload, $thumbwidth, $thumbheight, $pictwidth, $pictheight, $maxfilebytes, $maxfilewidth, $maxfileheight)) {
+ header(
+ "Location: " . XOOPS_URL . "/modules/$mydirname/view_photos.php?lid=$lid&uid=" . $xoopsUser->getVar('uid')
+ );
- $xoopsDB->queryF("UPDATE ".$xoopsDB->prefix("jobs_resume")." SET rphoto=rphoto+1 WHERE lid = ".mysql_real_escape_string($lid)."");
+ $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'),3,constant($main_lang."_NOCACHACA"));
- }
+ } else {
+ redirect_header(
+ XOOPS_URL . "/modules/$mydirname/view_photos.php?uid=" . $xoopsUser->getVar('uid'), 3, constant(
+ $main_lang . "_NOCACHACA"
+ )
+ );
+ }
}
/**
- * Close page
+ * Close page
*/
include("../../footer.php");
?>
\ No newline at end of file
Modified: XoopsModules/jobs/trunk/jobs/addcompany.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/addcompany.php 2013-07-09 18:21:40 UTC (rev 11819)
+++ XoopsModules/jobs/trunk/jobs/addcompany.php 2013-07-09 22:51:11 UTC (rev 11820)
@@ -25,23 +25,23 @@
// 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/module.errorhandler.php";
-include XOOPS_ROOT_PATH."/modules/$mydirname/include/functions.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+$mydirname = basename(dirname(__FILE__));
+$myts =& MyTextSanitizer::getInstance(); // MyTextSanitizer object
+include_once XOOPS_ROOT_PATH . "/class/module.errorhandler.php";
+include XOOPS_ROOT_PATH . "/modules/$mydirname/include/functions.php";
+include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
$erh = new ErrorHandler; //ErrorHandler object
if (empty($xoopsUser)) {
- redirect_header(XOOPS_URL."/modules/profile/",3,_JOBS_MUSTREGFIRST);
- exit();
+ 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;
+ $groups = XOOPS_GROUP_ANONYMOUS;
}
$gperm_handler =& xoops_gethandler('groupperm');
if (isset($_POST['item_id'])) {
@@ -50,7 +50,7 @@
$perm_itemid = 0;
}
if (!$gperm_handler->checkRight("jobs_submit", $perm_itemid, $groups, $module_id)) {
- redirect_header(XOOPS_URL."/index.php", 3, _NOPERM);
+ redirect_header(XOOPS_URL . "/index.php", 3, _NOPERM);
exit();
}
if (!$gperm_handler->checkRight("jobs_premium", $perm_itemid, $groups, $module_id)) {
@@ -62,274 +62,306 @@
$member_usid = $xoopsUser->getVar("uid", "E");
$member_comp = jobs_getCompany($member_usid);
if ($member_comp) {
- redirect_header(XOOPS_URL."/modules/$mydirname/index.php",3,_JOBS_COMPANY_EXISTS);
+ redirect_header(XOOPS_URL . "/modules/$mydirname/index.php", 3, _JOBS_COMPANY_EXISTS);
}
if (!empty($_POST['submit'])) {
- if (!$GLOBALS['xoopsSecurity']->check(true, $_REQUEST['token'])) {
- redirect_header(XOOPS_URL."/modules/$mydirname/index.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
+ if (!$GLOBALS['xoopsSecurity']->check(TRUE, $_REQUEST['token'])) {
+ redirect_header(
+ XOOPS_URL . "/modules/$mydirname/index.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+ );
+ }
- $destination = XOOPS_ROOT_PATH."/modules/$mydirname/logo_images";
- $photomax = $xoopsModuleConfig['jobs_maxfilesize'];
- $maxwide = $xoopsModuleConfig['jobs_resized_width'];
- $maxhigh = $xoopsModuleConfig['jobs_resized_height'];
- $date = time();
+ $destination = XOOPS_ROOT_PATH . "/modules/$mydirname/logo_images";
+ $photomax = $xoopsModuleConfig['jobs_maxfilesize'];
+ $maxwide = $xoopsModuleConfig['jobs_resized_width'];
+ $maxhigh = $xoopsModuleConfig['jobs_resized_height'];
+ $date = time();
- $comp_usid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $comp_usid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 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'];
+ $_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'];
- $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->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"]);
if ($premium == "1") {
// START - check new entries for company users are OK - GreenFlatDog
-$comp_users = array();
+ $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=";
-}
+ 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";
- }
+ if (empty($_POST["comp_user2"])) {
+ $comp_userid2 = "";
} else {
- // no user id for name entered
- $errs .= $u['entry'] . $u['name'] . $u['prob'] . "n";
+ $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";
+ }
+ }
+ 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();
+ }
}
- }
- 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"]);
+ $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_userid1 = "";
+ $comp_userid2 = "";
+ $comp_user1_contact = "";
+ $comp_user2_contact = "";
- }
-
- $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/png', '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_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");
+ $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/png', '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();
+ }
+ }
- 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");
- redirect_header("addlisting.php",3,_JOBS_RECEIVED);
- exit();
+ $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['...
[truncated message content] |
|
From: <be...@us...> - 2013-07-09 22:55:30
|
Revision: 11821
http://sourceforge.net/p/xoops/svn/11821
Author: beckmi
Date: 2013-07-09 22:55:24 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Merging 4.4 RC1 from JLM69
Modified Paths:
--------------
XoopsModules/jobs/trunk/jobs/admin/groupperms.php
XoopsModules/jobs/trunk/jobs/admin/header.php
XoopsModules/jobs/trunk/jobs/admin/job_categories.php
XoopsModules/jobs/trunk/jobs/admin/modjobs.php
XoopsModules/jobs/trunk/jobs/admin/submitlisting.php
XoopsModules/jobs/trunk/jobs/blocks/jobs.php
XoopsModules/jobs/trunk/jobs/blocks/resumes.php
XoopsModules/jobs/trunk/jobs/class/jobs_categories.php
XoopsModules/jobs/trunk/jobs/docs/changelog.txt
XoopsModules/jobs/trunk/jobs/include/functions.php
XoopsModules/jobs/trunk/jobs/include/notification.inc.php
XoopsModules/jobs/trunk/jobs/language/english/admin.php
XoopsModules/jobs/trunk/jobs/language/english/blocks.php
XoopsModules/jobs/trunk/jobs/language/english/docs.php
XoopsModules/jobs/trunk/jobs/language/english/main.php
XoopsModules/jobs/trunk/jobs/language/english/modinfo.php
XoopsModules/jobs/trunk/jobs/language/english/waiting.php
XoopsModules/jobs/trunk/jobs/members.php
XoopsModules/jobs/trunk/jobs/modcompany.php
XoopsModules/jobs/trunk/jobs/modjob.php
XoopsModules/jobs/trunk/jobs/viewjobs.php
XoopsModules/jobs/trunk/jobs/xoops_version.php
Added Paths:
-----------
XoopsModules/jobs/trunk/jobs/admin/permissions.php
Removed Paths:
-------------
XoopsModules/jobs/trunk/jobs/admin/error_log
Deleted: XoopsModules/jobs/trunk/jobs/admin/error_log
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/error_log 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/admin/error_log 2013-07-09 22:55:24 UTC (rev 11821)
@@ -1,9 +0,0 @@
-[23-May-2010 18:49:23] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
-[23-May-2010 18:49:34] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
-[23-May-2010 18:49:48] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
-[23-May-2010 18:49:50] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
-[23-May-2010 18:49:53] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
-[23-May-2010 18:49:58] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
-[23-May-2010 18:50:07] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
-[23-May-2010 18:50:18] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
-[23-May-2010 18:50:28] PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll' - /usr/local/lib/php/extensions/no-debug-non-zts-20060613/php_exif.dll: cannot open shared object file: No such file or directory in Unknown on line 0
Modified: XoopsModules/jobs/trunk/jobs/admin/groupperms.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/groupperms.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/admin/groupperms.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -30,7 +30,8 @@
$cloned_lang = '_MI_' . strtoupper($mydirname);
include_once '../../../include/cp_header.php';
include_once(XOOPS_ROOT_PATH . "/modules/$mydirname/class/jobtree.php");
-include_once XOOPS_ROOT_PATH . "/class/xoopsform/grouppermform.php";
+//include_once XOOPS_ROOT_PATH . "/modules/$mydirname/class/grouppermform.php";
+include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
// xoops_cp_header();
//include( './mymenu.php' ) ;
/***** grandoc 13/10/08 ******/
Modified: XoopsModules/jobs/trunk/jobs/admin/header.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/header.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/admin/header.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -81,7 +81,7 @@
<td style="width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;">
<a href="../index.php">' . $GLOBALS["xoopsModule"]->getVar("name") . '</a><br />
<a href="../resumes.php">' . _MI_JOBS_RESUMES . '</a>
- </td>
+ </td>
<td style="width: 30%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;">
<strong>' . $GLOBALS["xoopsModule"]->getVar("name") . '</strong> ' . $breadcrumb . '
</td>
Modified: XoopsModules/jobs/trunk/jobs/admin/job_categories.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/job_categories.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/admin/job_categories.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -170,7 +170,7 @@
case "save_category":
if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header("job.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header("jobs.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
if (isset($_REQUEST["cid"])) {
$obj =& $jobsJobs_categoriesHandler->get($_REQUEST["cid"]);
Modified: XoopsModules/jobs/trunk/jobs/admin/modjobs.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/modjobs.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/admin/modjobs.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -354,6 +354,10 @@
// $form->addElement(new XoopsFormHidden("valid", "0"), FALSE);
// }
+
+ $form->addElement(new XoopsFormHidden("photo", $photo), FALSE);
+ $form->addElement(new XoopsFormHidden("view", $view), FALSE);
+
$form->addElement(new XoopsFormHidden("lid", $lid), FALSE);
$form->addElement(new XoopsFormHidden("date", $date), FALSE);
$form->addElement(new XoopsFormHidden("submit", "1"), FALSE);
Added: XoopsModules/jobs/trunk/jobs/admin/permissions.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/permissions.php (rev 0)
+++ XoopsModules/jobs/trunk/jobs/admin/permissions.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -0,0 +1,46 @@
+<?php
+/**
+ * $Id$
+ * Module: WF-Downloads
+ * Version: v2.0.5a
+ * Release Date: 26 july 2004
+ * Author: WF-Sections
+ * Licence: GNU
+ */
+
+include 'admin_header.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+include_once '../../../include/cp_header.php';
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('permissions.php');
+
+//wfdownloads_adminMenu(9, _AM_WFD_PERM_MANAGEMENT);
+
+ echo "
+ <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_PERM_CPERMISSIONS . "</legend>\n
+ <div style='padding: 2px;'>\n";
+
+$cat_form = new XoopsGroupPermForm('', $xoopsModule->getVar('mid'), 'jobs_category', _AM_WFD_PERM_CSELECTPERMISSIONS,'admin/permissions.php');
+
+$category_handler = xoops_getmodulehandler('jobs_categories');
+$categories = $category_handler->getObjects();
+if (count($categories) > 0)
+{
+ foreach (array_keys($categories) as $i)
+ {
+ $cat_form->addItem($categories[$i]->getVar('cid'), $categories[$i]->getVar('title'), $categories[$i]->getVar('pid'));
+ }
+ echo $cat_form->render();
+}
+else
+{
+ echo "<div><b>" . _AM_WFD_PERM_CNOCATEGORY . "</b></div>";
+}
+echo "</div></fieldset><br />";
+unset ($cat_form);
+
+echo _AM_WFD_PERM_PERMSNOTE;
+
+//xoops_cp_footer();
+include_once "admin_footer.php";
\ No newline at end of file
Property changes on: XoopsModules/jobs/trunk/jobs/admin/permissions.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/jobs/trunk/jobs/admin/submitlisting.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/submitlisting.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/admin/submitlisting.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -74,6 +74,7 @@
$member_usid = $xoopsUser->getVar("uid", "E");
+
if (!empty($_POST['submit'])) {
$jobsdays = $xoopsModuleConfig['jobs_days'];
Modified: XoopsModules/jobs/trunk/jobs/blocks/jobs.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/blocks/jobs.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/blocks/jobs.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -38,7 +38,7 @@
$result = $xoopsDB->query(
"SELECT lid, cid, title, status, expire, type, company, desctext, requirements, tel, price, typeprice, contactinfo, date, email, submitter, usid, town, state, valid, photo, view FROM "
. $xoopsDB->prefix("" . $blockdirname . "_listing")
- . " WHERE valid='1' and status!='1' $cat_perms ORDER BY " . $options[0] . " DESC", $options[1], 0
+ . " WHERE valid='1' and status!='0' $cat_perms ORDER BY " . $options[0] . " DESC", $options[1], 0
);
while ($myrow = $xoopsDB->fetchArray($result)) {
Modified: XoopsModules/jobs/trunk/jobs/blocks/resumes.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/blocks/resumes.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/blocks/resumes.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -93,11 +93,11 @@
$block['lang_hits'] = constant($block_lang . "_HITS");
$block['link']
=
- "<a href=\"" . XOOPS_URL . "/modules/$blockdirname/resumes.php\"><b>" . constant($block_lang . "_ALL_LISTINGS")
+ "<a href=\"" . XOOPS_URL . "/modules/$blockdirname/reumes.php\"><b>" . constant($block_lang . "_ALL_LISTINGS")
. "</b></a>";
$block['add']
=
- "<a href=\"" . XOOPS_URL . "/modules/$blockdirname/resumes.php\"><b>" . constant($block_lang . "_ADDRESNOW")
+ "<a href=\"" . XOOPS_URL . "/modules/$blockdirname/reumes.php\"><b>" . constant($block_lang . "_ADDRESNOW")
. "</b></a>";
return $block;
Modified: XoopsModules/jobs/trunk/jobs/class/jobs_categories.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/class/jobs_categories.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/class/jobs_categories.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -79,7 +79,7 @@
$imgtray_category_img->addElement( new XoopsFormLabel( '', "<br /><img src='".XOOPS_URL."/".$uploadirectory_category_img."/".$img."' name='image_category_img' id='image_category_img' alt='' />" ) );
$fileseltray_category_img = new XoopsFormElementTray('','<br />');
- $fileseltray_category_img->addElement(new XoopsFormFile(_AM_JOBS_FORMUPLOAD , "img", $xoopsModuleConfig["imagemaxsize"]),false);
+ $fileseltray_category_img->addElement(new XoopsFormFile(_AM_JOBS_FORMUPLOAD , "img", $xoopsModuleConfig["jobs_maxfilesize"]),false);
$fileseltray_category_img->addElement(new XoopsFormLabel(''), false);
$imgtray_category_img->addElement($fileseltray_category_img);
$form->addElement($imgtray_category_img);
Modified: XoopsModules/jobs/trunk/jobs/docs/changelog.txt
===================================================================
--- XoopsModules/jobs/trunk/jobs/docs/changelog.txt 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/docs/changelog.txt 2013-07-09 22:55:24 UTC (rev 11821)
@@ -1,4 +1,11 @@
+
---------------------------------------
+4.4 RC1 2013-06-19
+---------------------------------------
+
+- fixed all reported errors from BETA2 (jlm69)
+
+---------------------------------------
4.4 Beta 2 2012-10-10
---------------------------------------
Modified: XoopsModules/jobs/trunk/jobs/include/functions.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/include/functions.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/include/functions.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -699,9 +699,8 @@
$photohighdir = XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/photo/midsize";
$cachedir = XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/resumes";
$tmpdir = XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/rphoto";
- $logoimages = XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/logo_images";
+ $logo_images_dir = XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/logo_images";
- // photodir
if(file_exists($photodir)) {
if (!is_writable($photodir)) {
echo "<span style=\" color: red; font-weight: bold;\">Warning:</span> I am unable to write to: " . $photodir . "<br />";
@@ -751,18 +750,16 @@
} else {
echo "<span style=\" color: red; font-weight: bold;\">Warning:</span> " . $tmpdir . " does NOT exist!<br />";
}
- // logoimages
- if(file_exists($logoimages)) {
- if (!is_writable($logoimages)) {
- echo "<span style=\" color: red; font-weight: bold;\">Warning:</span> I am unable to write to: " . $logoimages . "<br />";
+ if(file_exists($logo_images_dir)) {
+ if (!is_writable($logo_images_dir)) {
+ echo "<span style=\" color: red; font-weight: bold;\">Warning:</span> I am unable to write to: " . $logo_images_dir . "<br />";
} else {
- echo "<span style=\" color: green; font-weight: bold;\">OK:</span> " . $logoimages . "<br />";
+ echo "<span style=\" color: green; font-weight: bold;\">OK:</span> " . $logo_images_dir . "<br />";
}
} else {
- echo "<span style=\" color: red; font-weight: bold;\">Warning:</span> " . $logoimages . " does NOT exist!<br />";
+ echo "<span style=\" color: red; font-weight: bold;\">Warning:</span> " . $logo_images_dir . " does NOT exist!<br />";
}
-
/**
* Some info.
*/
@@ -914,7 +911,7 @@
/**
* Published (total)
- */
+
$result = $xoopsDB->query("SELECT count(id) AS published FROM " .$xoopsDB->prefix('amreview_reviews') . " WHERE showme='1' AND validated='1'");
list($published) = $xoopsDB->fetchRow($result);// {
@@ -922,17 +919,17 @@
else { $summary['published'] = $published; }
unset($result);
- /**
+
* Hidden (total)
- */
+
$result = $xoopsDB->query("SELECT count(id) AS hidden FROM " .$xoopsDB->prefix('amreview_reviews') . " WHERE showme='0' OR validated='0'");
list($hidden) = $xoopsDB->fetchRow($result);// {
if (!$result) { $summary['hidden'] = 0; }
else { $summary['hidden'] = $hidden; }
unset($result);
+ */
-
//print_r($summary);
return $summary;
Modified: XoopsModules/jobs/trunk/jobs/include/notification.inc.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/include/notification.inc.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/include/notification.inc.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -28,7 +28,7 @@
exit();
}
$mydirname = basename(dirname(dirname(__FILE__)));
-include(XOOPS_ROOT_PATH . "/modules/$mydirname/include/functions.php");
+include_once(XOOPS_ROOT_PATH . "/modules/$mydirname/include/functions.php");
function jobs_notify_iteminfo($category, $item_id) {
$mydirname = basename(dirname(dirname(__FILE__)));
$module_handler =& xoops_gethandler('module');
Modified: XoopsModules/jobs/trunk/jobs/language/english/admin.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/language/english/admin.php 2013-07-09 22:51:11 UTC (rev 11820)
+++ XoopsModules/jobs/trunk/jobs/language/english/admin.php 2013-07-09 22:55:24 UTC (rev 11821)
@@ -1,380 +1,430 @@
<?php
-define('_AM_JOBS_CONF',"Jobs Configuration");
-define('_AM_JOBS_ADDON',"Addons");
-define('_AM_JOBS_CATSMOD',"Category Updated");
-define('_AM_JOBS_JOBDEL',"Selected Job Listing has been deleted");
-define('_AM_JOBS_ADDCATPRINC',"Add a main category");
-define('_AM_JOBS_CATNAME',"Name: ");
-define('_AM_JOBS_ADD',"Add");
-define('_AM_JOBS_CATDEL',"Selected category has been deleted");
-define('_AM_JOBS_OUI',"Yes");
-define('_AM_JOBS_NON',"No");
-define('_AM_JOBS_SURDELCAT',"WARNING: Are you sure you want to remove this category, and all subcategories and Job Listings.");
-define('_AM_JOBS_IN',"in");
-define('_AM_JOBS_MODIF',"Modify");
-define('_AM_JOBS_MODIFCAT',"Modify a category");
-define('_AM_JOBS_CAT',"Category: ");
-define('_AM_JOBS_SUBCAT',"Subcategory: ");
-define('_AM_JOBS_CONFMYA',"Jobs Configuration");
-define('_AM_JOBS_CATADD',"Category added");
-define('_AM_JOBS_SUBCATADD',"Subcategory added");
-define('_AM_JOBS_JOBMOD',"Job Listing has been changed");
-define('_AM_JOBS_NOANNVAL',"There are currently no Job Listings to approve");
-define('_AM_JOBS_NOMODACTIV',"Moderation is not active, no Job Listings to approve");
-define('_AM_JOBS_MODANN',"Change a Job Listing");
-define('_AM_JOBS_ALLMODANN',"(All Job Listings can be modified by the Jobs administrator.)");
-define('_AM_JOBS_NUMANN',"Listing ID: ");
+define("_AM_JOBS_CONF", "Jobs Configuration");
+define("_AM_JOBS_ADDON", "Addons");
+define("_AM_JOBS_CATSMOD", "Category Updated");
+define("_AM_JOBS_JOBDEL", "Selected Job Listing has been deleted");
+define("_AM_JOBS_ADDCATPRINC", "Add a main category");
+define("_AM_JOBS_CATNAME", "Name:");
+
+define("_AM_JOBS_ADD", "Add");
+define("_AM_JOBS_CATDEL", "Selected category has been deleted");
+define("_AM_JOBS_OUI", "Yes");
+define("_AM_JOBS_NON", "No");
+define("_AM_JOBS_SURDELCAT", "WARNING: Are you sure you want to remove this category, and all subcategories and Job Listings.");
+define("_AM_JOBS_IN", "in");
+define("_AM_JOBS_MODIF", "Modify");
+define("_AM_JOBS_MODIFCAT", "Modify a category");
+define("_AM_JOBS_CAT", "Category:");
+define("_AM_JOBS_SUBCAT", "Subcategory:");
+define("_AM_JOBS_CONFMYA", "Jobs Configuration");
+define("_AM_JOBS_CATADD", "Category added");
+define("_AM_JOBS_SUBCATADD", "Subcategory added");
+define("_AM_JOBS_JOBMOD", "Job Listing has been changed");
+define("_AM_JOBS_NOANNVAL", "There are currently no Job Listings to approve");
+define("_AM_JOBS_NOMODACTIV", "Moderation is not active, no Job Listings to approve");
+define("_AM_JOBS_MODANN", "Change a Job Listing");
+define("_AM_JOBS_ALLMODANN", "(All Job Listings can be modified by the Jobs administrator.)");
+define("_AM_JOBS_NUMANN", "Listing ID:");
+
// message //
-define('_AM_JOBS_HELLO',"Hello, ");
-define('_AM_JOBS_JOBVALID',"Job Listing has been approved");
-define('_AM_JOBS_DEL',"Delete");
-define('_AM_JOBS_SAVMOD',"Save your changes");
-define('_AM_JOBS_MODTYPE',"Modify Job Type");
-define('_AM_JOBS_JOBACCEPT',"Your Job Listing has been approved");
-define('_AM_JOBS_CONSULTTO',"View it here:");
-define('_AM_JOBS_THANK',"Thank you");
-define('_AM_JOBS_TEAMOF',"Team");
+define("_AM_JOBS_HELLO", "Hello, ");
+define("_AM_JOBS_JOBVALID", "Job Listing has been approved");
+define("_AM_JOBS_DEL", "Delete");
+define("_AM_JOBS_SAVMOD", "Save your changes");
+define("_AM_JOBS_MODTYPE", "Modify Job Type");
+define("_AM_JOBS_JOBACCEPT", "Your Job Listing has been approved");
+define("_AM_JOBS_CONSULTTO", "View it here:");
+define("_AM_JOBS_THANK", "Thank you");
+define("_AM_JOBS_TEAMOF", "Team");
// message end //
-define('_AM_JOBS_RETURN',"Return");
-define('_AM_JOBS_MODSUBCAT',"Change subcategory name");
-define('_AM_JOBS_MODCAT',"Change main category name");
-define('_AM_JOBS_GO',"Go");
-define('_AM_JOBS_SENDBY',"Submitted By: ");
-define('_AM_JOBS_EMAIL',"Email: ");
-define('_AM_JOBS_TEL',"Telephone: ");
-define('_AM_JOBS_TOWN',"Town/Location: ");
-define('_AM_JOBS_COUNTRY',"Country: ");
-define('_AM_JOBS_TITLE2',"Job Title: ");
-define('_AM_JOBS_COMPANY2',"Company: ");
-define('_AM_JOBS_TYPE',"Type: ");
-define('_AM_JOBS_PHOTO2',"Logo: ");
-define('_AM_JOBS_PRICE2',"Salary: ");
-define('_AM_JOBS_CAT2',"Category: ");
-define('_AM_JOBS_DESC2',"Job Description: ");
-define('_AM_JOBS_REQUIRE',"Job Requirements: ");
-define('_AM_JOBS_CONTACTINFO2',"Contact Information 3: ");
-define('_AM_JOBS_OK',"Approved");
-define('_AM_JOBS_THEREIS',"There are ");
-define('_AM_JOBS_WAIT',"Job Listings waiting to be moderated");
-define('_AM_JOBS_ADDTYPE',"Add Job type");
-define('_AM_JOBS_ERRORTYPE',"ERROR: type");
-define('_AM_JOBS_EXIST',"already exists!");
-define('_AM_JOBS_ERRORCAT',"ERROR: Category");
-define('_AM_JOBS_ERRORSUBCAT',"ERROR: Subcategory");
-define('_AM_JOBS_TYPEMOD',"The Job type has been modified");
-define('_AM_JOBS_TYPEDEL',"The Job type has been deleted");
-define('_AM_JOBS_ADDTYPE2',"Job type has been added");
-define('_AM_JOBS_ACCESMYANN',"Jobs");
-define('_AM_JOBS_IMGCAT',"Image: ");
-define('_AM_JOBS_REPIMGCAT',"Image directory: ");
-define('_AM_JOBS_ADDPRICE',"Add a payment type");
-define('_AM_JOBS_MODPRICE',"Modify a payment type");
-define('_AM_JOBS_ADDPRICE2',"Payment type has been added");
-define('_AM_JOBS_PRICEMOD',"Payment type has been modified");
-define('_AM_JOBS_PRICEDEL',"Payment type has been deleted");
-define('_AM_JOBS_ORDRECLASS',"Category Order: ");
-define('_AM_JOBS_ORDREALPHA',"Sort alphabetically");
-define('_AM_JOBS_ORDREPERSO',"Personalised Order");
-define('_AM_JOBS_BIGCAT',"Main Category");
-define('_AM_JOBS_HELP1',"<b>To add a category:</b> click on the image <img src=\"" . XOOPS_URL
+
+define("_AM_JOBS_RETURN", "Return");
+define("_AM_JOBS_MODSUBCAT", "Change subcategory name");
+define("_AM_JOBS_MODCAT", "Change main category name");
+define("_AM_JOBS_GO", "Go");
+define("_AM_JOBS_SENDBY", "Submitted By:");
+define("_AM_JOBS_EMAIL", "Email:");
+define("_AM_JOBS_TEL", "Telephone:");
+define("_AM_JOBS_TOWN", "Town/Location:");
+define("_AM_JOBS_COUNTRY", "Country:");
+define("_AM_JOBS_TITLE2", "Job Title:");
+define("_AM_JOBS_COMPANY2", "Company:");
+define("_AM_JOBS_TYPE", "Type:");
+define("_AM_JOBS_PHOTO2", "Logo:");
+define("_AM_JOBS_PRICE2", "Salary:");
+define("_AM_JOBS_CAT2", "Category:");
+define("_AM_JOBS_DESC2", "Job Description:");
+define("_AM_JOBS_REQUIRE", "Job Requirements:");
+define("_AM_JOBS_CONTACTINFO2", "Contact Information 3:");
+define("_AM_JOBS_OK", "Approved");
+define("_AM_JOBS_THEREIS", "There are ");
+define("_AM_JOBS_WAIT", "Job Listings waiting to be moderated");
+define("_AM_JOBS_ADDTYPE", "Add Job type");
+define("_AM_JOBS_ERRORTYPE", "ERROR: type");
+define("_AM_JOBS_EXIST", "already exists!");
+define("_AM_JOBS_ERRORCAT", "ERROR: Category");
+define("_AM_JOBS_ERRORSUBCAT", "ERROR: Subcategory");
+define("_AM_JOBS_TYPEMOD", "The Job type has been modified");
+define("_AM_JOBS_TYPEDEL", "The Job type has been deleted");
+define("_AM_JOBS_ADDTYPE2", "Job type has been added");
+define("_AM_JOBS_ACCESMYANN", "Jobs");
+
+define("_AM_JOBS_IMGCAT", "Image:");
+define("_AM_JOBS_REPIMGCAT", "Image directory:");
+
+define("_AM_JOBS_ADDPRICE", "Add a payment type");
+define("_AM_JOBS_MODPRICE", "Modify a payment type");
+define("_AM_JOBS_ADDPRICE2", "Payment type has been added");
+define("_AM_JOBS_PRICEMOD", "Payment type has been modified");
+define("_AM_JOBS_PRICEDEL", "Payment type has been deleted");
+
+define("_AM_JOBS_ORDRECLASS", "Category Order:");
+define("_AM_JOBS_ORDREALPHA", "Sort alphabetically");
+define("_AM_JOBS_ORDREPERSO", "Personalised Order");
+define("_AM_JOBS_BIGCAT", "Main Category");
+
+define("_AM_JOBS_HELP1", "<b>To add a category:</b> click on the image <img src=\"" . XOOPS_URL
. "/modules/jobs/images/plus.gif\" border=0 width=10 height=10 alt=\"Add a category\"> alongside the category you want to add the category under.<p><b>To change or delete a category:</b> click on the name of the category");
-define('_AM_JOBS_HELP2',"<b>Category Order:</b> integer in brackets corresponds to the order within the superior category or of the principal category. Negative integers can be used.: -1");
+define("_AM_JOBS_HELP2", "<b>Category Order:</b> integer in brackets corresponds to the order within the superior category or of the principal category. Negative integers can be used.: -1");
+
+
// fichier pref.php //
-define('_AM_JOBS_CONFSAVE',"Configuration saved");
-define('_AM_JOBS_JOBOCANPOST',"Anonymous user can post Job Listings:");
-define('_AM_JOBS_PERPAGE',"Job Listings per page: ");
-define('_AM_JOBS_MONEY',"Currency symbol: ");
-define('_AM_JOBS_NUMNEW',"Number of new Job Listings: ");
-define('_AM_JOBS_MODERAT',"Moderate Job Listings: ");
-define('_CAL_MAXIIMGS',"Maximum logo size: ");
-define('_AM_JOBS_TIMEANN',"Job Listing duration: ");
-define('_AM_JOBS_INOCTET',"in bytes");
-define('_AM_JOBS_INDAYS',"in days");
-define('_AM_JOBS_TYPEBLOC',"Type of Block: ");
-define('_AM_JOBS_JOBRAND',"Random Job Listing");
-define('_AM_JOBS_LASTTEN',"Last 10 Job Listings");
-define('_AM_JOBS_NEWTIME',"New Job Listings from: ");
-define('_AM_JOBS_DISPLPRICE',"Display price: ");
-define('_AM_JOBS_DISPLPRICE2',"Display price: ");
-define('_AM_JOBS_INTHISCAT',"in this category");
-define('_AM_JOBS_DISPLSUBCAT',"Display subcategories: ");
-define('_AM_JOBS_ONHOME',"on the Front Page of Module");
-define('_AM_JOBS_NBDISPLSUBCAT',"Number of subcategories to show: ");
-define('_AM_JOBS_IF',"if");
-define('_AM_JOBS_ISAT',"is at");
-define('_AM_JOBS_VIEWNEWCLASS',"Show new Job Listings: ");
+define("_AM_JOBS_CONFSAVE", "Configuration saved");
+define("_AM_JOBS_JOBOCANPOST", "Anonymous user can post Job Listings:");
+define("_AM_JOBS_PERPAGE", "Job Listings per page:");
+define("_AM_JOBS_MONEY", "Currency symbol:");
+define("_AM_JOBS_NUMNEW", "Number of new Job Listings:");
+define("_AM_JOBS_MODERAT", "Moderate Job Listings:");
+define("_CAL_MAXIIMGS", "Maximum logo size:");
+define("_AM_JOBS_TIMEANN", "Job Listing duration:");
+define("_AM_JOBS_INOCTET", "in bytes");
+define("_AM_JOBS_INDAYS", "in days");
+define("_AM_JOBS_TYPEBLOC", "Type of Block:");
+define("_AM_JOBS_JOBRAND", "Random Job Listing");
+define("_AM_JOBS_LASTTEN", "Last 10 Job Listings");
+define("_AM_JOBS_NEWTIME", "New Job Listings from:");
+
+define("_AM_JOBS_DISPLPRICE", "Display price:");
+define("_AM_JOBS_DISPLPRICE2", "Display price:");
+define("_AM_JOBS_INTHISCAT", "in this category");
+define("_AM_JOBS_DISPLSUBCAT", "Display subcategories:");
+define("_AM_JOBS_ONHOME", "on the Front Page of Module");
+define("_AM_JOBS_NBDISPLSUBCAT", "Number of subcategories to show:");
+define("_AM_JOBS_IF", "if");
+define("_AM_JOBS_ISAT", "is at");
+define("_AM_JOBS_VIEWNEWCLASS", "Show new Job Listings:");
+
//Resume language files
-define('_AM_JOBS_RES_WAIT',"Resumes waiting to be approved");
-define('_AM_JOBS_RES_NOAPR',"There are currently no Resumes to approve");
-define('_AM_JOBS_RES_NAME',"Users Name: ");
-define('_AM_JOBS_RES_EXP',"Experience: ");
-define('_AM_JOBS_RES_PRIVATE',"Privacy Code: ");
-define('_AM_JOBS_RES_MOD',"Resume Listing selected has been modified");
-define('_AM_JOBS_RES_DEL',"Resume Listing selected has been deleted");
-define('_AM_JOBS_RESUME',"Resume: ");
-define('_AM_JOBS_RES_JOBVALID',"Resume Listing has been approved");
-define('_AM_JOBS_RES_MODRES',"Change a Resume Listing");
-define('_AM_JOBS_RES_ALLMODANN',"(All Resume Listings can be modified by the administrator.)");
-define('_AM_JOBS_SUBMITTED_ON',"submitted on");
-define('_AM_JOBS_EXPIRE',"Days until expiration: ");
-define('_AM_JOBS_CATEGORY',"Job Categories");
-define('_AM_JOBS_RES_CATEGORY',"Resume Categories");
-define('_AM_JOBS_ORDRE',"Sort Order: ");
-define('_AM_JOBS_ADDSUBCAT',"Add a Job Category");
-define('_AM_JOBS_RES_ADDSUBCAT',"Add a Resume Category");
-define('_AM_JOBS_UPDATECOMPLETE',"Update Complete");
-define('_AM_JOBS_UPDATEMODULE',"<b>Update Module</b>");
-define('_AM_JOBS_UPGRADEFAILED',"Update Failed");
-define('_AM_JOBS_UPGRADEFAILED0',"Update");
-define('_AM_JOBS_UPGR_ACCESS_ERROR',"Access Error");
-define('_AM_JOBS_UPGRADE_NOW',"Update to 2.4 now");
-define('_AM_JOBS_YOUR_USING',"You are currently using version");
-define('_AM_JOBS_OP',"Read my opinion");
-define('_AM_JOBS_SUPPORT',"<medium>Support this software</small></medium>");
-define('_AM_JOBS_DATABASE_CHANGE',"If upgrading from a jobs version 1.xx there will be a change to your database. Make a backup of your database to be safe.");
+
+define("_AM_JOBS_RES_WAIT", "Resumes waiting to be ap...
[truncated message content] |
|
From: <be...@us...> - 2014-02-19 21:37:13
|
Revision: 12327
http://sourceforge.net/p/xoops/svn/12327
Author: beckmi
Date: 2014-02-19 21:37:07 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
Updating to Jobs-4.4 RC2 (jlm69)
Modified Paths:
--------------
XoopsModules/jobs/trunk/jobs/READ_ME
XoopsModules/jobs/trunk/jobs/addlisting.php
XoopsModules/jobs/trunk/jobs/admin/about.php
XoopsModules/jobs/trunk/jobs/admin/addregion.php
XoopsModules/jobs/trunk/jobs/admin/admin_footer.php
XoopsModules/jobs/trunk/jobs/admin/job_categories.php
XoopsModules/jobs/trunk/jobs/admin/jobs.php
XoopsModules/jobs/trunk/jobs/admin/lists.php
XoopsModules/jobs/trunk/jobs/admin/main.php
XoopsModules/jobs/trunk/jobs/admin/modjobs.php
XoopsModules/jobs/trunk/jobs/admin/resumes.php
XoopsModules/jobs/trunk/jobs/admin/submitlisting.php
XoopsModules/jobs/trunk/jobs/class/pictures.php
XoopsModules/jobs/trunk/jobs/contact.php
XoopsModules/jobs/trunk/jobs/createresume.php
XoopsModules/jobs/trunk/jobs/deljob.php
XoopsModules/jobs/trunk/jobs/docs/credits.txt
XoopsModules/jobs/trunk/jobs/index.php
XoopsModules/jobs/trunk/jobs/jobscat.php
XoopsModules/jobs/trunk/jobs/language/english/admin.php
XoopsModules/jobs/trunk/jobs/language/english/blocks.php
XoopsModules/jobs/trunk/jobs/language/english/docs.php
XoopsModules/jobs/trunk/jobs/language/english/help/help.html
XoopsModules/jobs/trunk/jobs/language/english/main.php
XoopsModules/jobs/trunk/jobs/language/english/modinfo.php
XoopsModules/jobs/trunk/jobs/language/english/waiting.php
XoopsModules/jobs/trunk/jobs/modcompany.php
XoopsModules/jobs/trunk/jobs/modjob.php
XoopsModules/jobs/trunk/jobs/resumes.php
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_premium.html
XoopsModules/jobs/trunk/jobs/viewjobs.php
XoopsModules/jobs/trunk/jobs/xoops_version.php
Added Paths:
-----------
XoopsModules/jobs/trunk/jobs/admin/NEWjobs.php
Removed Paths:
-------------
XoopsModules/jobs/trunk/jobs/error_log
Modified: XoopsModules/jobs/trunk/jobs/READ_ME
===================================================================
--- XoopsModules/jobs/trunk/jobs/READ_ME 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/READ_ME 2014-02-19 21:37:07 UTC (rev 12327)
@@ -8,26 +8,29 @@
1) NEW 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. 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
+ 3. Run the upgrade script as admin. point browser to "http://yoursite/modules/jobs/admin/upgrade.php"
+ 4. Update module, in module admin and you are done
+Things you MUST do before using this module
+Before using this module there are some things you NEED TO DO FIRST.
+1. You MUST go to JOBS PREFERENCES FIRST and set it up the way you want to. Once you set it to use a Company or not, and add listings, you can not change it later, or it will mess up the way the module works.
+2. Then you need to go to JOBS ADMIN and set up categories, permissions, regions, type management.
+
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/addlisting.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/addlisting.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/addlisting.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -75,8 +75,8 @@
exit();
}
-$member_usid = $xoopsUser->getVar("uid", "E");
-
+$member_usid = $xoopsUser->uid();
+ if ($xoopsModuleConfig['jobs_show_company'] == '1') {
$all_comp = jobs_getCompany($member_usid);
if (!$all_comp) {
redirect_header(XOOPS_URL . "/modules/$mydirname/addcompany.php", 2, _JOBS_MUSTADD_COMPANY);
@@ -88,7 +88,7 @@
redirect_header(XOOPS_URL . "/modules/$mydirname/whatcompany.php", 1, _JOBS_WHAT_COMPANY);
}
}
-
+}
if (!empty($_POST['submit'])) {
$jobsdays = $xoopsModuleConfig['jobs_days'];
@@ -245,10 +245,18 @@
if ($xoopsModuleConfig['jobs_show_company'] == '1') {
$form->addElement(new XoopsFormLabel(_JOBS_COMPANY, $thiscompany["comp_name"]));
$form->addElement(new XoopsFormHidden('company', $thiscompany["comp_name"]));
+ } else {
+ $form->addElement(new XoopsFormHidden('company', ""));
}
+
+
+
$form->addElement(new XoopsFormText(_JOBS_EMAIL, 'email', 50, 100, $email), TRUE);
+ if ($xoopsModuleConfig['jobs_show_company'] == '1') {
$form->addElement(new XoopsFormText(_JOBS_TOWN, 'town', 50, 50, $thiscompany["comp_city"]), FALSE);
-
+ } else {
+ $form->addElement(new XoopsFormText(_JOBS_TOWN, 'town', 50, 50, ""), 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)) {
@@ -256,10 +264,16 @@
$state_form->addOption($rid, $name);
}
$form->addElement($state_form, TRUE);
+ } else {
+ $form->addElement(new XoopsFormHidden('state', ""));
}
-
+
+
+ if ($xoopsModuleConfig['jobs_show_company'] == '1') {
$form->addElement(new XoopsFormText(_JOBS_TEL, "tel", 30, 30, $thiscompany["comp_phone"]), FALSE);
-
+ } else {
+ $form->addElement(new XoopsFormText(_JOBS_TEL, "tel", 30, 30, ""), FALSE);
+ }
$cat_form = (new XoopsFormSelect(_JOBS_CAT, 'cid', ''));
$cattree = $mytree->getChildTreeArray(0, "title ASC");
$cat_form->addOption('', _JOBS_SELECTCAT);
@@ -286,13 +300,13 @@
$form->addElement($type_form);
if (($premium == "1") || ($temp_premium == "1")) {
- $radio = new XoopsFormRadio(_JOBS_STATUS, 'status', "");
+ $radio = new XoopsFormRadio(_JOBS_STATUS, 'status', "1");
$options["1"] = _JOBS_ACTIVE;
$options["0"] = _JOBS_INACTIVE;
$radio->addOptionArray($options);
$form->addElement($radio, TRUE);
} else {
- $form->addElement(new XoopsFormHidden('status', "0"));
+ $form->addElement(new XoopsFormHidden('status', "1"));
}
$form->addElement(new XoopsFormText(_JOBS_TITLE, "title", 40, 50, ""), TRUE);
$form->addElement(jobs_getEditor(_JOBS_DESC, "desctext", "", "100%", "300px", ""), TRUE);
@@ -303,23 +317,31 @@
$sel_form->addOption($nom_price, $nom_price);
}
$form->addElement($sel_form);
-
+ if ($xoopsModuleConfig['jobs_show_company'] == '1') {
$form->addElement(
new XoopsFormTextArea(_JOBS_CONTACTINFO, "contactinfo",
"" . $myts->undoHtmlSpecialChars($myts->displayTarea($thiscompany["comp_contact"], 0, 0, 0, 0, 0))
. "", 6, 40), TRUE
);
+ } else {
+ $form->addElement(
+ new XoopsFormTextArea(_JOBS_CONTACTINFO, "contactinfo",
+ "", 6, 40), TRUE
+ );
+ }
+
if (($premium == "1") || ($temp_premium == "1")) {
- if ($thiscompany["comp_user1_contact"]) {
- $form->addElement(
- new XoopsFormTextArea(_JOBS_CONTACTINFO1, "contactinfo1",
+
+ if (($xoopsModuleConfig['jobs_show_company'] == '1') && ($thiscompany["comp_user1_contact"])) {
+
+ $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"]) {
+ if (($xoopsModuleConfig['jobs_show_company'] == '1') && ($thiscompany["comp_user2_contact"])) {
$form->addElement(
new XoopsFormTextArea(_JOBS_CONTACTINFO2, "contactinfo2",
"" . $thiscompany["comp_user2_contact"] . "", 6, 40), FALSE
@@ -339,7 +361,9 @@
} else {
$form->addElement(new XoopsFormHidden("valid", "0"), FALSE);
}
+ if ($xoopsModuleConfig['jobs_show_company'] == '1') {
$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());
Added: XoopsModules/jobs/trunk/jobs/admin/NEWjobs.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/NEWjobs.php (rev 0)
+++ XoopsModules/jobs/trunk/jobs/admin/NEWjobs.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -0,0 +1,138 @@
+<?php
+// Jobs for Xoops 2.3.3b and up by John Mordo - jlm69 at Xoops //
+// //
+include_once '../../../include/cp_header.php';
+$mydirname = basename(dirname(dirname(__FILE__)));
+include_once (XOOPS_ROOT_PATH . "/modules/$mydirname/include/functions.php");
+
+include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+
+include_once(XOOPS_ROOT_PATH . "/modules/$mydirname/class/jobtree.php");
+
+$myts =& MyTextSanitizer::getInstance();
+
+include 'admin_header.php';
+xoops_cp_header();
+$index_admin = new ModuleAdmin();
+echo $index_admin->addNavigation("jobs.php");
+$index_admin->addItemButton(_AM_JOBS_ADD_LINK, 'submitlisting.php', 'add', '');
+echo $index_admin->renderButton('left', '');
+//loadModuleAdminMenu(3, "");
+
+include XOOPS_ROOT_PATH . '/class/pagenav.php';
+
+$countresult = $xoopsDB->query("select COUNT(*) FROM " . $xoopsDB->prefix("jobs_listing") . "");
+list($crow) = $xoopsDB->fetchRow($countresult);
+$crows = $crow;
+
+$nav = '';
+if ($crows > "0") {
+// shows number of jobs per page default = 15
+ $showonpage = 15;
+ $show = "";
+ $show = (intval($show) > 0) ? intval($show) : $showonpage;
+
+ $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+ if (!isset($max)) {
+ $max = $start + $show;
+ }
+
+ $sql
+ = "select lid, title, date, status, expire, submitter, valid, premium from " . $xoopsDB->prefix("jobs_listing")
+ . " ORDER BY lid";
+
+ $result1 = $xoopsDB->query($sql, $show, $start);
+ echo "<table border=1 width=100% cellpadding=2 cellspacing=0 border=0><td><tr>";
+
+
+
+
+ if ($crows > 0) {
+ $nav = new XoopsPageNav($crows, $showonpage, $start, 'start', 'op=Region');
+ echo "<br />" . _AM_JOBS_THEREIS . " <b>$crows</b> " . _AM_JOBS_JOBLISTINGS . "<br /><br />";
+ echo $nav->renderNav();
+
+
+
+
+
+ echo "<br /><br /><table width=100% cellpadding=2 cellspacing=0 border=0>";
+ $rank = 1;
+ }
+
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th align=\"center\">" . _AM_JOBS_NUMANN . "</th>
+ <th align=\"center\">" . _AM_JOBS_TITLE2 . "</th>
+ <th align=\"center\">" . _AM_JOBS_SUBMITTED_ON . "</th>
+ <th align=\"center\">" . _AM_JOBS_ACTIVE . "</th>
+ <th align=\"center\">" . _AM_JOBS_EXPIRES . "</th>
+ <th align=\"center\">" . _AM_JOBS_SENDBY . "</th>
+ <th align=\"center\">" . _AM_JOBS_PUBLISHEDCAP . "</th>
+ <th align=\"center\">" . _AM_JOBS_PREMIUM . "</th>
+
+ <th align='center' width='10%'>" . _AM_JOBS_ACTIONS . "</th>
+ </tr>";
+
+ $class = "odd";
+ $result1 = $xoopsDB->query($sql, $show, $start);
+
+
+
+
+
+
+
+ while (list($lid, $title, $date, $status, $expire, $submitter, $valid, $premium) = $xoopsDB->fetchRow($result1)) {
+ $title = $myts->htmlSpecialChars($title);
+ $date2 = formatTimestamp($date, "s");
+ // $expire2 = formatTimestamp($expire, "s");
+
+ echo "<tr class='" . $class . "'>";
+ $class = ($class == "even") ? "odd" : "even";
+ echo "<td align=\"center\">" . $lid."</td>";
+ echo "<td align=\"center\">" . $title . "</td>";
+ echo "<td align=\"center\">" . $date2 . "</td>";
+ echo "<td align=\"center\">" . $status . "</td>";
+ echo "<td align=\"center\">" . $expire . "</td>";
+ echo "<td align=\"center\">" . $submitter . "</td>";
+ echo "<td align=\"center\">" . $valid . "</td>";
+ echo "<td align=\"center\">" . $premium . "</td>";
+
+ echo "<td align='center' width='10%'>
+ <a href='modjobs.php?lid=" . $lid . "'><img src=" . $pathIcon16 . "/edit.png alt='"
+ . _EDIT . "' title='" . _EDIT . "'></a>
+ <a href='../deljob.php?lid=" . $lid . "'><img src=" . $pathIcon16 . "/delete.png alt='"
+ . _DELETE . "' title='" . _DELETE . "'></a>
+ </td>";
+ echo "</tr>";
+
+ }
+ echo "</table><br /><br />";
+ echo $nav->renderNav();
+// echo "</fieldset><br />";
+} else {
+ echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_JOBS_MAN_JOB . "</legend>";
+ echo "<br /> " . _AM_JOBS_NO_JOB . "<br /><br />";
+ echo "</fieldset>";
+
+// echo "<fieldset><legend style='font-weight: bold; color:#900;'>" . _AM_JOBS_ADD_COMPANY . "</legend>";
+// echo "<a href=\"addcomp.php\">" . _AM_JOBS_ADD_COMPANY . "</a></fieldset>
+// </table<br />";
+}
+
+//include_once 'category3.php';
+//$action='';
+//if ($action === false) {
+// $action = $_SERVER["REQUEST_URI"];
+//}
+//$title='stnihsathsthsths';
+//$form = new myTableForm($title, "form", $action, "post", true);
+//$form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
+//$form->display();
+
+include_once 'job_categories.php';
+
+xoops_cp_footer();
+
+?>
\ No newline at end of file
Property changes on: XoopsModules/jobs/trunk/jobs/admin/NEWjobs.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/jobs/trunk/jobs/admin/about.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/about.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/about.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -25,6 +25,6 @@
$aboutAdmin = new ModuleAdmin();
echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', FALSE);
+echo $aboutAdmin->renderAbout('2R5DLEE94B4WN', FALSE);
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/jobs/trunk/jobs/admin/addregion.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/addregion.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/addregion.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -22,7 +22,7 @@
);
$xoopsDB->query($sql);
- redirect_header("region.php", 13, _AM_JOBS_REGION_ADDED);
+ redirect_header("region.php", 4, _AM_JOBS_REGION_ADDED);
exit();
} else {
@@ -30,7 +30,12 @@
include 'admin_header.php';
xoops_cp_header();
//loadModuleAdminMenu(4, "");
-
+ $index_admin = new ModuleAdmin();
+ echo $index_admin->addNavigation("region.php");
+
+
+
+
include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
ob_start();
Modified: XoopsModules/jobs/trunk/jobs/admin/admin_footer.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/admin_footer.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/admin_footer.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -20,6 +20,6 @@
echo"<div class='adminfooter'>\n" . " <div style='text-align: center;'>\n"
. " <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
- . " </div>\n" . " " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>";
+ . " </div>\n" . " " . _AM_JOBS_MOD_ADMIN_FOOTER . "\n" . "</div>";
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/jobs/trunk/jobs/admin/job_categories.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/job_categories.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/job_categories.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -28,18 +28,7 @@
else {
$op = 'list';
}
-//include_once $GLOBALS['xoops']->path('class/xoopsform/tableform.php');
-//
-//class myTableForm extends XoopsTableForm {
-//
-//}
-//include_once $GLOBALS['xoops']->path('class/xoopsform/themeform.php');
-//
-//class myTableForm extends XoopsThemeForm {
-//
-//}
-
switch ($op) {
case "list":
default:
@@ -72,11 +61,11 @@
echo "<tr class='" . $class . "'>";
echo "<td align=\"left\">" . $prefix . " " . $category_arr[$i]->getVar("title") . "</td>";
- echo"<td align=\"center\"><img src=\"" . XOOPS_URL . "/modules/jobs/images/cat/". $category_arr[$i]->getVar("img")
+ echo "<td align=\"center\"><img src=\"" . XOOPS_URL . "/modules/jobs/images/cat/". $category_arr[$i]->getVar("img")
. "\" height=\"16px\" title=\"img\" alt=\"img\"></td>";
echo "<td align=\"center\">" . $category_arr[$i]->getVar("ordre") . "</td>";
- echo"<td align=\"center\">" . $category_arr[$i]->getVar("affprice") . "</td>";
+ echo "<td align=\"center\">" . $category_arr[$i]->getVar("affprice") . "</td>";
echo "<td align='center' width='10%'>
<a href='job_categories.php?op=edit_category&cid=" . $category_arr[$i]->getVar("cid")
@@ -120,13 +109,13 @@
echo "<tr class='" . $class . "'>";
echo "<td align=\"left\">" . $prefix . " " . $category_arr[$i]->getVar("title") . "</td>";
- echo"<td align=\"center\"><img src=\"" . XOOPS_URL . "/modules/jobs/images/cat/"
+ echo "<td align=\"center\"><img src=\"" . XOOPS_URL . "/modules/jobs/images/cat/"
. $category_arr[$i]->getVar("img")
. "\" height=\"16px\" title=\"img\" alt=\"img\"></td>";
echo "<td align=\"center\">" . $category_arr[$i]->getVar("ordre") . "</td>";
- echo"<td align=\"center\">" . $category_arr[$i]->getVar("affprice") . "</td>";
+ echo "<td align=\"center\">" . $category_arr[$i]->getVar("affprice") . "</td>";
echo "<td align='center' width='10%'>
<a href='job_categories.php?op=edit_category&cid="
@@ -187,7 +176,10 @@
//Form category_img
include_once XOOPS_ROOT_PATH . "/class/uploader.php";
$uploaddir = XOOPS_UPLOAD_PATH . "/jobs/images/";
- $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS["xoopsModuleConfig"]["category_img_mimetypes"], $GLOBALS["xoopsModuleConfig"]["category_img_size"], NULL, NULL);
+ $maxwide = $xoopsModuleConfig['jobs_resized_width'];
+ $maxhigh = $xoopsModuleConfig['jobs_resized_height'];
+ $allowed_mimetypes = array('image/gif', 'image/jpg', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
+ $uploader = new XoopsMediaUploader($uploaddir, $allowed_mimetypes, NULL, $maxwide, $maxhigh);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setPrefix("category_img_");
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
Modified: XoopsModules/jobs/trunk/jobs/admin/jobs.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/jobs.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/jobs.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -27,8 +27,8 @@
$nav = '';
if ($crows > "0") {
-// shows number of jobs per page default = 15
- $showonpage = 15;
+// shows number of jobs per page set in preferences
+ $showonpage = $xoopsModuleConfig['jobs_joblisting_num'];
$show = "";
$show = (intval($show) > 0) ? intval($show) : $showonpage;
@@ -39,11 +39,27 @@
$sql
= "select lid, title, date, status, expire, submitter, valid, premium from " . $xoopsDB->prefix("jobs_listing")
- . " ORDER BY lid";
+ . " ORDER BY valid,lid";
$result1 = $xoopsDB->query($sql, $show, $start);
echo "<table border=1 width=100% cellpadding=2 cellspacing=0 border=0><td><tr>";
+
+
+
+ if ($crows > 0) {
+ $nav = new XoopsPageNav($crows, $showonpage, $start, 'start', '');
+ echo "<br />" . _AM_JOBS_THEREIS . " <b>$crows</b> " . _AM_JOBS_JOBLISTINGS . "<br /><br />";
+ echo $nav->renderNav();
+
+
+
+
+
+ echo "<br /><br /><table width=100% cellpadding=2 cellspacing=0 border=0>";
+ $rank = 1;
+ }
+
echo "<table width='100%' cellspacing='1' class='outer'>
<tr>
<th align=\"center\">" . _AM_JOBS_NUMANN . "</th>
@@ -60,20 +76,34 @@
$class = "odd";
$result1 = $xoopsDB->query($sql, $show, $start);
+
+
+
+
+
+
+
while (list($lid, $title, $date, $status, $expire, $submitter, $valid, $premium) = $xoopsDB->fetchRow($result1)) {
$title = $myts->htmlSpecialChars($title);
$date2 = formatTimestamp($date, "s");
// $expire2 = formatTimestamp($expire, "s");
echo "<tr class='" . $class . "'>";
+
+
+
$class = ($class == "even") ? "odd" : "even";
+
+
echo "<td align=\"center\">" . $lid."</td>";
echo "<td align=\"center\">" . $title . "</td>";
echo "<td align=\"center\">" . $date2 . "</td>";
echo "<td align=\"center\">" . $status . "</td>";
echo "<td align=\"center\">" . $expire . "</td>";
echo "<td align=\"center\">" . $submitter . "</td>";
+
echo "<td align=\"center\">" . $valid . "</td>";
+
echo "<td align=\"center\">" . $premium . "</td>";
echo "<td align='center' width='10%'>
@@ -86,7 +116,7 @@
}
echo "</table><br /><br />";
-
+ echo $nav->renderNav();
// echo "</fieldset><br />";
} else {
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_JOBS_MAN_JOB . "</legend>";
Modified: XoopsModules/jobs/trunk/jobs/admin/lists.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/lists.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/lists.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -5,7 +5,7 @@
$mydirname = basename(dirname(dirname(__FILE__)));
include_once (XOOPS_ROOT_PATH . "/modules/$mydirname/include/functions.php");
-include_once XOOPS_ROOT_PATH . "/modules/jobs/admin/header.php";
+include_once XOOPS_ROOT_PATH . "/modules/jobs/admin/admin_header.php";
xoops_cp_header();
// loadModuleAdminMenu(3, "");
Modified: XoopsModules/jobs/trunk/jobs/admin/main.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/main.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/main.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -1037,7 +1037,7 @@
}
$xoopsDB->query("insert into " . $xoopsDB->prefix("jobs_type") . " values (NULL, '$type')");
- redirect_header("index.php", 3, _AM_JOBS_ADDTYPE2);
+ redirect_header("main.php", 3, _AM_JOBS_ADDTYPE2);
exit();
}
}
@@ -1078,7 +1078,7 @@
$nom_type = $myts->addSlashes($nom_type);
$xoopsDB->query("update " . $xoopsDB->prefix("jobs_type") . " set nom_type='$nom_type' where id_type='$id_type'");
- redirect_header("index.php", 3, _AM_JOBS_TYPEMOD);
+ redirect_header("main.php", 3, _AM_JOBS_TYPEMOD);
exit();
}
@@ -1088,7 +1088,7 @@
global $xoopsDB, $mydirname, $admin_lang;
$xoopsDB->query("delete from " . $xoopsDB->prefix("jobs_type") . " where id_type='$id_type'");
- redirect_header("index.php", 3, _AM_JOBS_TYPEDEL);
+ redirect_header("main.php", 3, _AM_JOBS_TYPEDEL);
exit();
}
@@ -1121,7 +1121,7 @@
}
$xoopsDB->query("insert into " . $xoopsDB->prefix("jobs_price") . " values (NULL, '$type')");
- redirect_header("index.php", 3, _AM_JOBS_ADDPRICE2);
+ redirect_header("main.php", 3, _AM_JOBS_ADDPRICE2);
exit();
}
}
@@ -1162,7 +1162,7 @@
$xoopsDB->query(
"update " . $xoopsDB->prefix("jobs_price") . " set nom_price='$nom_price' where id_price='$id_price'"
);
- redirect_header("index.php", 3, _AM_JOBS_PRICEMOD);
+ redirect_header("main.php", 3, _AM_JOBS_PRICEMOD);
exit();
}
@@ -1173,7 +1173,7 @@
$xoopsDB->query("delete from " . $xoopsDB->prefix("jobs_price") . " where id_price='$id_price'");
- redirect_header("index.php", 3, _AM_JOBS_PRICEDEL);
+ redirect_header("main.php", 3, _AM_JOBS_PRICEDEL);
exit();
}
Modified: XoopsModules/jobs/trunk/jobs/admin/modjobs.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/modjobs.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/modjobs.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -263,6 +263,8 @@
//
//
// $form->addElement($state_form, TRUE);
+
+ if ($xoopsModuleConfig['jobs_show_state'] == '1') {
$result2 = $xoopsDB->query("select rid, name from " . $xoopsDB->prefix("jobs_region") . " order by rid");
$state_form = new XoopsFormSelect(_AM_JOBS_STATE, "state", $state, "1", FALSE);
while (list($rid, $name) = $xoopsDB->fetchRow($result2)) {
@@ -270,9 +272,11 @@
$state_form->addOption($rid, $name);
}
$form->addElement($state_form, TRUE);
+ } else {
+ $form->addElement(new XoopsFormHidden("state", ""), FALSE);
+ }
-
$form->addElement(new XoopsFormTextArea(_AM_JOBS_CONTACTINFO, "contactinfo", $contactinfo, 4,28), FALSE);
$form->addElement(new XoopsFormTextArea(_AM_JOBS_CONTACTINFO1, "contactinfo1", $contactinfo1,4,28), FALSE);
$form->addElement(new XoopsFormTextArea(_AM_JOBS_CONTACTINFO2, "contactinfo2", $contactinfo2, 4,28), FALSE);
Modified: XoopsModules/jobs/trunk/jobs/admin/resumes.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/resumes.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/resumes.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -27,8 +27,8 @@
$nav = '';
if ($crows > "0") {
-// shows number of companies per page default = 15
- $showonpage = 15;
+// shows number of resumes per page set in preferences
+ $showonpage = $xoopsModuleConfig['jobs_reslisting_num'];;
$show = "";
$show = (intval($show) > 0) ? intval($show) : $showonpage;
@@ -44,6 +44,14 @@
$result1 = $xoopsDB->query($sql, $show, $start);
echo "<table border=1 width=100% cellpadding=2 cellspacing=0 border=0><td><tr>";
+ if ($crows > 0) {
+ $nav = new XoopsPageNav($crows, $showonpage, $start, 'start', '');
+ echo "<br />" . _AM_JOBS_THEREIS . " <b>$crows</b> " . _AM_JOBS_RES_LISTINGS . "<br /><br />";
+ echo $nav->renderNav();
+ echo "<br /><br /><table width=100% cellpadding=2 cellspacing=0 border=0>";
+ $rank = 1;
+ }
+
echo "<table width='100%' cellspacing='1' class='outer'>
<tr>
<th align=\"center\">" . _AM_JOBS_RES_NUMBER . "</th>
@@ -89,7 +97,7 @@
}
echo "</table><br /><br />";
-
+ echo $nav->renderNav();
// echo "</fieldset><br />";
} else {
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_JOBS_MAN_RESUME . "</legend>";
Modified: XoopsModules/jobs/trunk/jobs/admin/submitlisting.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/submitlisting.php 2014-02-19 12:38:18 UTC (rev 12326)
+++ XoopsModules/jobs/trunk/jobs/admin/submitlisting.php 2014-02-19 21:37:07 UTC (rev 12327)
@@ -160,6 +160,11 @@
$indexAdmin->addItemButton(_AM_JOBS_MAN_JOB, 'jobs.php', 'list');
echo $indexAdmin->renderButton('left', '');
+ $iscompany = jobs_getAllCompanies();
+ if (!$iscompany) {
+ redirect_header("addcomp.php", 3, _AM_JOBS_MUSTADD_COMPANY);
+ }
+
include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
ob_start();
@@ -216,9 +221,10 @@
if ($xoopsModuleConfig['jobs_show_company'] == '1') {
$company = jobs_getACompany($comp_id);
}
- $result = $xoopsDB->query("select nom_type from " . $xoopsDB->prefix("jobs_type") . " o...
[truncated message content] |