Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2012-10-08 16:50:20
|
Revision: 10200
http://sourceforge.net/p/xoops/svn/10200
Author: beckmi
Date: 2012-10-08 16:50:10 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Adding Jobs 3.0RC3
Added Paths:
-----------
XoopsModules/jobs/
XoopsModules/jobs/branches/
XoopsModules/jobs/releases/
XoopsModules/jobs/trunk/
XoopsModules/jobs/trunk/jobs/
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/
XoopsModules/jobs/trunk/jobs/admin/admin.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/mymenu.php
XoopsModules/jobs/trunk/jobs/admin/upgrade.php
XoopsModules/jobs/trunk/jobs/blocks/
XoopsModules/jobs/trunk/jobs/blocks/index.html
XoopsModules/jobs/trunk/jobs/blocks/jobs.php
XoopsModules/jobs/trunk/jobs/class/
XoopsModules/jobs/trunk/jobs/class/index.html
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/xoopstree.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/editcomp.php
XoopsModules/jobs/trunk/jobs/editdesc.php
XoopsModules/jobs/trunk/jobs/editresume.php
XoopsModules/jobs/trunk/jobs/header.php
XoopsModules/jobs/trunk/jobs/images/
XoopsModules/jobs/trunk/jobs/images/Thumbs.db
XoopsModules/jobs/trunk/jobs/images/blank.gif
XoopsModules/jobs/trunk/jobs/images/cat/
XoopsModules/jobs/trunk/jobs/images/cat/Computer.jpg
XoopsModules/jobs/trunk/jobs/images/cat/cat2.gif
XoopsModules/jobs/trunk/jobs/images/cat/cat3.gif
XoopsModules/jobs/trunk/jobs/images/cat/cat4.gif
XoopsModules/jobs/trunk/jobs/images/cat/default.gif
XoopsModules/jobs/trunk/jobs/images/cat/fleche.gif
XoopsModules/jobs/trunk/jobs/images/cat/fleche2.gif
XoopsModules/jobs/trunk/jobs/images/cat/fleche3.gif
XoopsModules/jobs/trunk/jobs/images/cat/index.html
XoopsModules/jobs/trunk/jobs/images/cat/point1.gif
XoopsModules/jobs/trunk/jobs/images/cat/point2.gif
XoopsModules/jobs/trunk/jobs/images/cat/star1.gif
XoopsModules/jobs/trunk/jobs/images/close.gif
XoopsModules/jobs/trunk/jobs/images/closelabel.gif
XoopsModules/jobs/trunk/jobs/images/del.gif
XoopsModules/jobs/trunk/jobs/images/dele.gif
XoopsModules/jobs/trunk/jobs/images/down.gif
XoopsModules/jobs/trunk/jobs/images/edit.gif
XoopsModules/jobs/trunk/jobs/images/friend.gif
XoopsModules/jobs/trunk/jobs/images/green.gif
XoopsModules/jobs/trunk/jobs/images/green.jpg
XoopsModules/jobs/trunk/jobs/images/index.html
XoopsModules/jobs/trunk/jobs/images/jobs_logo.gif
XoopsModules/jobs/trunk/jobs/images/jobs_slogo.gif
XoopsModules/jobs/trunk/jobs/images/loading.gif
XoopsModules/jobs/trunk/jobs/images/mlogo.png
XoopsModules/jobs/trunk/jobs/images/modif.gif
XoopsModules/jobs/trunk/jobs/images/newred.gif
XoopsModules/jobs/trunk/jobs/images/next.gif
XoopsModules/jobs/trunk/jobs/images/nextlabel.gif
XoopsModules/jobs/trunk/jobs/images/nophoto.jpg
XoopsModules/jobs/trunk/jobs/images/photo.gif
XoopsModules/jobs/trunk/jobs/images/plus.gif
XoopsModules/jobs/trunk/jobs/images/prev.gif
XoopsModules/jobs/trunk/jobs/images/prevlabel.gif
XoopsModules/jobs/trunk/jobs/images/print.gif
XoopsModules/jobs/trunk/jobs/images/red.gif
XoopsModules/jobs/trunk/jobs/images/search.png
XoopsModules/jobs/trunk/jobs/images/site.gif
XoopsModules/jobs/trunk/jobs/images/up.gif
XoopsModules/jobs/trunk/jobs/include/
XoopsModules/jobs/trunk/jobs/include/basic_mailtags.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/index.html
XoopsModules/jobs/trunk/jobs/include/notification.inc.php
XoopsModules/jobs/trunk/jobs/include/onupdate.inc.php
XoopsModules/jobs/trunk/jobs/include/preferences.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/index2.php
XoopsModules/jobs/trunk/jobs/ip_image.php
XoopsModules/jobs/trunk/jobs/language/
XoopsModules/jobs/trunk/jobs/language/english/
XoopsModules/jobs/trunk/jobs/language/english/admin.php
XoopsModules/jobs/trunk/jobs/language/english/blocks.php
XoopsModules/jobs/trunk/jobs/language/english/index.html
XoopsModules/jobs/trunk/jobs/language/english/mail_template/
XoopsModules/jobs/trunk/jobs/language/english/mail_template/index.html
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/language/index.html
XoopsModules/jobs/trunk/jobs/lightbox/
XoopsModules/jobs/trunk/jobs/lightbox/css/
XoopsModules/jobs/trunk/jobs/lightbox/css/index.html
XoopsModules/jobs/trunk/jobs/lightbox/css/lightbox.css
XoopsModules/jobs/trunk/jobs/lightbox/images/
XoopsModules/jobs/trunk/jobs/lightbox/images/Thumbs.db
XoopsModules/jobs/trunk/jobs/lightbox/images/blank.gif
XoopsModules/jobs/trunk/jobs/lightbox/images/close.gif
XoopsModules/jobs/trunk/jobs/lightbox/images/closelabel.gif
XoopsModules/jobs/trunk/jobs/lightbox/images/index.html
XoopsModules/jobs/trunk/jobs/lightbox/images/loading.gif
XoopsModules/jobs/trunk/jobs/lightbox/images/next.gif
XoopsModules/jobs/trunk/jobs/lightbox/images/nextlabel.gif
XoopsModules/jobs/trunk/jobs/lightbox/images/prev.gif
XoopsModules/jobs/trunk/jobs/lightbox/images/prevlabel.gif
XoopsModules/jobs/trunk/jobs/lightbox/index.html
XoopsModules/jobs/trunk/jobs/lightbox/js/
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/listing-p-f.php
XoopsModules/jobs/trunk/jobs/logo_images/
XoopsModules/jobs/trunk/jobs/logo_images/index.html
XoopsModules/jobs/trunk/jobs/members.php
XoopsModules/jobs/trunk/jobs/modjob.php
XoopsModules/jobs/trunk/jobs/modresume.php
XoopsModules/jobs/trunk/jobs/notification_update.php
XoopsModules/jobs/trunk/jobs/photo/
XoopsModules/jobs/trunk/jobs/photo/index.html
XoopsModules/jobs/trunk/jobs/photo/midsize/
XoopsModules/jobs/trunk/jobs/photo/midsize/index.html
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/
XoopsModules/jobs/trunk/jobs/photo/thumbs/index.html
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
XoopsModules/jobs/trunk/jobs/print.php
XoopsModules/jobs/trunk/jobs/replies.php
XoopsModules/jobs/trunk/jobs/resumes/
XoopsModules/jobs/trunk/jobs/resumes/index.html
XoopsModules/jobs/trunk/jobs/rphoto/
XoopsModules/jobs/trunk/jobs/rphoto/index.html
XoopsModules/jobs/trunk/jobs/search.php
XoopsModules/jobs/trunk/jobs/sendfriend.php
XoopsModules/jobs/trunk/jobs/sql/
XoopsModules/jobs/trunk/jobs/sql/index.html
XoopsModules/jobs/trunk/jobs/sql/mysql.sql
XoopsModules/jobs/trunk/jobs/templates/
XoopsModules/jobs/trunk/jobs/templates/blocks/
XoopsModules/jobs/trunk/jobs/templates/blocks/index.html
XoopsModules/jobs/trunk/jobs/templates/blocks/jobs_block_new.html
XoopsModules/jobs/trunk/jobs/templates/index.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_create_resume.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_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/viewresume.php
XoopsModules/jobs/trunk/jobs/xoops_version.php
Added: XoopsModules/jobs/trunk/jobs/READ_ME
===================================================================
--- XoopsModules/jobs/trunk/jobs/READ_ME (rev 0)
+++ XoopsModules/jobs/trunk/jobs/READ_ME 2012-10-08 16:50:10 UTC (rev 10200)
@@ -0,0 +1,32 @@
+INSTALL DIRECTIONS
+
+BACKUP YOUR DATABASE BEFORE ANY MAJOR UPGRADE. DON'T SAY YOU WEREN'T WARNED.
+
+the folders logo_images, resumes and photo need to be chmod 777,
+the module will check those folders and if not right you will be notified in the admin area.
+
+1) NEW INSTALL
+
+ Upload the jobs folder inside the Xoops modules folder, go to modules administration and install.
+
+
+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
+
+
+
+IMPORTANT!!! You must create a category in resumes before trying to set permissions.
+
+
+
+Donations will allow this software to continue, without them probably not.
+
+Report any problems at www.jlmzone.com
+
+Thanks and enjoy.
+
+John
\ No newline at end of file
Added: XoopsModules/jobs/trunk/jobs/add_photo.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/add_photo.php (rev 0)
+++ XoopsModules/jobs/trunk/jobs/add_photo.php 2012-10-08 16:50:10 UTC (rev 10200)
@@ -0,0 +1,106 @@
+<?php
+// $Id: submit.php,v 1.3 2007/08/26 14:43:50 marcellobrandao Exp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// 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'];
+
+/**
+ * Xoops header ...
+ */
+include_once("../../mainfile.php");
+$xoopsOption['template_main'] = "jobs_view_photos.html";
+include_once("../../header.php");
+
+/**
+ * Modules class includes
+ */
+include("class/pictures.php");
+
+/**
+ * Factory of pictures created
+ */
+$album_factory = new Xoopsjlm_picturesHandler($xoopsDB);
+
+/**
+ * Getting the title
+ */
+$title = $_POST['caption'];
+
+/**
+ * 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"];
+
+/**
+ * If we are receiving a file
+ */
+if ($_POST['xoops_upload_file'][0]=='sel_photo'){
+
+ /**
+ * 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'));
+
+ $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"));
+ }
+}
+
+/**
+ * Close page
+ */
+include("../../footer.php");
+?>
\ No newline at end of file
Added: XoopsModules/jobs/trunk/jobs/addcompany.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/addcompany.php (rev 0)
+++ XoopsModules/jobs/trunk/jobs/addcompany.php 2012-10-08 16:50:10 UTC (rev 10200)
@@ -0,0 +1,211 @@
+<?php
+// $Id: addcompany.php,v 1.12 2007/03/27 17:11:07 jlm69 Exp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------- //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// 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";
+$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");
+
+$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);
+ exit();
+}
+
+$member_usid = $xoopsUser->getVar("uid", "E");
+$member_comp = getCompany($member_usid);
+if ($member_comp) {
+ redirect_header(XOOPS_URL."/modules/$mydirname/index.php",2,_JOBS_COMPANY_EXISTS);
+}
+
+
+if (!empty($_POST['submit'])) {
+
+ $comp_usid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+
+ // Check if Title exist
+ if ($_POST["comp_name"]=="") {
+ $erh->show("1001");
+ }
+
+ //$notify = !empty($_POST['notify']) ? 1 : 0;
+
+ //if ( !empty($_POST['cid']) ) {
+ // $cid = intval($_POST['cid']);
+ //} else {
+ // $cid = 0;
+ //}
+
+ // $url = urlencode($url);
+
+
+ $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"]);
+
+// $comp_user1 = $myts->makeTboxData4Save($_POST["comp_user1"]);
+// $comp_user2 = $myts->makeTboxData4Save($_POST["comp_user2"]);
+
+
+ $comp_user1 = getIdFromUname($_POST["comp_user1"]);
+ $comp_user2 = getIdFromUname($_POST["comp_user2"]);
+
+
+
+
+
+
+
+
+
+
+ $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'];
+
+
+ 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_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);
+
+ 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";
+
+
+ //$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+ //Query datatypes that match the categories selected. If not category selected.
+ ob_start();
+ $form = new XoopsThemeForm(_JOBS_ADD_COMPANY, 'companyform', 'addcompany.php');
+ $form->setExtra('enctype="multipart/form-data"');
+
+ $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 XoopsFormFile(_JOBS_COMPANY_LOGO, 'comp_img', 0), false);
+ $form->addElement(new XoopsFormTextArea(_JOBS_COMPANY_CONTACT, 'comp_contact', '', 6, 40), false);
+
+ $form->insertBreak();
+ $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);
+
+ $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);
+
+
+ $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
Added: XoopsModules/jobs/trunk/jobs/addlisting.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/addlisting.php (rev 0)
+++ XoopsModules/jobs/trunk/jobs/addlisting.php 2012-10-08 16:50:10 UTC (rev 10200)
@@ -0,0 +1,295 @@
+<?php
+// $Id: addcompany.php,v 1.12 2007/03/27 17:11:07 jlm69 Exp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------- //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// 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");
+
+$erh = new ErrorHandler; //ErrorHandler object
+$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."/user.php", 3, _NOPERM);
+ exit();
+}
+if (!$gperm_handler->checkRight("jobs_premium", $perm_itemid, $groups, $module_id)) {
+ $premium = 0;
+} else {
+ $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");
+
+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);
+ exit();
+}
+
+$member_usid = $xoopsUser->getVar("uid", "E");
+$all_comp = getCompany($member_usid);
+if (!$all_comp) {
+ redirect_header(XOOPS_URL."/modules/$mydirname/addcompany.php",2,_JOBS_MUSTADD_COMPANY);
+}
+
+if (!empty($_POST['submit']) ) {
+
+ $jobsdays=$xoopsModuleConfig['jobs_days'];
+
+ if ( ! $xoopsGTicket->check( true , 'token' ) ) {
+ redirect_header(XOOPS_URL.'/',3,$xoopsGTicket->getErrors());
+ }
+
+
+ // Check if Title exist
+ if ($_POST["title"]=="") {
+ $erh->show("1001");
+ }
+
+ $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"]);
+ $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");
+
+
+ if($valid == 'Yes'){
+
+ $notification_handler =& xoops_gethandler('notification');
+ $lid = $xoopsDB->getInsertId();
+ $tags=array();
+ $tags['LID'] = $lid;
+ $tags['TITLE'] = $title;
+ $tags['TYPE'] = $type;
+ $tags['DESCTEXT'] = $desctext;
+ $tags['HELLO'] = _JOBS_HELLO;
+ $tags['ADDED_TO_CAT'] = _JOBS_ADDED_TO_CAT;
+ $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);
+ $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);
+ $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 );
+ }
+
+
+ redirect_header("index.php",3,_JOBS_JOBADDED);
+
+ exit();
+
+} 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");
+ $member_email =$xoopsUser->getVar("email", "E");
+ $member_uname =$xoopsUser->getVar("uname", "E");
+ $count = getCompCount($member_usid);
+ $thiscompany = getCompany($member_usid);
+ $email = $member_email;
+
+ $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");
+
+ ob_start();
+ $form = new XoopsThemeForm(_JOBS_ADD_LISTING, 'submitform', 'addlisting.php');
+ $form->setExtra('enctype="multipart/form-data"');
+
+ $GLOBALS['xoopsGTicket']->addTicketXoopsFormElement( $form , __LINE__ , 1800 , 'token' ) ;
+
+ if ($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 XoopsFormText(_JOBS_TOWN, 'town', 50,50, $thiscompany["comp_city"]), false);
+ $form->addElement(new XoopsFormText(_JOBS_STATE, 'state', 50,50, $thiscompany["comp_state"]), false);
+ $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();
+
+if ($premium == 1) {
+
+ $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']));
+ }
+
+ $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);
+
+if ($premium == "1") {
+ $radio = new XoopsFormRadio(_JOBS_STATUS, 'status', "");
+ $options["0"]=_JOBS_ACTIVE;
+ $options["1"]=_JOBS_INACTIVE;
+ $radio->addOptionArray($options);
+ $form->addElement($radio,true);
+ }
+
+ $form->addElement(new XoopsFormText(_JOBS_TITLE, "title", 40, 50, ""), 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 ($thiscompany["comp_user1_contact"]) {
+ $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO, 'contactinfo', "".$thiscompany["comp_user1_contact"]."", 6, 40), false);
+ }
+ if ($thiscompany["comp_user2_contact"]) {
+ $form->addElement(new XoopsFormTextArea(_JOBS_CONTACTINFO, 'contactinfo', "".$thiscompany["comp_user2_contact"]."", 6, 40), false);
+ }
+
+ if ($xoopsModuleConfig['jobs_moderated'] == 0) {
+ $form->addElement(new XoopsFormHidden("valid", "Yes"), false);
+ } else {
+ $form->addElement(new XoopsFormHidden("valid", "No"), 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';
+}
+?>
\ No newline at end of file
Added: XoopsModules/jobs/trunk/jobs/addresume.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/addresume.php (rev 0)
+++ XoopsModules/jobs/trunk/jobs/addresume.php 2012-10-08 16:50:10 UTC (rev 10200)
@@ -0,0 +1,326 @@
+<?php
+// ----------------------------------------------------------------------- //
+// Jobs for Xoops 2.0x //
+// By John Mordo from the myAds 2.04 Module //
+// All Original credits left below this //
+// //
+// //
+// //
+ //
+// ------------------------------------------------------------------------- //
+// 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" ) ;
+$myts =& MyTextSanitizer::getInstance();
+$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 no access
+if (!$gperm_handler->checkRight("resume_submit", $perm_itemid, $groups, $module_id)) {
+ redirect_header(XOOPS_URL."/user.php", 3, _NOPERM);
+ exit();
+}
+
+//Check if user already has a resume submitted //
+function resumeexists($usid)
+{
+ global $xoopsDB, $xoopsConfig, $xoopsUser, $xoopsTheme, $xoopsLogger, $xoopsModule, $mydirname;
+
+ $member_id =$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 ($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_ADDLISTING3."</b><br /><br /><center>"._JOBS_RES_JOBNOMODERATE." $resdays "._JOBS_RES_MODERATE2."</center><br /><br />";
+ }
+ echo "<form method=\"post\" action=\"addresume.php\" enctype=\"multipart/form-data\" name=\"add\" onsubmit=\"return verify();\">";
+ echo "<table width='100%' class='outer' cellspacing='1'><tr>
+ <tr>
+ <td class='head'>"._JOBS_RES_PRIVATE." </td></tr><tr><td class='head'>"._JOBS_RES_PCODE." <input type=\"text\" name=\"private\" size=\"5\" maxlength=\"10\" /> "._JOBS_RES_PSIZE."</td>
+ </tr></table><br />";
+ echo "<table width='100%' class='outer' cellspacing='1'><tr>
+ <td width='30%' class='head'>"._JOBS_CAT3." </td><td class='odd'>";
+ $mytree->makeMySelBox("title", "title", $cid);
+ echo "<tr>
+ <td class='head'>"._JOBS_STATUS."</td><td class='odd'><input type=\"radio\" name=\"status\" checked value=\"0\">
+ "._JOBS_ACTIVE."
+ <input type=\"radio\" name=\"status\" value=\"1\">
+ "._JOBS_INACTIVE."</td>
+ </tr>
+ </td></tr><tr>
+ <td width='30%' class='head'>"._JOBS_RES_NAME." </td><td class='even'><input type=\"text\" name=\"name\" size=\"30\" maxlength=\"100\" /></td>
+ </tr><tr>
+ <td width='30%' class='head'>"._JOBS_RES_HOW_LONG." </td><td class='odd'><input type=\"text\" name=\"expire\" size=\"3\" maxlength=\"3\" value=\"$resdays\" /></td>
+ </tr><tr>
+ <td width='30%' class='head'>"._JOBS_TITLE2." </td><td class='odd'><input type=\"text\" name=\"title\" size=\"30\" maxlength=\"100\" /></td>
+ </tr><tr>
+ <td width='30%' class='head'>"._JOBS_RES_EXP." </td><td class='even'><input type=\"text\" name=\"exp\" size=\"20\" maxlength=\"25\" /></td>
+ </tr><tr>
+ <td width='30%' class='head'>"._JOBS_RES_SALARY."</td><td class='odd'><input type=\"text\" name=\"salary\" size=\"20\" />".$xoopsModuleConfig['jobs_money']."";
+ $result3 = $xoopsDB->query("select nom_price from ".$xoopsDB->prefix("jobs_price")." order by id_price");
+ echo "<select name=\"typeprice\">";
+ while(list($nom_price) = $xoopsDB->fetchRow($result3)) {
+ echo "<option value=\"$nom_price\">$nom_price</option>";
+ }
+ echo "</select></td>";
+ echo "</tr><tr>";
+
+ if($xoopsUser) {
+ $iddd =$xoopsUser->getVar("uid", "E");
+ $idd =$xoopsUser->getVar("name", "E");// Real name
+ $idde =$xoopsUser->getVar("email", "E");
+ // Add by Tom
+ $iddn =$xoopsUser->getVar("uname", "E");// user name
+ }
+
+ // CHGED name pattern by Tom
+ if ($idd) {
+ echo "<td width='30%' class='head'>"._JOBS_RES_UNAME." </td><td class='even'>$idd</td></tr><tr>";
+ }else{
+ echo "<td width='30%' class='head'>"._JOBS_RES_UNAME." </td><td class='even'>$iddn</td></tr><tr>";
+ }
+
+ echo "<td width='30%' class='head'>"._JOBS_EMAIL." </td><td class='odd'>$idde</td>
+ </tr><tr>
+ <td width='30%' class='head'>"._JOBS_TEL." </td><td class='even'><input type=\"text\" name=\"tel\" size=\"20\" maxlength=\"25\" /></td>
+ </tr><tr>
+ <td width='30%' class='head'>"._JOBS_TOWN." </td><td class='odd'><input type=\"text\" name=\"town\" size=\"30\" maxlength=\"100\" /></td>
+ </tr><tr>
+ <td width='30%' class='head'>"._JOBS_STATE." </td><td class='odd'><input type=\"text\" name=\"state\" size=\"30\" maxlength=\"100\" /></td>
+ </tr>";
+ echo "<td width='30%' class='head'>"._JOBS_RES_UPRESUME."</td><td class='even'><input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"$resumesize\" /><input type=\"file\" name=\"resume\" /> (< ";
+ printf ("%.2f KB",$resumesize1);
+ echo ")</td></tr>";
+ echo "<tr>
+ <td width='30%' class='head'>"._JOBS_Q_NO_RESUME." </td><td class='even'>
+
+<input type=\"radio\" name=\"make_resume\" checked value=\"0\">"._JOBS_DONT_MAKE."
+<input type=\"radio\" name=\"make_resume\" value=\"1\">"._JOBS_MAKE_RESUME."</td></tr>";
+
+ $time = time();
+ echo "</table><br />
+ <input type=\"hidden\" name=\"usid\" value=\"$iddd\" />
+ <input type=\"hidden\" name=\"email\" value=\"$idde\" />
+ <input type=\"hidden\" name=\"submitter\" value=\"$iddn\" />
+ <input type=\"hidden\" name=\"op\" value=\"AddResumeOk\" />";
+ // echo "<input type=\"hidden\" name=\"token\" value=\"$token\" />";
+
+ if ($xoopsModuleConfig['jobs_moderate_resume'] == '1') {
+ echo "<input type=\"hidden\" name=\"valid\" value=\"No\" />";
+ } else {
+ echo "<input type=\"hidden\" name=\"valid\" value=\"Yes\" />";
+ }
+ echo "<input type=\"hidden\" name=\"lid\" value=\"0\" />
+ <input type=\"hidden\" name=\"date\" value=\"$time\" />
+ ".$GLOBALS['xoopsGTicket']->getTicketHtml( __LINE__ , 1800 , 'token')."";
+ echo "<input type=\"submit\" value=\""._JOBS_VALIDATE."\" />";
+
+ echo "</form>";
+ echo "</td></tr></table>";
+ }
+ }
+
+function AddResumeOk($lid, $cid, $name, $title, $status, $exp, $expire, $private, $tel, $salary, $typeprice, $date, $email, $submitter, $usid, $town, $state, $valid, $_FILES)
+{
+
+ global $xoopsDB, $xoopsConfig, $xoopsModuleConfig, $destination, $myts, $xoopsLogger, $mydirname, $make_resume, $xoopsGTicket;
+
+ // if (!$GLOBALS['xoopsSecurity']->check(true, $_REQUEST['token'])) {
+ // redirect_header(XOOPS_URL."/modules/$mydirname/index2.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ // }
+
+ if ( ! $xoopsGTicket->check( true , 'token' ) ) {
+ redirect_header(XOOPS_URL.'/',3,$xoopsGTicket->getErrors());
+ }
+
+ $resumesize=$xoopsModuleConfig['jobs_resumesize'];
+ $photomax=$xoopsModuleConfig['jobs_maxfilesize'];
+
+ include(XOOPS_ROOT_PATH."/modules/$mydirname/include/functions.php");
+
+ $name = $myts->makeTboxData4Save($name);
+ $title = $myts->makeTboxData4Save($title);
+ $status = $myts->makeTboxData4Save($status);
+ $exp = $myts->makeTboxData4Save($exp);
+ $expire = $myts->makeTboxData4Save($expire);
+ $private = $myts->makeTboxData4Save($private);
+ $tel = $myts->makeTboxData4Save($tel);
+ $salary = $myts->makeTboxData4Save($salary);
+ $typeprice = $myts->makeTboxData4Save($typeprice);
+ $submitter = $myts->makeTboxData4Save($submitter);
+ $town = $myts->makeTboxData4Save($town);
+ $state = $myts->makeTboxData4Save($state);
+
+ $filename = '';
+
+ if ( !empty($_FILES['resume']['name']) ) {
+ include_once XOOPS_ROOT_PATH."/class/uploader.php";
+ $updir = 'resumes/';
+ $allowed_mimetypes = array('application/msword', 'application/pdf');
+ $uploader = new XoopsMediaUploader($updir, $allowed_mimetypes, $resumesize);
+ $uploader->setTargetFileName($date.'_'.$_FILES['resume']['name']);
+ $uploader->fetchMedia('resume');
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("addresume.php?cid=".addslashes($cid)."", 3, $errors);
+ return False;
+ exit();
+ } else {
+ $filename = $uploader->getSavedFileName();
+ }
+ }
+
+ $xoopsDB->query("INSERT INTO ".$xoopsDB->prefix("jobs_resume")." values ('', '$cid', '$name', '$title', '$status', '$exp', '$expire', '$private', '$tel', '$salary', '$typeprice', '$date', '$email', '$submitter', '$usid', '$town', '$state', '$valid', '', '$filename', '0')");
+
+$lid = $xoopsDB->getInsertId();
+ if($valid == 'Yes'){
+
+ $notification_handler =& xoops_gethandler('notification');
+
+ $tags=array();
+ $tags['TITLE'] = $title;
+ $tags['EXP'] = $exp;
+ $tags['NAME'] = $name;
+ $tags['HELLO'] = _JOBS_HELLO;
+ $tags['ADDED_TO_RES_CAT'] = _JOBS_ADDED_TO_RES_CAT;
+ $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);
+ $sql = "SELECT title FROM " . $xoopsDB->prefix("jobs_res_categories") . " WHERE cid=".mysql_real_escape_string($cid)."";
+ $result = $xoopsDB->query($sql);
+ $row = $xoopsDB->fetchArray($result);
+ $tags['CATEGORY_TITLE'] = $row['title'];
+ $tags['CATEGORY_URL'] = XOOPS_URL . '/modules/'.$mydirname.'/index.php?pa=viewResume&cid="' . addslashes($cid);
+ $notification_handler =& xoops_gethandler('notification');
+ $notification_handler->triggerEvent('res_global', 0, 'new_resume', $tags);
+ $notification_handler->triggerEvent('resume_category', $cid, 'new_resume_cat', $tags);
+ $notification_handler->triggerEvent ('resume_listing', $lid, 'new_resume', $tags );
+ }
+
+
+if ($make_resume != "0") {
+ redirect_header("createresume.php?lid=".addslashes($lid)."",3,_JOBS_RES_ADDED_PLUS);
+ } else {
+ redirect_header("index2.php?pa=viewResume&lid=".addslashes($lid)."",3,_JOBS_RES_ADDED);
+ exit();
+}
+}
+
+#######################################################
+foreach ($_POST as $k => $v) {
+ ${$k} = $v;
+}
+
+if(!isset($_POST['cid']) && isset($_GET['cid']) ) {
+ $cid = $_GET['cid'] ;
+}
+
+if(!isset($_POST['op']) && isset($_GET['op']) ) {
+ $op = $_GET['op'] ;
+}
+
+if (!isset($op)) {
+ $op = '';
+}
+
+switch($op) {
+ case "AddResumeOk":
+ AddResumeOk($lid, $cid, $name, $title, $status, $exp, $expire, $private, $tel, $salary, $typeprice, $date, $email, $submitter, $usid, $town, $state, $valid, $_FILES);
+ break;
+
+ case "resumeexists":
+ resumeexists($usid);
+ break;
+
+ default:
+ include(XOOPS_ROOT_PATH."/header.php");
+ addresume($cid);
+ include(XOOPS_ROOT_PATH."/footer.php");
+ break;
+}
+?>
\ No newline at end of file
Added: XoopsModules/jobs/trunk/jobs/admin/admin.php
===================================================================
--- XoopsModules/jobs/trunk/jobs/admin/admin.php (rev 0)
+++ XoopsModules/jobs/trunk/jobs/admin/admin.php 2012-10-08 16:50:10 UTC (rev 10200)
@@ -0,0 +1,152 @@
+<?php
+// $Id: admin.php,v 1.8 2004/12/26 19:12:02 onokazu Exp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+if (isset($_POST['fct'])) {
+ $fct = trim($_POST['fct']);
+}
+if (isset($_GET['fct'])) {
+ $fct = trim($_GET['fct']);
+}
+if (isset($fct) && $fct == "users") {
+ $xoopsOption['pagetype'] = "user";
+}
+include "../../../mainfile.php";
+include XOOPS_ROOT_PATH."/include/cp_functions.php";
+
+
+include_once XOOPS_ROOT_PATH."/class/xoopsmodule.php";
+
+$admintest = 0;
+
+if (is_object($xoopsUser)) {
+ $xoopsModule =& XoopsModule::getByDirname("system");
+ if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ redirect_header(XOOPS_URL."/",3,_NOPERM);
+ exit();
+ }
+ $admintest=1;
+} else {
+ redirect_header(XOOPS_URL."/",3,_NOPERM);
+ exit();
+}
+
+// include system category definitions
+include_once XOOPS_ROOT_PATH."/modules/system/constants.php";
+$error = false;
+if ($admintest != 0) {
+ if (isset($fct) && $fct != '') {
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
+
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
+ include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
+ } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
+ include XOOPS_ROOT_PATH."/modules/system/language/engli...
[truncated message content] |
|
From: <du...@us...> - 2012-10-07 23:01:29
|
Revision: 10199
http://sourceforge.net/p/xoops/svn/10199
Author: dugris
Date: 2012-10-07 23:01:26 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
Fix to get config Preferences / System : Module Config Options
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-10-07 11:43:12 UTC (rev 10198)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-10-07 23:01:26 UTC (rev 10199)
@@ -1501,15 +1501,16 @@
/**
* @param string $key
* @param string $type
+ * @param int $module
*
* @return mixed
*/
- public function getConfig($key, $type = 'XOOPS_CONF')
+ public function getConfig($key, $type = 'XOOPS_CONF', $module = 0)
{
if (isset($this->_systemConfigs[$key])) {
return $this->_systemConfigs[$key];
}
- $this->getConfigs($type);
+ $this->getConfigs($type, $module);
if (!isset($this->_systemConfigs[$key])) {
$this->_systemConfigs[$key] = '';
}
@@ -1518,13 +1519,14 @@
/**
* @param string $type
+ * @param int $module
*
* @return array
*/
- public function getConfigs($type = 'XOOPS_CONF')
+ public function getConfigs($type = 'XOOPS_CONF', $module = 0)
{
$configs = $this->getHandlerConfig()
- ->getConfigsByCat((is_array($type)) ? $type : (!defined($type) ? $type : constant($type)));
+ ->getConfigsByCat((is_array($type)) ? $type : (!defined($type) ? $type : constant($type)), $module);
$this->_systemConfigs = array_merge($this->_systemConfigs, $configs);
$this->config =& $this->_systemConfigs; //for compatibilty
return $this->_systemConfigs;
|
|
From: <du...@us...> - 2012-10-07 11:43:15
|
Revision: 10198
http://sourceforge.net/p/xoops/svn/10198
Author: dugris
Date: 2012-10-07 11:43:12 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
fix template system_dummy.html
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-10-07 11:37:49 UTC (rev 10197)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-10-07 11:43:12 UTC (rev 10198)
@@ -391,7 +391,7 @@
$tpl_info = $this->getTplInfo($tpl_name);
$this->tpl_name = $tpl_info['tpl_name'];
} else {
- $tpl_name = 'system_dummy.html';
+ $tpl_name = 'module:system|system_dummy.html';
$tpl_info = $this->getTplInfo($tpl_name);
$this->tpl_name = $tpl_info['tpl_name'];
}
|
|
From: <du...@us...> - 2012-10-07 11:37:56
|
Revision: 10197
http://sourceforge.net/p/xoops/svn/10197
Author: dugris
Date: 2012-10-07 11:37:49 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
Fix form display
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2012-10-07 11:33:50 UTC (rev 10196)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2012-10-07 11:37:49 UTC (rev 10197)
@@ -236,7 +236,7 @@
if ($xoopsConfigUser['allow_chgmail'] == 1) {
$form->setRequired($email_text);
}
- $form->display();
+ $form->render(false);
$xoops->footer();
}
|
|
From: <du...@us...> - 2012-10-07 11:33:53
|
Revision: 10196
http://sourceforge.net/p/xoops/svn/10196
Author: dugris
Date: 2012-10-07 11:33:50 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
Keep toArray() function for the compatibility of modules, and customization of classes
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
Property Changed:
----------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php 2012-10-05 13:24:54 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php 2012-10-07 11:33:50 UTC (rev 10196)
@@ -1,216 +1,216 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Object joint handler class.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package class
- * @subpackage model
- * @since 2.3.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-/**
- * Object joint handler class.
- *
- * @author Taiwen Jiang <ph...@us...>
- *
- * {@link XoopsObjectAbstract}
- *
- * Usage of methods provided by XoopsModelJoint:
- *
- * Step #1: set linked table and adjoint fields through XoopsPersistableObjectHandler:
- * $handler->table_link = $handler->db->prefix("the_linked_table"); // full name of the linked table that is used for the query
- * $handler->field_link = "the_linked_field"; // name of field in linked table that will be used to link the linked table with current table
- * $handler->field_object = "the_object_field"; // name of field in current table that will be used to link the linked table with current table; linked field name will be used if the field name is not set
- * Step #2: fetch data
- */
-class XoopsModelJoint extends XoopsModelAbstract
-{
- /**
- * Validate information for the linkship
- *
- * @access private
- * @return bool|null
- */
- private function validateLinks()
- {
- if (empty($this->handler->table_link) || empty($this->handler->field_link)) {
- trigger_error("The linked table is not set yet.", E_USER_WARNING);
- return null;
- }
- if (empty($this->handler->field_object)) {
- $this->handler->field_object = $this->handler->field_link;
- }
- return true;
- }
-
- /**
- * get a list of objects matching a condition joint with another related object
- *
- * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
- * @param array $fields variables to fetch
- * @param bool $asObject flag indicating as object, otherwise as array
- * @param string $field_link field of linked object for JOIN; deprecated, for backward compat
- * @param string $field_object field of current object for JOIN; deprecated, for backward compat
- * @return array of objects {@link XoopsObject}
- */
- public function getByLink(CriteriaElement $criteria = null, $fields = null, $asObject = true, $field_link = null, $field_object = null)
- {
- if (!empty($field_link)) {
- $this->handler->field_link = $field_link;
- }
- if (!empty($field_object)) {
- $this->handler->field_object = $field_object;
- }
- if (!$this->validateLinks()) {
- return null;
- }
-
- if (is_array($fields) && count($fields)) {
- if (!in_array("o." . $this->handler->keyName, $fields)) {
- $fields[] = "o." . $this->handler->keyName;
- }
- $select = implode(",", $fields);
- } else {
- $select = "o.*, l.*";
- }
- $limit = null;
- $start = null;
- // $field_object = empty($field_object) ? $field_link : $field_object;
- $sql = " SELECT {$select}" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
- if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
- $sql .= " " . $criteria->renderWhere();
- if ($sort = $criteria->getSort()) {
- $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
- $orderSet = true;
- }
- $limit = $criteria->getLimit();
- $start = $criteria->getStart();
- }
- if (empty($orderSet)) {
- $sql .= " ORDER BY o.{$this->handler->keyName} DESC";
- }
- $result = $this->handler->db->query($sql, $limit, $start);
- $ret = array();
- if ($asObject) {
- while ($myrow = $this->handler->db->fetchArray($result)) {
- $object = $this->handler->create(false);
- $object->assignVars($myrow);
- $ret[$myrow[$this->handler->keyName]] = $object;
- unset($object);
- }
- } else {
- $object = $this->handler->create(false);
- while ($myrow = $this->handler->db->fetchArray($result)) {
- $object->assignVars($myrow);
- $ret[$myrow[$this->handler->keyName]] = $object->getValues(array_keys($myrow));
- }
- unset($object);
- }
- return $ret;
- }
-
- /**
- * Count of objects matching a condition
- *
- * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
- * @return int count of objects
- */
- public function getCountByLink(CriteriaElement $criteria = null)
- {
- if (!$this->validateLinks()) {
- return null;
- }
-
- $sql = " SELECT COUNT(DISTINCT {$this->handler->keyName}) AS count" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
- if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
- $sql .= " " . $criteria->renderWhere();
- }
- if (!$result = $this->handler->db->query($sql)) {
- return false;
- }
- $myrow = $this->handler->db->fetchArray($result);
- return intval($myrow["count"]);
- }
-
- /**
- * array of count of objects matching a condition of, groupby linked object keyname
- *
- * @param CriteriaElement $criteria {@link CriteriaElement} to match
- * @return int count of objects
- */
- public function getCountsByLink(CriteriaElement $criteria = null)
- {
- if (!$this->validateLinks()) {
- return null;
- }
- $sql = " SELECT l.{$this->handler->keyName_link}, COUNT(*)" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
- if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
- $sql .= " " . $criteria->renderWhere();
- }
- $sql .= " GROUP BY l.{$this->handler->keyName_link}";
- if (!$result = $this->handler->db->query($sql)) {
- return false;
- }
- $ret = array();
- while (list ($id, $count) = $this->handler->db->fetchRow($result)) {
- $ret[$id] = $count;
- }
- return $ret;
- }
-
- /**
- * update objects matching a condition against linked objects
- *
- * @param array $data array of key => value
- * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
- * @return int count of objects
- */
- public function updateByLink($data, CriteriaElement $criteria = null)
- {
- if (!$this->validateLinks()) {
- return null;
- }
- $set = array();
- foreach ($data as $key => $val) {
- $set[] = "o.{$key}=" . $this->handler->db->quoteString($val);
- }
- $sql = " UPDATE {$this->handler->table} AS o" . " SET " . implode(", ", $set) . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
- if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
- $sql .= " " . $criteria->renderWhere();
- }
- return $this->handler->db->query($sql);
- }
-
- /**
- * Delete objects matching a condition against linked objects
- *
- * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
- * @return int count of objects
- */
- public function deleteByLink(CriteriaElement $criteria = null)
- {
- if (!$this->validateLinks()) {
- return null;
- }
- $sql = "DELETE FROM {$this->handler->table} AS o " . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
- if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
- $sql .= " " . $criteria->renderWhere();
- }
- return $this->handler->db->query($sql);
- }
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Object joint handler class.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @subpackage model
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * Object joint handler class.
+ *
+ * @author Taiwen Jiang <ph...@us...>
+ *
+ * {@link XoopsObjectAbstract}
+ *
+ * Usage of methods provided by XoopsModelJoint:
+ *
+ * Step #1: set linked table and adjoint fields through XoopsPersistableObjectHandler:
+ * $handler->table_link = $handler->db->prefix("the_linked_table"); // full name of the linked table that is used for the query
+ * $handler->field_link = "the_linked_field"; // name of field in linked table that will be used to link the linked table with current table
+ * $handler->field_object = "the_object_field"; // name of field in current table that will be used to link the linked table with current table; linked field name will be used if the field name is not set
+ * Step #2: fetch data
+ */
+class XoopsModelJoint extends XoopsModelAbstract
+{
+ /**
+ * Validate information for the linkship
+ *
+ * @access private
+ * @return bool|null
+ */
+ private function validateLinks()
+ {
+ if (empty($this->handler->table_link) || empty($this->handler->field_link)) {
+ trigger_error("The linked table is not set yet.", E_USER_WARNING);
+ return null;
+ }
+ if (empty($this->handler->field_object)) {
+ $this->handler->field_object = $this->handler->field_link;
+ }
+ return true;
+ }
+
+ /**
+ * get a list of objects matching a condition joint with another related object
+ *
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @param array $fields variables to fetch
+ * @param bool $asObject flag indicating as object, otherwise as array
+ * @param string $field_link field of linked object for JOIN; deprecated, for backward compat
+ * @param string $field_object field of current object for JOIN; deprecated, for backward compat
+ * @return array of objects {@link XoopsObject}
+ */
+ public function getByLink(CriteriaElement $criteria = null, $fields = null, $asObject = true, $field_link = null, $field_object = null)
+ {
+ if (!empty($field_link)) {
+ $this->handler->field_link = $field_link;
+ }
+ if (!empty($field_object)) {
+ $this->handler->field_object = $field_object;
+ }
+ if (!$this->validateLinks()) {
+ return null;
+ }
+
+ if (is_array($fields) && count($fields)) {
+ if (!in_array("o." . $this->handler->keyName, $fields)) {
+ $fields[] = "o." . $this->handler->keyName;
+ }
+ $select = implode(",", $fields);
+ } else {
+ $select = "o.*, l.*";
+ }
+ $limit = null;
+ $start = null;
+ // $field_object = empty($field_object) ? $field_link : $field_object;
+ $sql = " SELECT {$select}" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+ if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
+ $sql .= " " . $criteria->renderWhere();
+ if ($sort = $criteria->getSort()) {
+ $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
+ $orderSet = true;
+ }
+ $limit = $criteria->getLimit();
+ $start = $criteria->getStart();
+ }
+ if (empty($orderSet)) {
+ $sql .= " ORDER BY o.{$this->handler->keyName} DESC";
+ }
+ $result = $this->handler->db->query($sql, $limit, $start);
+ $ret = array();
+ if ($asObject) {
+ while ($myrow = $this->handler->db->fetchArray($result)) {
+ $object = $this->handler->create(false);
+ $object->assignVars($myrow);
+ $ret[$myrow[$this->handler->keyName]] = $object;
+ unset($object);
+ }
+ } else {
+ $object = $this->handler->create(false);
+ while ($myrow = $this->handler->db->fetchArray($result)) {
+ $object->assignVars($myrow);
+ $ret[$myrow[$this->handler->keyName]] = $object->toArray();
+ }
+ unset($object);
+ }
+ return $ret;
+ }
+
+ /**
+ * Count of objects matching a condition
+ *
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return int count of objects
+ */
+ public function getCountByLink(CriteriaElement $criteria = null)
+ {
+ if (!$this->validateLinks()) {
+ return null;
+ }
+
+ $sql = " SELECT COUNT(DISTINCT {$this->handler->keyName}) AS count" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+ if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
+ $sql .= " " . $criteria->renderWhere();
+ }
+ if (!$result = $this->handler->db->query($sql)) {
+ return false;
+ }
+ $myrow = $this->handler->db->fetchArray($result);
+ return intval($myrow["count"]);
+ }
+
+ /**
+ * array of count of objects matching a condition of, groupby linked object keyname
+ *
+ * @param CriteriaElement $criteria {@link CriteriaElement} to match
+ * @return int count of objects
+ */
+ public function getCountsByLink(CriteriaElement $criteria = null)
+ {
+ if (!$this->validateLinks()) {
+ return null;
+ }
+ $sql = " SELECT l.{$this->handler->keyName_link}, COUNT(*)" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+ if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
+ $sql .= " " . $criteria->renderWhere();
+ }
+ $sql .= " GROUP BY l.{$this->handler->keyName_link}";
+ if (!$result = $this->handler->db->query($sql)) {
+ return false;
+ }
+ $ret = array();
+ while (list ($id, $count) = $this->handler->db->fetchRow($result)) {
+ $ret[$id] = $count;
+ }
+ return $ret;
+ }
+
+ /**
+ * update objects matching a condition against linked objects
+ *
+ * @param array $data array of key => value
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return int count of objects
+ */
+ public function updateByLink($data, CriteriaElement $criteria = null)
+ {
+ if (!$this->validateLinks()) {
+ return null;
+ }
+ $set = array();
+ foreach ($data as $key => $val) {
+ $set[] = "o.{$key}=" . $this->handler->db->quoteString($val);
+ }
+ $sql = " UPDATE {$this->handler->table} AS o" . " SET " . implode(", ", $set) . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+ if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
+ $sql .= " " . $criteria->renderWhere();
+ }
+ return $this->handler->db->query($sql);
+ }
+
+ /**
+ * Delete objects matching a condition against linked objects
+ *
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return int count of objects
+ */
+ public function deleteByLink(CriteriaElement $criteria = null)
+ {
+ if (!$this->validateLinks()) {
+ return null;
+ }
+ $sql = "DELETE FROM {$this->handler->table} AS o " . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+ if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
+ $sql .= " " . $criteria->renderWhere();
+ }
+ return $this->handler->db->query($sql);
+ }
}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
___________________________________________________________________
Deleted: svn:eol-style
- native
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php 2012-10-05 13:24:54 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php 2012-10-07 11:33:50 UTC (rev 10196)
@@ -1,182 +1,182 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Object render handler class.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package class
- * @subpackage model
- * @since 2.3.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-/**
- * Object render handler class.
- *
- * @author Taiwen Jiang <ph...@us...>
- *
- * {@link XoopsObjectAbstract}
- */
-class XoopsModelRead extends XoopsModelAbstract
-{
- /**
- * get all objects matching a condition
- *
- * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
- * @param array $fields variables to fetch
- * @param bool $asObject flag indicating as object, otherwise as array
- * @param bool $id_as_key use the ID as key for the array
- * @return array of objects/array {@link XoopsObject}
- */
- public function getAll(CriteriaElement $criteria = null, $fields = null, $asObject = true, $id_as_key = true)
- {
- if (is_array($fields) && count($fields) > 0) {
- if (!in_array($this->handler->keyName, $fields)) {
- $fields[] = $this->handler->keyName;
- }
- $select = "`" . implode("`, `", $fields) . "`";
- } else {
- $select = "*";
- }
- $limit = null;
- $start = null;
- $sql = "SELECT {$select} FROM `{$this->handler->table}`";
- if (isset($criteria)) {
- $sql .= " " . $criteria->renderWhere();
- if ($groupby = $criteria->getGroupby()) {
- $sql .= $groupby;
- }
- if ($sort = $criteria->getSort()) {
- $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
- $orderSet = true;
- }
- $limit = $criteria->getLimit();
- $start = $criteria->getStart();
- }
- if (empty($orderSet)) {
- //$sql .= " ORDER BY `{$this->handler->keyName}` DESC";
- }
- $result = $this->handler->db->query($sql, $limit, $start);
- $ret = array();
- if ($asObject) {
- while ($myrow = $this->handler->db->fetchArray($result)) {
- $object = $this->handler->create(false);
- $object->assignVars($myrow);
- if ($id_as_key) {
- $ret[$myrow[$this->handler->keyName]] = $object;
- } else {
- $ret[] = $object;
- }
- unset($object);
- }
- } else {
- $object = $this->handler->create(false);
- while ($myrow = $this->handler->db->fetchArray($result)) {
- $object->assignVars($myrow);
- if ($id_as_key) {
- $ret[$myrow[$this->handler->keyName]] = $object->getValues(array_keys($myrow));
- } else {
- $ret[] = $object->getValues(array_keys($myrow));
- }
- }
- unset($object);
- }
- return $ret;
- }
-
- /**
- * retrieve objects from the database
- *
- * For performance consideration, getAll() is recommended
- *
- * @param CriteriaElement|null $criteria {@link CriteriaElement} conditions to be met
- * @param bool $id_as_key use the ID as key for the array
- * @param bool $as_object return an array of objects?
- * @return array
- */
- public function getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true)
- {
- $objects = $this->getAll($criteria, null, $as_object, $id_as_key);
- return $objects;
- }
-
- /**
- * Retrieve a list of objects data
- *
- * @param CriteriaElement|null $criteria {@link CriteriaElement} conditions to be met
- * @param int $limit Max number of objects to fetch
- * @param int $start Which record to start at
- * @return array
- */
- public function getList(CriteriaElement $criteria = null, $limit = 0, $start = 0)
- {
- $ret = array();
- if ($criteria == null) {
- $criteria = new CriteriaCompo();
- }
-
- $sql = "SELECT `{$this->handler->keyName}`";
- if (!empty($this->handler->identifierName)) {
- $sql .= ", `{$this->handler->identifierName}`";
- }
- $sql .= " FROM `{$this->handler->table}`";
- if (isset($criteria)) {
- $sql .= ' ' . $criteria->renderWhere();
- if ($sort = $criteria->getSort()) {
- $sql .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
- }
- $limit = $criteria->getLimit();
- $start = $criteria->getStart();
- }
- $result = $this->handler->db->query($sql, $limit, $start);
- if (!$result) {
- return $ret;
- }
-
- $myts = MyTextSanitizer::getInstance();
- while ($myrow = $this->handler->db->fetchArray($result)) {
- // identifiers should be textboxes, so sanitize them like that
- $ret[$myrow[$this->handler->keyName]] = empty($this->handler->identifierName) ? 1
- : $myts->htmlSpecialChars($myrow[$this->handler->identifierName]);
- }
- return $ret;
- }
-
- /**
- * get IDs of objects matching a condition
- *
- * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
- * @return array of object IDs
- */
- function getIds(CriteriaElement $criteria = null)
- {
- $ret = array();
- $sql = "SELECT `{$this->handler->keyName}` FROM `{$this->handler->table}`";
- $limit = $start = null;
- if (isset($criteria)) {
- $sql .= ' ' . $criteria->renderWhere();
- $limit = $criteria->getLimit();
- $start = $criteria->getStart();
- }
- if (!$result = $this->handler->db->query($sql, $limit, $start)) {
- return $ret;
- }
- while ($myrow = $this->handler->db->fetchArray($result)) {
- $ret[] = $myrow[$this->handler->keyName];
- }
- return $ret;
- }
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Object render handler class.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @subpackage model
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * Object render handler class.
+ *
+ * @author Taiwen Jiang <ph...@us...>
+ *
+ * {@link XoopsObjectAbstract}
+ */
+class XoopsModelRead extends XoopsModelAbstract
+{
+ /**
+ * get all objects matching a condition
+ *
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @param array $fields variables to fetch
+ * @param bool $asObject flag indicating as object, otherwise as array
+ * @param bool $id_as_key use the ID as key for the array
+ * @return array of objects/array {@link XoopsObject}
+ */
+ public function getAll(CriteriaElement $criteria = null, $fields = null, $asObject = true, $id_as_key = true)
+ {
+ if (is_array($fields) && count($fields) > 0) {
+ if (!in_array($this->handler->keyName, $fields)) {
+ $fields[] = $this->handler->keyName;
+ }
+ $select = "`" . implode("`, `", $fields) . "`";
+ } else {
+ $select = "*";
+ }
+ $limit = null;
+ $start = null;
+ $sql = "SELECT {$select} FROM `{$this->handler->table}`";
+ if (isset($criteria)) {
+ $sql .= " " . $criteria->renderWhere();
+ if ($groupby = $criteria->getGroupby()) {
+ $sql .= $groupby;
+ }
+ if ($sort = $criteria->getSort()) {
+ $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
+ $orderSet = true;
+ }
+ $limit = $criteria->getLimit();
+ $start = $criteria->getStart();
+ }
+ if (empty($orderSet)) {
+ //$sql .= " ORDER BY `{$this->handler->keyName}` DESC";
+ }
+ $result = $this->handler->db->query($sql, $limit, $start);
+ $ret = array();
+ if ($asObject) {
+ while ($myrow = $this->handler->db->fetchArray($result)) {
+ $object = $this->handler->create(false);
+ $object->assignVars($myrow);
+ if ($id_as_key) {
+ $ret[$myrow[$this->handler->keyName]] = $object;
+ } else {
+ $ret[] = $object;
+ }
+ unset($object);
+ }
+ } else {
+ $object = $this->handler->create(false);
+ while ($myrow = $this->handler->db->fetchArray($result)) {
+ $object->assignVars($myrow);
+ if ($id_as_key) {
+ $ret[$myrow[$this->handler->keyName]] = $object->toArray();
+ } else {
+ $ret[] = $object->toArray();
+ }
+ }
+ unset($object);
+ }
+ return $ret;
+ }
+
+ /**
+ * retrieve objects from the database
+ *
+ * For performance consideration, getAll() is recommended
+ *
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} conditions to be met
+ * @param bool $id_as_key use the ID as key for the array
+ * @param bool $as_object return an array of objects?
+ * @return array
+ */
+ public function getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true)
+ {
+ $objects = $this->getAll($criteria, null, $as_object, $id_as_key);
+ return $objects;
+ }
+
+ /**
+ * Retrieve a list of objects data
+ *
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} conditions to be met
+ * @param int $limit Max number of objects to fetch
+ * @param int $start Which record to start at
+ * @return array
+ */
+ public function getList(CriteriaElement $criteria = null, $limit = 0, $start = 0)
+ {
+ $ret = array();
+ if ($criteria == null) {
+ $criteria = new CriteriaCompo();
+ }
+
+ $sql = "SELECT `{$this->handler->keyName}`";
+ if (!empty($this->handler->identifierName)) {
+ $sql .= ", `{$this->handler->identifierName}`";
+ }
+ $sql .= " FROM `{$this->handler->table}`";
+ if (isset($criteria)) {
+ $sql .= ' ' . $criteria->renderWhere();
+ if ($sort = $criteria->getSort()) {
+ $sql .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
+ }
+ $limit = $criteria->getLimit();
+ $start = $criteria->getStart();
+ }
+ $result = $this->handler->db->query($sql, $limit, $start);
+ if (!$result) {
+ return $ret;
+ }
+
+ $myts = MyTextSanitizer::getInstance();
+ while ($myrow = $this->handler->db->fetchArray($result)) {
+ // identifiers should be textboxes, so sanitize them like that
+ $ret[$myrow[$this->handler->keyName]] = empty($this->handler->identifierName) ? 1
+ : $myts->htmlSpecialChars($myrow[$this->handler->identifierName]);
+ }
+ return $ret;
+ }
+
+ /**
+ * get IDs of objects matching a condition
+ *
+ * @param CriteriaElement|null $criteria {@link CriteriaElement} to match
+ * @return array of object IDs
+ */
+ function getIds(CriteriaElement $criteria = null)
+ {
+ $ret = array();
+ $sql = "SELECT `{$this->handler->keyName}` FROM `{$this->handler->table}`";
+ $limit = $start = null;
+ if (isset($criteria)) {
+ $sql .= ' ' . $criteria->renderWhere();
+ $limit = $criteria->getLimit();
+ $start = $criteria->getStart();
+ }
+ if (!$result = $this->handler->db->query($sql, $limit, $start)) {
+ return $ret;
+ }
+ while ($myrow = $this->handler->db->fetchArray($result)) {
+ $ret[] = $myrow[$this->handler->keyName];
+ }
+ return $ret;
+ }
}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
___________________________________________________________________
Deleted: svn:eol-style
- native
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php 2012-10-05 13:24:54 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php 2012-10-07 11:33:50 UTC (rev 10196)
@@ -1,1308 +1,1313 @@
-<?php
-/**
- * XOOPS Kernel Object
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package kernel
- * @since 2.0.0
- * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-/**
- * *#@+
- * Xoops object datatype
- */
-define('XOBJ_DTYPE_TXTBOX', 1);
-define('XOBJ_DTYPE_TXTAREA', 2);
-define('XOBJ_DTYPE_INT', 3);
-define('XOBJ_DTYPE_URL', 4);
-define('XOBJ_DTYPE_EMAIL', 5);
-define('XOBJ_DTYPE_ARRAY', 6);
-define('XOBJ_DTYPE_OTHER', 7);
-define('XOBJ_DTYPE_SOURCE', 8);
-define('XOBJ_DTYPE_STIME', 9);
-define('XOBJ_DTYPE_MTIME', 10);
-define('XOBJ_DTYPE_LTIME', 11);
-define('XOBJ_DTYPE_FLOAT', 13);
-define('XOBJ_DTYPE_DECIMAL', 14);
-define('XOBJ_DTYPE_ENUM', 15);
-
-/**
- * Base class for all objects in the Xoops kernel (and beyond)
- */
-class XoopsObject
-{
- /**
- * holds all variables(properties) of an object
- *
- * @var array
- */
- public $vars = array();
-
- /**
- * variables cleaned for store in DB
- *
- * @var array
- */
- public $cleanVars = array();
-
- /**
- * is it a newly created object?
- *
- * @var bool
- */
- private $_isNew = false;
-
- /**
- * has any of the values been modified?
- *
- * @var bool
- */
- private $_isDirty = false;
-
- /**
- * errors
- *
- * @var array
- */
- private $_errors = array();
-
- /**
- * additional filters registered dynamically by a child class object
- *
- * @var array
- */
- private $_filters = array();
-
- /**
- * @var string
- */
- public $plugin_path;
-
- /**
- * used for new/clone objects
- *
- * @access public
- * @return void
- */
- public function setNew()
- {
- $this->_isNew = true;
- }
-
- /**
- * @return void
- */
- public function unsetNew()
- {
- $this->_isNew = false;
- }
-
- /**
- * @return bool
- */
- public function isNew()
- {
- return $this->_isNew;
- }
-
- /**
- * mark modified objects as dirty
- *
- * used for modified objects only
- *
- * @access public
- * @return void
- */
- public function setDirty()
- {
- $this->_isDirty = true;
- }
-
- /**
- * @return void
- */
- public function unsetDirty()
- {
- $this->_isDirty = false;
- }
-
- /**
- * @return bool
- */
- public function isDirty()
- {
- return $this->_isDirty;
- }
-
- /**
- * initialize variables for the object
- *
- * @param string $key
- * @param int $data_type set to one of XOBJ_DTYPE_XXX constants (set to XOBJ_DTYPE_OTHER if no data type ckecking nor text sanitizing is required)
- * @param mixed $value
- * @param bool $required require html form input?
- * @param mixed $maxlength for XOBJ_DTYPE_TXTBOX type only
- * @param string $options does this data have any select options?
- * @return void
- */
- public function initVar($key, $data_type, $value = null, $required = false, $maxlength = null, $options = '')
- {
- $this->vars[$key] = array('value' => $value, 'required' => $required, 'data_type' => $data_type, 'maxlength' => $maxlength, 'changed' => false, 'options' => $options);
- }
-
- /**
- * assign a value to a variable
- *
- * @param string $key name of the variable to assign
- * @param mixed $value value to assign
- */
- public function assignVar($key, $value)
- {
- if (isset($key) && isset($this->vars[$key])) {
- $this->vars[$key]['value'] = $value;
- }
- }
-
- /**
- * assign values to multiple variables in a batch
- *
- * @param array $var_arr associative array of values to assign
- */
- public function assignVars($var_arr)
- {
- foreach ($var_arr as $key => $value) {
- $this->assignVar($key, $value);
- }
- }
-
- /**
- * assign a value to a variable
- *
- * @access public
- * @param string $key name of the variable to assign
- * @param mixed $value value to assign
- * @param bool $not_gpc
- */
- public function setVar($key, $value, $not_gpc = false)
- {
- if (!empty($key) && isset($value) && isset($this->vars[$key])) {
- $this->vars[$key]['value'] = $value;
- $this->vars[$key]['not_gpc'] = $not_gpc;
- $this->vars[$key]['changed'] = true;
- $this->setDirty();
- }
- }
-
- /**
- * assign values to multiple variables in a batch
- *
- * @access private
- * @param array $var_arr associative array of values to assign
- * @param bool $not_gpc
- */
- public function setVars($var_arr, $not_gpc = false)
- {
- foreach ($var_arr as $key => $value) {
- $this->setVar($key, $value, $not_gpc);
- }
- }
-
- /**
- * unset variable(s) for the object
- *
- * @param mixed $var
- * @return bool
- */
- public function destroyVars($var)
- {
- if (empty($var)) {
- return true;
- }
- $var = !is_array($var) ? array($var) : $var;
- foreach ($var as $key) {
- if (!isset($this->vars[$key])) {
- continue;
- }
- $this->vars[$key]['changed'] = null;
- }
- return true;
- }
-
- /**
- * Assign values to multiple variables in a batch
- *
- * Meant for a CGI context:
- * - prefixed CGI args are considered save
- * - avoids polluting of namespace with CGI args
- *
- * @access private
- * @param mixed $var_arr associative array of values to assign
- * @param string $pref prefix (only keys starting with the prefix will be set)
- * @param bool $not_gpc
- */
- public function setFormVars($var_arr = null, $pref = 'xo_', $not_gpc = false)
- {
- $len = strlen($pref);
- foreach ($var_arr as $key => $value) {
- if ($pref == substr($key, 0, $len)) {
- $this->setVar(substr($key, $len), $value, $not_gpc);
- }
- }
- }
-
- /**
- * returns all variables for the object
- *
- * @access public
- * @return array associative array of key->value pairs
- */
- public function getVars()
- {
- return $this->vars;
- }
-
- /**
- * Returns the values of the specified variables
- *
- * @param mixed $keys An array containing the names of the keys to retrieve, or null to get all of them
- * @param string $format Format to use (see getVar)
- * @param int $maxDepth Maximum level of recursion to use if some vars are objects themselves
- * @return array associative array of key->value pairs
- */
- public function getValues($keys = null, $format = 's', $maxDepth = 1)
- {
- if (!isset($keys)) {
- $keys = array_keys($this->vars);
- }
- $vars = array();
- foreach ($keys as $key) {
- if (isset($this->vars[$key])) {
- if (is_object($this->vars[$key]) && is_a($this->vars[$key], 'XoopsObject')) {
- if ($maxDepth) {
- /* @var $obj XoopsObject */
- $obj = $this->vars[$key];
- $vars[$key] = $obj->getValues(null, $format, $maxDepth - 1);
- }
- } else {
- $vars[$key] = $this->getVar($key, $format);
- }
- }
- }
- return $vars;
- }
-
- /**
- * returns a specific variable for the object in a proper format
- *
- * @access public
- * @param string $key key of the object's variable to be returned
- * @param string $format format to use for the output
- * @return mixed formatted value of the variable
- */
- public function getVar($key, $format = 's')
- {
- $ret = null;
- if (!isset($this->vars[$key])) {
- return $ret;
- }
- $ret = $this->vars[$key]['value'];
- $ts = MyTextSanitizer::getInstance();
- switch ($this->vars[$key]['data_type']) {
- case XOBJ_DTYPE_TXTBOX:
- switch (strtolower($format)) {
- case 's':
- case 'show':
- case 'e':
- case 'edit':
- return $ts->htmlSpecialChars($ret);
- break 1;
- case 'p':
- case 'preview':
- case 'f':
- case 'formpreview':
- return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
- break 1;
- case 'n':
- case 'none':
- default:
- break 1;
- }
- break;
- case XOBJ_DTYPE_TXTAREA:
- switch (strtolower($format)) {
- case 's':
- case 'show':
- $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
- $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
- $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
- $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
- $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
- return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
- break 1;
- case 'e':
- case 'edit':
- return htmlspecialchars($ret, ENT_QUOTES);
- break 1;
- case 'p':
- case 'preview':
- $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
- $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
- $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
- $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
- $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
- return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
- break 1;
- case 'f':
- case 'formpreview':
- return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
- break 1;
- case 'n':
- case 'none':
- default:
- break 1;
- }
- break;
- case XOBJ_DTYPE_ARRAY:
- switch (strtolower($format)) {
- case 'n':
- case 'none':
- break 1;
- default:
- if (!is_array($ret)) {
- if ($ret != '') {
- $ret = unserialize($ret);
- }
- $ret = is_array($ret) ? $ret : array();
- }
- return $ret;
- break 1;
- }
- break;
- case XOBJ_DTYPE_SOURCE:
- switch (strtolower($format)) {
- case 's':
- case 'show':
- break 1;
- case 'e':
- case 'edit':
- return htmlspecialchars($ret, ENT_QUOTES);
- break 1;
- case 'p':
- case 'preview':
- return $ts->stripSlashesGPC($ret);
- break 1;
- case 'f':
- case 'formpreview':
- return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
- break 1;
- case 'n':
- case 'none':
- default:
- break 1;
- }
- break;
- default:
- if ($this->vars[$key]['options'] != '' && $ret != '') {
- switch (strtolower($format)) {
- case 's':
- case 'show':
- $selected = explode('|', $ret);
- $options = explode('|', $this->vars[$key]['options']);
- $i = 1;
- $ret = array();
- foreach ($options as $op) {
- if (in_array($i, $selected)) {
- $ret[] = $op;
- }
- $i++;
- }
- return implode(', ', $ret);
- case 'e':
- case 'edit':
- $ret = explode('|', $ret);
- break 1;
- default:
- break 1;
- }
- }
- break;
- }
- return $ret;
- }
-
- /**
- * clean values of all variables of the object for storage.
- * also add slashes whereever needed
- *
- * @return bool true if successful
- * @access public
- */
- public function cleanVars()
- {
- $ts = MyTextSanitizer::getInstance();
- $existing_errors = $this->getErrors();
- $this->_errors = array();
- foreach ($this->vars as $k => $v) {
- $cleanv = $v['value'];
- if (!$v['changed']) {
- } else {
- $cleanv = is_string($cleanv) ? trim($cleanv) : $cleanv;
- switch ($v['data_type']) {
- case XOBJ_DTYPE_TXTBOX:
- if ($v['required'] && $cleanv != '0' && $cleanv == '') {
- $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
- continue;
- }
- if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
- $this->setErrors(sprintf(_XOBJ_ERR_SHORTERTHAN, $k, intval($v['maxlength'])));
- continue;
- }
- if (!$v['not_gpc']) {
- $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
- } else {
- $cleanv = $ts->censorString($cleanv);
- }
- break;
- case XOBJ_DTYPE_TXTAREA:
- if ($v['required'] && $cleanv != '0' && $cleanv == '') {
- $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
- continue;
- }
- if (!$v['not_gpc']) {
- $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
- } else {
- $cleanv = $ts->censorString($cleanv);
- }
- break;
- case XOBJ_DTYPE_SOURCE:
- if (!$v['not_gpc']) {
- $cleanv = $ts->stripSlashesGPC($cleanv);
- }
- break;
- case XOBJ_DTYPE_INT:
- $cleanv = intval($cleanv);
- break;
-
- case XOBJ_DTYPE_EMAIL:
- if ($v['required'] && $cleanv == '') {
- $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
- continue;
- }
- if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i", $cleanv)) {
- $this->setErrors("Invalid Email");
- continue;
- }
- if (!$v['not_gpc']) {
- $cleanv = $ts->stripSlashesGPC($cleanv);
- }
- break;
- case XOBJ_DTYPE_URL:
- if ($v['required'] && $cleanv == '') {
- $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
- continue;
- }
- if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
- $cleanv = 'http://' . $cleanv;
- }
- if (!$v['not_gpc']) {
- $cleanv = $ts->stripSlashesGPC($cleanv);
- }
- break;
- case XOBJ_DTYPE_ARRAY:
- $cleanv = (array)$cleanv;
- $cleanv = serialize($cleanv);
- break;
- case XOBJ_DTYPE_STIME:
- case XOBJ_DTYPE_MTIME:
- case XOBJ_DTYPE_LTIME:
- $cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
- break;
- case XOBJ_DTYPE_FLOAT:
- $cleanv = floatval($cleanv);
- break;
- case XOBJ_DTYPE_DECIMAL:
- $cleanv = doubleval($cleanv);
- break;
- case XOBJ_DTYPE_ENUM:
- if (!in_array($cleanv, $v['enumeration'])) {
- $this->setErrors("Invalid Enumeration");
- continue;
- }
- break;
- default:
- break;
- }
- }
- $this->cleanVars[$k] = str_replace('\\"', '"', $cleanv);
- unset($cleanv);
- }
- if (count($this->_errors) > 0) {
- $this->_errors = array_merge($existing_errors, $this->_errors);
- return false;
- }
- $this->_errors = array_merge($existing_errors, $this->_errors);
- $this->unsetDirty();
- return true;
- }
-
- /**
- * dynamically register additional filter for the object
- *
- * @param string $filtername name of the filter
- * @access public
- */
- public function registerFilter($filtername)
- {
- $this->_filters[] = $filtername;
- }
-
- /**
- * load all additional filters that have been registered to the object
- *
- * @access private
- */
- private function _loadFilters()
- {
- static $loaded;
- if (isset($loaded)) {
- return;
- }
- $loaded = 1;
-
- $path = empty($this->plugin_path) ? dirname(__FILE__) . '/filters' : $this->plugin_path;
- if (file_exists($file = $path . '/filter.php')) {
- include_once $file;
- foreach ($this->_filters as $f) {
- if (file_exists($file = $path . '/' . strtolower($f) . 'php')) {
- include_once $file;
- }
- }
- }
- }
-
- /**
- * load all local filters for the object
- *
- * Filter distribution:
- * In each module folder there is a folder "filter" containing filter files with,
- * filename: [name_of_target_class][.][function/action_name][.php];
- * function name: [dirname][_][name_of_target_class][_][function/action_name];
- * parameter: the target object
- *
- * @param string $method function or action name
- * @access public
- */
- public function loadFilters($method)
- {
- $this->_loadFilters();
-
-
- $class = get_class($this);
- if (!$modules_active = XoopsCache::read('system_modules_active')) {
- $xoops = Xoops::getInstance();
- $module_handler = $xoops->getHandlerModule();
- $modules_obj = $module_handler->getObjectsArray(new Criteria('isactive', 1));
- $modules_active = array();
- foreach (array_keys($modules_obj) as $key) {
- $modules_active[] = $modules_obj[$key]->getVar('dirname');
- }
- unset($modules_obj);
- XoopsCache::write('system_modules_active', $modules_active);
- }
- foreach ($modules_active as $dirname) {
- if (file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/filter/' . $class . '.' . $method . '.php')) {
- include_once $file;
- if (function_exists($class . '_' . $method)) {
- call_user_func_array($dirname . '_' . $class . '_' . $method, array(&$this));
- }
- }
- }
- }
-
- /**
- * create a clone(copy) of the current object
- *
- * @access public
- * @return object clone
- */
- public function xoopsClone()
- {
- /* @var $clone XoopsObject */
- $class = get_class($this);
- $clone = null;
- $clone = new $class();
- foreach ($this->vars as $k => $v) {
- $clone->assignVar($k, $v['value']);
- }
- // need this to notify the handler class that this is a newly created object
- $clone->setNew();
- return $clone;
- }
-
- /**
- * add an error
- *
- * @param string $err_str to add
- * @access public
- */
- public function setErrors($err_str)
- {
- if (is_array($err_str)) {
- $this->_errors = array_merge($this->_errors, $err_str);
- } else {
- $this->_errors[] = trim($err_str);
- }
- }
-
- /**
- * return the errors for this object as an array
- *
- * @return array an array of errors
- * @access public
- */
- public function getErrors()
- {
- return $this->_errors;
- }
-
- /**
- * return the errors for this object as html
- *
- * @return string html listing the errors
- * @access public
- * @todo remove harcoded strings
- */
- public function getHtmlErrors()
- {
- $ret = '<h4>Errors</h4>';
- if (!empty($this->_errors)) {
- foreach ($this->_errors as $error) {
- $ret .= $error . '<br />';
- }
- } else {
- $ret .= 'None<br />';
- }
- return $ret;
- }
-}
-
-/**
- * XOOPS object handler class.
- * This class is an abstract class of handler classes that are responsible for providing
- * data access mechanisms to the data source of its corresponsing data objects
- *
- * @package kernel
- * @abstract
- * @author Kazumi Ono <on...@xo...>
- * @copyright copyright © 2000 The XOOPS Project
- */
-class XoopsObjectHandler
-{
- /**
- * holds referenced to {@link XoopsDatabase} class object
- *
- * @var XoopsDatabase
- * @see XoopsDatabase
- * @access protected
- */
- public $db;
-
- /**
- * called from child classes only
- *
- * @param XoopsDatabase $db reference to the {@link XoopsDatabase} object
- * @access protected
- */
- public function __construct($db)
- {
- $this->db = $db;
- }
-
- /**
- * creates a new object
- *
- * @abstract
- */
- public function create()
- {
-
- }
-
- /**
- * gets a value object
- *
- * @param int $int_id
- * @abstract
- */
- public function get($int_id)
- {
-
- }
-
- /**
- * insert/update object
- *
- * @param object $object
- * @abstract
- */
- public function insert($object)
- {
- }
-
- /**
- * delete object from database
- *
- * @param object $object
- * @abstract
- */
- public function delete($object)
- {
- }
-}
-
-/**
- * Persistable Object Handler class.
- *
- * @author Taiwen Jiang <ph...@us...>
- * @author Jan Keller Pedersen <mit...@xo...>
- * @copyright copyright (c) The XOOPS project
- * @package kernel
- */
-class XoopsPersistableObjectHandler extends XoopsObjectHandler
-{
- /**
- * holds reference to custom extended object handler
- *
- * var object
- *
- * @access private
- */
- /**
- * static protected
- */
- protected $handler;
-
- /**
- * holds reference to predefined extended object handlers: read, stats, joint, write, sync
- *
- * The handlers hold methods for different purposes, which could be all put together inside of current class.
- * However, load codes only if they are necessary, thus they are now splitted out.
- *
- * var array of objects
- *
- * @access private
- */
- private $handlers = array('read' => null, 'stats' => null, 'joint' => null, 'write' => null, 'sync' => null);
-
- /**
- * Information about the class, the handler is managing
- *
- * @var string
- * @access public
- */
- public $table;
-
- /**
- * @var string
- */
- public $keyName;
-
- /**
- * @var string
- */
- public $className;
-
- /**
- * @var string
- */
- public $table_link;
-
- /**
- * @var string
- */
- public $identifierName;
-
- /**
- * @var string
- */
- public $field_link;
-
- /**
- * @var string
- */
- public $field_object;
-
- /**
- * @var string
- */
- public $keyName_link;
-
- /**
- * Constructor
- *
- * @access protected
- * @param null|XoopsDatabase $db {@link XoopsDatabase} object
- * @param string $table Name of database table
- * @param string $className Name of Class, this handler is managing
- * @param string $keyName Name of the property holding the key
- * @param string $identifierName Name of the property holding an identifier name (title, name ...), used on getList()
- */
- public function __construct(XoopsDatabase $db = null, $table = '', $className = '', $keyName = '', $identifierName = '')
- {
- $db = XoopsDatabaseFactory::getDatabaseConnection();
- $table = $db->prefix($table);
- parent::__construct($db);
- $this->table = $table;
- $this->keyName = $keyName;
- $this->className = $className;
- if ($identifierName) {
- $this->identifierName = $identifierName;
- }
- }
-
- /**
- * Set custom handler
- *
- * @access protected
- *
- * @param string|object $handler
- * @param array|null $args
- * @param string|null $path
- * @return object|null
- */
- public function setHandler($handler = null, $args = null, $path = null)
- {
- $this->handler = null;
- if (is_object($handler)) {
- $this->handler = $handler;
- } else {
- if (is_string($handler)) {
- $xmf = XoopsModelFactory::getInstance();
- $this->handler = $xmf->loadHandler($this, $handler, $args, $path);
- }
- }
-...
[truncated message content] |
|
From: <du...@us...> - 2012-10-06 08:57:47
|
Revision: 10197
http://xoops.svn.sourceforge.net/xoops/?rev=10197&view=rev
Author: dugris
Date: 2012-10-06 08:57:40 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
remove testform.php link
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html 2012-10-05 10:58:19 UTC (rev 10196)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html 2012-10-06 08:57:40 UTC (rev 10197)
@@ -18,9 +18,11 @@
<div class="container-fluid">
<{includeq file="$theme_tpl/dashboard.html"}>
</div>
+<!--
<div class="center">
<a href="<{$xoops_url}>/modules/system/testform.php">Test new form</a>
</div>
+-->
<div class="footer">
<p class="pull-right"><a href="#">Back to top</a></p>
<p class="txtcenter">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-10-05 13:24:55
|
Revision: 10195
http://sourceforge.net/p/xoops/svn/10195
Author: beckmi
Date: 2012-10-05 13:24:54 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Updating changelog
Modified Paths:
--------------
XoopsModules/xoopsmembers/trunk/xoopsmembers/docs/changelog.txt
Modified: XoopsModules/xoopsmembers/trunk/xoopsmembers/docs/changelog.txt
===================================================================
--- XoopsModules/xoopsmembers/trunk/xoopsmembers/docs/changelog.txt 2012-10-05 12:58:20 UTC (rev 10194)
+++ XoopsModules/xoopsmembers/trunk/xoopsmembers/docs/changelog.txt 2012-10-05 13:24:54 UTC (rev 10195)
@@ -2,6 +2,7 @@
--------------------
->Added: icons for Edit/Delete (Mamba)
->Added: Admin side (Mamba)
+ ->Added: Converted to XOOPS 2.5.5 Admin GUI (Mamba)
=>version 1.01
--------------------
|
|
From: <be...@us...> - 2012-10-05 12:58:23
|
Revision: 10194
http://sourceforge.net/p/xoops/svn/10194
Author: beckmi
Date: 2012-10-05 12:58:20 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Updating to Final version
Modified Paths:
--------------
XoopsModules/xoopsmembers/trunk/xoopsmembers/xoops_version.php
Modified: XoopsModules/xoopsmembers/trunk/xoopsmembers/xoops_version.php
===================================================================
--- XoopsModules/xoopsmembers/trunk/xoopsmembers/xoops_version.php 2012-10-03 04:34:39 UTC (rev 10193)
+++ XoopsModules/xoopsmembers/trunk/xoopsmembers/xoops_version.php 2012-10-05 12:58:20 UTC (rev 10194)
@@ -30,8 +30,8 @@
'contributors' => '',
'credits' => 'The Xoops Module Development Team',
'version' => 1.02,
- 'module_status' => "RC",
- 'releasedate' => 'Friday 10.4.2009',
+ 'module_status' => "Final",
+ 'releasedate' => '2012-10-03',
'official' => 1,
'image' => 'images/slogo.png',
'dirname' => basename( dirname( __FILE__ ) ),
|
|
From: <du...@us...> - 2012-10-05 10:58:25
|
Revision: 10196
http://xoops.svn.sourceforge.net/xoops/?rev=10196&view=rev
Author: dugris
Date: 2012-10-05 10:58:19 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Keep toArray() function for the compatibility of modules, and customization of classes
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php 2012-10-03 04:31:55 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php 2012-10-05 10:58:19 UTC (rev 10196)
@@ -117,7 +117,7 @@
$object = $this->handler->create(false);
while ($myrow = $this->handler->db->fetchArray($result)) {
$object->assignVars($myrow);
- $ret[$myrow[$this->handler->keyName]] = $object->getValues(array_keys($myrow));
+ $ret[$myrow[$this->handler->keyName]] = $object->toArray();
}
unset($object);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php 2012-10-03 04:31:55 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php 2012-10-05 10:58:19 UTC (rev 10196)
@@ -87,9 +87,9 @@
while ($myrow = $this->handler->db->fetchArray($result)) {
$object->assignVars($myrow);
if ($id_as_key) {
- $ret[$myrow[$this->handler->keyName]] = $object->getValues(array_keys($myrow));
+ $ret[$myrow[$this->handler->keyName]] = $object->toArray();
} else {
- $ret[] = $object->getValues(array_keys($myrow));
+ $ret[] = $object->toArray();
}
}
unset($object);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php 2012-10-03 04:31:55 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php 2012-10-05 10:58:19 UTC (rev 10196)
@@ -697,6 +697,11 @@
}
return $ret;
}
+
+ public function toArray()
+ {
+ return $this->getValues();
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-10-03 04:32:01
|
Revision: 10195
http://xoops.svn.sourceforge.net/xoops/?rev=10195&view=rev
Author: beckmi
Date: 2012-10-03 04:31:55 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
Fixing small bugs
Modified Paths:
--------------
XoopsModules/xoopsmembers/trunk/xoopsmembers/admin/admin_footer.php
XoopsModules/xoopsmembers/trunk/xoopsmembers/admin/menu.php
Modified: XoopsModules/xoopsmembers/trunk/xoopsmembers/admin/admin_footer.php
===================================================================
--- XoopsModules/xoopsmembers/trunk/xoopsmembers/admin/admin_footer.php 2012-09-26 12:51:23 UTC (rev 10194)
+++ XoopsModules/xoopsmembers/trunk/xoopsmembers/admin/admin_footer.php 2012-10-03 04:31:55 UTC (rev 10195)
@@ -1,29 +1,29 @@
-<?php
-/**
- * XoopsMembers module
- * Description: Category Admin file
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright:: The XOOPS Project (http://www.xoops.org)
- * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
- * @package:: xoopsmembers
- * @subpackage:: admin
- * @since:: 1.02
- * @author:: Mamba
- * @version:: $Id $
- **/
-
-echo "<div class='adminfooter'>\n"
- ." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
- ." </div>\n"
- ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
- ."</div>";
-
+<?php
+/**
+ * XoopsMembers module
+ * Description: Category Admin file
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project (http://www.xoops.org)
+ * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @package:: xoopsmembers
+ * @subpackage:: admin
+ * @since:: 1.02
+ * @author:: Mamba
+ * @version:: $Id $
+ **/
+
+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>";
+
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/xoopsmembers/trunk/xoopsmembers/admin/menu.php
===================================================================
--- XoopsModules/xoopsmembers/trunk/xoopsmembers/admin/menu.php 2012-09-26 12:51:23 UTC (rev 10194)
+++ XoopsModules/xoopsmembers/trunk/xoopsmembers/admin/menu.php 2012-10-03 04:31:55 UTC (rev 10195)
@@ -1,45 +1,49 @@
-<?php
-/**
- * Name: menu.php
- * Description: Menu for the Xoops Members Module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
- * @package:: xoopsmembers
- * @subpackage:: Xoops Members Adminisration
- * @since:: 1.02
- * @author:: John Neill
- * @version:: $Id: menu.php 8571 2011-12-26 22:51:57Z beckmi $
- */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-
-global $xoopsModule;
-$pathIcon32 = $xoopsModule->getInfo('icons32');
-$pathLanguage = $path . $xoopsModule->getInfo('dirmoduleadmin');
-
-
-if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
- $fileinc = $pathLanguage . '/language/english/main.php';
-}
-include_once $fileinc;
-
-
-$adminmenu = array();
-$i = 1;
-$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME;
-$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-
-$i++;
-$adminmenu[$i]["title"] = _AM_MODULEADMIN_ABOUT;
-$adminmenu[$i]["link"] = "admin/about.php";
+<?php
+/**
+ * Name: menu.php
+ * Description: Menu for the Xoops Members Module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @package:: xoopsmembers
+ * @subpackage:: Xoops Members Adminisration
+ * @since:: 1.02
+ * @author:: John Neill
+ * @version:: $Id: menu.php 8571 2011-12-26 22:51:57Z beckmi $
+ */
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
+$adminmenu = array();
+$i = 1;
+$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME;
+$adminmenu[$i]["link"] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+
+$i++;
+$adminmenu[$i]["title"] = _AM_MODULEADMIN_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ir...@us...> - 2012-09-26 12:51:35
|
Revision: 10194
http://xoops.svn.sourceforge.net/xoops/?rev=10194&view=rev
Author: irmtfan
Date: 2012-09-26 12:51:23 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
bug fix: move semicolon, javascript:history.go(-1), redirect header for admin report, topic_lock, rating enable, inneHTML for non img Tags
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/action.post.php
XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_report.php
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt
XoopsModules/newbb/branches/irmtfan/newbb/index.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
XoopsModules/newbb/branches/irmtfan/newbb/polls.php
XoopsModules/newbb/branches/irmtfan/newbb/post.php
XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/english/newbb_toggle.js
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/votepolls.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/action.post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/action.post.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/action.post.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -20,7 +20,8 @@
$mode = !empty($_GET['mode']) ? intval($_GET['mode']) : 1;
if ( empty($post_id) || empty($op)) {
- redirect_header("javascript:history.go(-1);", 2, _MD_NORIGHTTOACCESS);
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_NORIGHTTOACCESS);
exit();
}
Modified: XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -18,7 +18,8 @@
if ( empty($topic_id) || empty($op)) {
- redirect_header("javascript:history.go(-1);", 2, _MD_NORIGHTTOACCESS);
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_NORIGHTTOACCESS);
exit();
}
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_report.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_report.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_report.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -43,6 +43,9 @@
switch ($op) {
case "save":
$report_ids = $_POST['report_id'];
+ // irmtfan add error redirect header
+ if (empty($report_ids))
+ redirect_header( "admin_report.php?item={$item}" . (empty($start) ? "" : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
$report_memos = isset($_POST['report_memo']) ? $_POST['report_memo'] : array();
foreach ($report_ids as $rid => $value) {
if (!$value) continue;
@@ -51,19 +54,24 @@
$report_obj->setVar("report_memo", $report_memos[$rid]);
$report_handler->insert($report_obj);
}
- redirect_header( "admin_report.php?item={$item}" . (empty($start) ? "" : "&start={$start}"), 1);
+ // irmtfan add message
+ redirect_header( "admin_report.php?item={$item}" . (empty($start) ? "" : "&start={$start}"), 1, _AM_NEWBB_REPORTSAVE);
break;
case "delete":
$report_ids = $_POST['report_id'];
+ // irmtfan add error redirect header
+ if (empty($report_ids))
+ redirect_header( "admin_report.php?item={$item}" . (empty($start) ? "" : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
foreach ($report_ids as $rid => $value) {
if (!$value) continue;
if ($report_obj = $report_handler->get($rid)) {
$report_handler->delete($report_obj);
}
}
- redirect_header( "admin_report.php?item={$item}" . (empty($start) ? "" : "&start={$start}"), 1);
+ // irmtfan add message
+ redirect_header( "admin_report.php?item={$item}" . (empty($start) ? "" : "&start={$start}"), 1, _AM_NEWBB_REPORTDELETE);
break;
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-26 12:51:23 UTC (rev 10194)
@@ -1,3 +1,25 @@
+date 2012-09-26
+===================================
+1- bug fix: move semicolon from php files to template files. 'block;' => 'block' AND 'none;' => 'none'
+in newbb/index.php, newbb/viewtopic.php, newbb/templates/newbb_thread.html, newbb/templates/newbb_viewtopic.html, newbb/templates/newbb_index.html
+
+2- bug fix: Issue with javascript in redirect_header javascript:history.go(-1)
+in newbb/action.post.php, newbb/action.topic.php, newbb/polls.php, newbb/post.php, newbb/ratethread.php, newbb/topicmanager.php, newbb/votepolls.php
+
+3- bug fix: add messages for redirect_header
+in newbb/post.php, newbb/votepolls.php, newbb/admin/admin_report.php, newbb/language/english/main.php, newbb/language/english/admin.php, newbb/docs/lang_diff.txt
+
+4- fix and improve: add redirect header when no report is selected in admin_report.php in submit.
+newbb/admin/admin_report.php, newbb/language/english/admin.php, newbb/docs/lang_diff.txt
+
+5- bug fix: user dont see "the topic is locked" if the show_reg was set to 0. revise forum_post_or_register smarty and assign 3 new smraty variables: forum_post, forum_register, topic_lock
+in newbb/viewtopic.php
+
+6- bug fix: user can see rating when he dont have permission to post and/or reply.
+in newbb/viewtopic.php, newbb/templates/newbb_viewtopic.html
+
+7- bug fix: innerHTML change only if the TAG is not img.
+
date 2012-09-25
===================================
1- bug fix: change the method of adding stylesheet and scripts from overrighting xoops_module_header smarty variable to $xoTheme.
Modified: XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt 2012-09-26 12:51:23 UTC (rev 10194)
@@ -50,3 +50,11 @@
define('_MD_RESTORETOPIC','Restore this topic');
define('_MD_TOPICRESTORE','The topic has been restored.');
define('_MD_DESC_RESTORE','Once you press the restore button at the bottom of this form the topic you have selected, and all its related posts, will be restored.');
+
+define('_MD_POLL_NOOPTION','You must choose an option !!');
+
+admin.php
+---------
+define('_AM_NEWBB_REPORTSAVE','Selected Reports have been processed successfully');
+define('_AM_NEWBB_REPORTDELETE','Selected Reports have been deleted from database successfully');
+define('_AM_NEWBB_REPORTNOTSELECT','No Report is selected!');
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/index.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/index.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/index.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -158,11 +158,11 @@
$expand = (count($toggles) > 0) ? ( (in_array($cat_element_id, $toggles)) ? false : true ) : true;
// START irmtfan to improve newbb_displayImage
if ($expand) {
- $cat_display = 'block;';
+ $cat_display = 'block'; //irmtfan move semicolon
$cat_icon_display = "minus";
$cat_alt = _MD_NEWBB_HIDE;
} else {
- $cat_display = 'none;';
+ $cat_display = 'none'; //irmtfan move semicolon
$cat_icon_display = "plus";
$cat_alt = _MD_NEWBB_SEE;
}
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -297,4 +297,8 @@
define('_AM_NEWBB_UPLOAD','max. Upload each file :');
define('_AM_NEWBB_MEMLIMITTOLARGE','Attention! Value \'memory_limit\' to PHP.INI less than \'post_max_size\'');
define('_AM_NEWBB_MEMLIMITOK','Files can be uploaded with a maximum of %s.');
+// irmtfan add messages
+define('_AM_NEWBB_REPORTSAVE','Selected Reports have been processed successfully');
+define('_AM_NEWBB_REPORTDELETE','Selected Reports have been deleted from database successfully');
+define('_AM_NEWBB_REPORTNOTSELECT','No Report is selected!');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -491,7 +491,10 @@
define('_MD_NEWBB_MAXUPLOADFILEINI','The uploaded file exceeds the upload_max_filesize directive in php.ini.');
define('_MD_NEWBB_MAXPIC','Images at the max. Size %s X %s pixels.');
define('_MD_NEWBB_SEARCHDISABLED','The search is disabled and can not be used.');
+// irmtfan added messages
define('_MD_NEWBB_HIDEUSERDATA','Hide User information');
define('_MD_NEWBB_HIDE','Hide');
define('_MD_NEWBB_SEE','See');
+// votepolls.php - irmtfan
+define('_MD_POLL_NOOPTION','You must choose an option !!');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -230,14 +230,17 @@
define('_AM_NEWBB_AUTHOR_WORD_EXTRA',"سخنان بیشتری از موسس ماژول");
// admin_report.php
-define("_AM_NEWBB_REPORTADMIN","مدیریت پیام های گزارش شده");
-define("_AM_NEWBB_PROCESSEDREPORT","دیدن پاسخ ارسال شده توسط ناظر به گزارش فرستاده شده");
-define("_AM_NEWBB_PROCESSREPORT","گزارش های ارسال شده");
+define("_AM_NEWBB_REPORTADMIN","مدیریت گزارش های ارسالی در خصوص پست ها");
+define("_AM_NEWBB_PROCESSEDREPORT","دیدن گزارش های های پاسخ داده شده");
+define("_AM_NEWBB_PROCESSREPORT","دیدن گزارش های پاسخ داده نشده و نیازمند رسیدگی");
define("_AM_NEWBB_REPORTTITLE","عنوان گزارش");
define("_AM_NEWBB_REPORTEXTRA","بخش اضافی");
-define("_AM_NEWBB_REPORTPOST","پیام گزارش شده");
+define("_AM_NEWBB_REPORTPOST","پستی که گزارش شده");
define("_AM_NEWBB_REPORTTEXT","متن گزارش ارسال شده");
-define("_AM_NEWBB_REPORTMEMO","Process memo");
+define("_AM_NEWBB_REPORTMEMO","پاسخ داده شده به گزارش ارسال شده");
+define('_AM_NEWBB_REPORTSAVE','گزارش های انتخاب شده رسیدگی شدند.');
+define('_AM_NEWBB_REPORTDELETE','گزارش های انتخاب شده از پایگاه داده ها حذف شدند.');
+define('_AM_NEWBB_REPORTNOTSELECT','هیچ گزارشی انتخاب نشده است!');
// admin_report.php
define("_AM_NEWBB_DIGESTADMIN","مدیریت خلاصه ها");
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -493,4 +493,6 @@
define('_MD_NEWBB_HIDEUSERDATA','مخفی کردن اطلاعات کاربر');
define('_MD_NEWBB_HIDE','مخفی کردن');
define('_MD_NEWBB_SEE','نمایش');
+// votepolls.php - irmtfan
+define('_MD_POLL_NOOPTION','شما باید یکی از گزینه ها را انتخاب کنید!!');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/polls.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/polls.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/polls.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -53,7 +53,8 @@
}
else
{
- redirect_header("javascript:history.go(-1);", 2, _MD_POLLMODULE_ERROR);
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_POLLMODULE_ERROR);
exit();
}
// irmtfan correct the way and typo=addmor -> addmore
@@ -68,7 +69,8 @@
if (!isset($module_handler)) $module_handler =& xoops_gethandler('module');
$xoopspoll =& $module_handler->getByDirname($pollmodules);
if (!is_object($xoopspoll) || !$xoopspoll->getVar('isactive')) {
- redirect_header("javascript:history.go(-1);", 2, _MD_POLLMODULE_ERROR);
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_POLLMODULE_ERROR);
exit();
}
@@ -170,7 +172,8 @@
*/
$option_empty = true;
if (empty($_POST['option_text'])) {
- redirect_header("javascript:history.go(-1);", 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
}
$option_text = $_POST['option_text'];
foreach ( $option_text as $optxt ) {
@@ -180,7 +183,8 @@
}
}
if ($option_empty) {
- redirect_header("javascript:history.go(-1);", 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
}
if ( $pollmodules == 'xoopspoll')
$poll = new XoopsPoll();
@@ -319,7 +323,8 @@
if ( $op == "update" ) {
$option_empty = true;
if (empty($_POST['option_text'])) {
- redirect_header("javascript:history.go(-1);", 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
}
$option_text = $_POST['option_text'];
foreach ( $option_text as $optxt ) {
@@ -328,7 +333,8 @@
break;
}
}
- if ($option_empty) redirect_header("javascript:history.go(-1);", 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
+ // irmtfan - issue with javascript:history.go(-1)
+ if ($option_empty) redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
if ( $pollmodules == 'xoopspoll')
$poll = new XoopsPoll($poll_id);
@@ -439,7 +445,8 @@
if ( $op == "savemore" ) {
$option_empty = true;
if (empty($_POST['option_text'])) {
- redirect_header("javascript:history.go(-1);", 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
}
$option_text = $_POST['option_text'];
foreach ( $option_text as $optxt ) {
@@ -448,7 +455,8 @@
break;
}
}
- if ($option_empty) redirect_header("javascript:history.go(-1);", 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
+ // irmtfan - issue with javascript:history.go(-1)
+ if ($option_empty) redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_ERROROCCURED . ': ' . _MD_POLL_POLLOPTIONS . ' !');
if ( $pollmodules == 'xoopspoll')
$poll = new XoopsPoll($poll_id);
Modified: XoopsModules/newbb/branches/irmtfan/newbb/post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -130,7 +130,8 @@
if ( !empty($_POST['contents_submit']) ) {
$message = $_POST['message'];
if (empty($message)) {
- redirect_header("javascript:history.go(-1);", 1);
+ // irmtfan - issue with javascript:history.go(-1) - add error message
+ redirect_header($_SERVER['HTTP_REFERER'], 1, _MD_ERROR_BACK);
exit();
}
if ( !empty($isedit) && $post_id > 0 ) {
Modified: XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -44,7 +44,9 @@
&&
!$topic_handler->getPermission($topic_obj->getVar("forum_id"), $topic_obj->getVar('topic_status'), "reply")
) {
- redirect_header("javascript:history.go(-1);", 2, _NOPERM);
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _NOPERM);
+ exit();
}
if (empty($rate)) {
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/english/newbb_toggle.js
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/english/newbb_toggle.js 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/english/newbb_toggle.js 2012-09-26 12:51:23 UTC (rev 10194)
@@ -1,67 +1,4 @@
-function ToggleBlock(block, icon)
-{
- if (document.getElementById)
- {
- if (document.getElementById(block).style.display == 'block')
- {
- document.getElementById(block).style.display = 'none';
- SaveCollapsed(block, true);
- }
- else
- {
- document.getElementById(block).style.display = 'block';
- SaveCollapsed(block, false);
- }
- }
- else if (document.all)
- {
- if (document.all[block].style.display == 'block')
- {
- document.all[block].style.display = 'none';
- SaveCollapsed(block, true);
- }
- else
- {
- document.all[block].style.display = 'block';
- SaveCollapsed(block, false);
- }
- }
-}
-
-function ToggleBlock2(block, icon)
-{
- if (document.getElementById)
- {
- if (document.getElementById(block).style.display == 'block')
- {
- document.getElementById(block).style.display = 'none';
- icon.src = 'images/plus.png';
- SaveCollapsed(block, true);
- }
- else
- {
- document.getElementById(block).style.display = 'block';
- icon.src = 'images/minus.png';
- SaveCollapsed(block, false);
- }
- }
- else if (document.all)
- {
- if (document.all[block].style.display == 'block')
- {
- document.all[block].style.display = 'none';
- icon.src = 'images/plus.png';
- SaveCollapsed(block, true);
- }
- else
- {
- document.all[block].style.display = 'block';
- icon.src = 'images/minus.png';
- SaveCollapsed(block, false);
- }
- }
-}
-// START irmtfan - improve: add alt, title, id and innerHTML - recognize a IMG tag for src
+// START irmtfan - improve: add alt, title, id and innerHTML - recognize a IMG tag for src - innerHTML for non img TAGs
function ToggleBlockCategory(block, icon, src_expand, src_collapse, alt_expand, alt_collapse)
{
var Img_tag='IMG';
@@ -112,7 +49,9 @@
}
}
icon.title = icon.alt;
- icon.innerHTML=icon.alt; // to support IE7&8 use innerHTML istead of textContent
+ if (icon.nodeName != Img_tag) {
+ icon.innerHTML=icon.alt; // to support IE7&8 use innerHTML istead of textContent
+ }
}
// source: http://stackoverflow.com/questions/1991608/find-base-name-in-url-in-javascript
function findBaseName(url) {
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_index.html 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_index.html 2012-09-26 12:51:23 UTC (rev 10194)
@@ -65,8 +65,8 @@
<{/if}>
</tr>
</table>
-
- <div id="<{$category.cat_element_id}>" style="display: <{$category.cat_display}>">
+ <!-- irmtfan move semicolon -->
+ <div id="<{$category.cat_element_id}>" style="display: <{$category.cat_display}>;">
<table border="0" cellspacing="2" cellpadding="0" width="100%">
<{if $category.forums}>
<tr class="head" align="center">
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html 2012-09-26 12:51:23 UTC (rev 10194)
@@ -48,7 +48,8 @@
<span class="pointer" onclick="ToggleBlockCategory('<{$topic_post.post_id}>',(this.firstElementChild || this.children[0]) , '<{$infobox.icon.expand}>', '<{$infobox.icon.collapse}>','<{$smarty.const._MD_NEWBB_HIDEUSERDATA}>','<{$smarty.const._MD_NEWBB_SEEUSERDATA}>')">
<{$infobox.displayImage}>
</span>
- <div id="<{$topic_post.post_id}>" style="display: <{$infobox.style}>" >
+ <!-- irmtfan move semicolon -->
+ <div id="<{$topic_post.post_id}>" style="display: <{$infobox.style}>;" >
<div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_JOINED}>:</span><br /><{$topic_post.poster.regdate}></div>
<{if $topic_post.poster.from}>
<div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_FROM}></span> <{$topic_post.poster.from}></div>
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-26 12:51:23 UTC (rev 10194)
@@ -124,8 +124,8 @@
<{/foreach}>
<{/if}>
</select>
-
- <{if $rating_enable}>
+ <!-- irmtfan user should not see rating if he dont have permission -->
+ <{if $rating_enable && $forum_post && $forum_reply}>
<select
name="rate" id="rate"
onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
@@ -226,7 +226,8 @@
</a>
</div>
<br />
- <div id="qr" style="display: <{$quickreply.style}>">
+ <!-- irmtfan move semicolon -->
+ <div id="qr" style="display: <{$quickreply.style}>;">
<div><{$quickreply.form}></div>
</div>
<br />
Modified: XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -221,7 +221,8 @@
// irmtfan full URL
echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id=$topic_id&forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} else {
- redirect_header("javascript:history.go(-1)",2,_MD_ERRORFORUM);
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'],2,_MD_ERRORFORUM);
}
} else {
$topic_id = $topic_id[0];
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -149,11 +149,11 @@
"collapse" => $icon_handler->getImageSource("more"))
;
if($infobox['show'] == 1){
- $infobox['style']='none;';
+ $infobox['style']='none'; //irmtfan move semicolon
$infobox['alt'] = _MD_NEWBB_SEEUSERDATA;
$infobox['src']="more";
} else {
- $infobox['style']='block;';
+ $infobox['style']='block'; //irmtfan move semicolon
$infobox['alt'] = _MD_NEWBB_HIDEUSERDATA;
$infobox['src']="less";
}
@@ -183,18 +183,22 @@
$t_new = newbb_displayImage('t_new', _MD_POSTNEW);
$t_reply = newbb_displayImage('t_reply', _MD_REPLY);
-
+// irmtfan show topic status if show reg is 0 and revise forum_post_or_register
if ($topic_handler->getPermission($forum_obj, $topic_obj->getVar('topic_status'), "post")) {
- $xoopsTpl->assign('forum_post_or_register', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname", "n")."/newtopic.php?forum=".$forum_id."\">".$t_new."</a>");
-} elseif ( !empty($GLOBALS["xoopsModuleConfig"]["show_reg"]) ) {
+ $xoopsTpl->assign('forum_post', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname", "n")."/newtopic.php?forum=".$forum_id."\">".$t_new."</a>");
+} else {
if ($topic_obj->getVar('topic_status')) {
- $xoopsTpl->assign('forum_post_or_register', _MD_TOPICLOCKED);
- } elseif ( !is_object($xoopsUser)) {
- $xoopsTpl->assign('forum_post_or_register', '<a href="'.XOOPS_URL.'/user.php?xoops_redirect='.htmlspecialchars($xoopsRequestUri).'">'._MD_REGTOPOST.'</a>');
+ $xoopsTpl->assign('topic_lock', _MD_TOPICLOCKED);
+ }
+ if (!empty($GLOBALS["xoopsModuleConfig"]["show_reg"]) && !is_object($xoopsUser)) {
+ $xoopsTpl->assign('forum_register', '<a href="'.XOOPS_URL.'/user.php?xoops_redirect='.htmlspecialchars($xoopsRequestUri).'">'._MD_REGTOPOST.'</a>');
}
-} else {
- $xoopsTpl->assign('forum_post_or_register', '');
}
+// irmtfan for backward compatibility assign forum_post_or_register smarty again.
+$xoopsTpl->assign('forum_post_or_register',@$xoopsTpl->get_template_vars("forum_post") .
+ @$xoopsTpl->get_template_vars("forum_register") .
+ @$xoopsTpl->get_template_vars("topic_lock"));
+
if ($topic_handler->getPermission($forum_obj, $topic_obj->getVar('topic_status'), "reply")) {
$xoopsTpl->assign('forum_reply', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname", "n")."/reply.php?topic_id=".$topic_id."\">".$t_reply."</a>");
}
@@ -672,11 +676,11 @@
$quickreply['show'] = 1; // = !empty($xoopsModuleConfig['quickreply_enabled']
$quickreply['expand'] = (count($toggles) > 0) ? ( (in_array('qr', $toggles)) ? false : true ) : true;
if ($quickreply['expand']) {
- $quickreply['style'] = 'block;';
+ $quickreply['style'] = 'block'; //irmtfan move semicolon
$quickreply_icon_display = $qr_expand;
$quickreply_alt = _MD_NEWBB_HIDE.' '._MD_QUICKREPLY;
} else {
- $quickreply['style'] = 'none;';
+ $quickreply['style'] = 'none'; //irmtfan move semicolon
$quickreply_icon_display = $qr_collapse;
$quickreply_alt = _MD_NEWBB_SEE.' '._MD_QUICKREPLY;
}
Modified: XoopsModules/newbb/branches/irmtfan/newbb/votepolls.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/votepolls.php 2012-09-26 12:04:53 UTC (rev 10193)
+++ XoopsModules/newbb/branches/irmtfan/newbb/votepolls.php 2012-09-26 12:51:23 UTC (rev 10194)
@@ -72,7 +72,8 @@
$topic_handler =& xoops_getmodulehandler('topic', 'newbb');
$topic_obj =& $topic_handler->get($topic_id);
if (!$topic_handler->getPermission($topic_obj->getVar("forum_id"), $topic_obj->getVar('topic_status'), "vote")) {
- redirect_header("javascript:history.go(-1);", 2, _NOPERM);
+ // irmtfan - issue with javascript:history.go(-1)
+ redirect_header($_SERVER['HTTP_REFERER'], 2, _NOPERM);
}
if ( !empty($_POST['option_id']) ) {
@@ -128,5 +129,6 @@
redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&forum=$forum&poll_id=$poll_id&pollresult=1", 1, $msg);
exit();
}
-redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&forum=$forum", 1, "You must choose an option !!");
-?>
+// irmtfan - add error message
+redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&forum=$forum", 1, _MD_POLL_NOOPTION);
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-09-26 12:05:02
|
Revision: 10193
http://xoops.svn.sourceforge.net/xoops/?rev=10193&view=rev
Author: voltan1
Date: 2012-09-26 12:04:53 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Fix style
Modified Paths:
--------------
XoopsModules/slideshow/trunk/slideshow/css/slideshow/scrollable.css
Modified: XoopsModules/slideshow/trunk/slideshow/css/slideshow/scrollable.css
===================================================================
--- XoopsModules/slideshow/trunk/slideshow/css/slideshow/scrollable.css 2012-09-26 11:50:53 UTC (rev 10192)
+++ XoopsModules/slideshow/trunk/slideshow/css/slideshow/scrollable.css 2012-09-26 12:04:53 UTC (rev 10193)
@@ -0,0 +1,108 @@
+.slider {
+ /* width: 650px;
+ height: 260px; */
+ margin: 0 auto;
+}
+.slider .navi {
+ width: 100%;
+ height: 20px;
+}
+
+.slider .navi a {
+ width: 8px;
+ height: 8px;
+ float: left;
+ margin: 3px;
+ background: #525572;
+ display: block;
+ font-size: 1px;
+ text-align: center;
+ border-radius: 6px;
+ -moz-border-radius: 10px;
+ -khtml-border-radius: 6px;
+}
+
+.slider .navi a: hover {
+ background: #F3F3F3;
+}
+
+.slider .navi a.active {
+ background: #F3F3F3;
+}
+
+.slider .main {
+ position: relative;
+ overflow: hidden;
+ /* height: 260px; */
+}
+
+.slider .pages {
+ position: absolute;
+}
+
+.slider .page {
+ /* height: 260px;
+ width: 650px; */
+}
+
+.slider .scrollable {
+ position: relative;
+ overflow: hidden;
+ /* width: 650px;
+ height: 230px; */
+}
+
+.slider .scrollable .items {
+ width: 20000em;
+ position: absolute;
+ clear: both;
+}
+
+.slider .item {
+ float: right;
+ cursor: pointer;
+ /* width: 650px;
+ height: 230px; */
+ padding: 0;
+}
+
+.slider .item .itemleft {
+ float: left;
+ width: 49%;
+}
+
+.slider .item .itemright {
+ float: right;
+ width: 49%;
+ padding-top: 20px;
+ color: #000;
+}
+
+.slider .item h2 {
+ text-align: center;
+ padding: 2px;
+}
+
+.slider .item .itemshort {
+
+}
+
+.slider .item .itemmore {
+ margin: 20px 50px 10px 50px;
+ background-color: #ff0000;
+ width: 80px;
+ text-align: center;
+ float: right;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+.slider .item .itemmore a {
+ color: #fff;
+ font-weight: bold;
+}
+
+.slider .item .itemmore a:hover {
+ color: #000;
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-09-26 11:51:02
|
Revision: 10192
http://xoops.svn.sourceforge.net/xoops/?rev=10192&view=rev
Author: voltan1
Date: 2012-09-26 11:50:53 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Fix some bugs
Modified Paths:
--------------
XoopsModules/slideshow/trunk/slideshow/admin/backend.php
XoopsModules/slideshow/trunk/slideshow/class/item.php
XoopsModules/slideshow/trunk/slideshow/xoops_version.php
Modified: XoopsModules/slideshow/trunk/slideshow/admin/backend.php
===================================================================
--- XoopsModules/slideshow/trunk/slideshow/admin/backend.php 2012-09-26 09:52:13 UTC (rev 10191)
+++ XoopsModules/slideshow/trunk/slideshow/admin/backend.php 2012-09-26 11:50:53 UTC (rev 10192)
@@ -84,13 +84,12 @@
case 'additem' :
$obj = $item_handler->create ();
- $obj->setVars ( $_REQUEST );
+ $obj->setVars ( $_POST );
$obj->setVar ( 'item_create', time () );
$obj->setVar ( 'item_order', $item_handler->setitemorder() );
- $item_handler->uploadimg ( $obj, $_REQUEST ['item_img'] );
- $item_handler->uploadthumb ( $obj, $_REQUEST ['item_thumb'] );
-
- if($_REQUEST['item_default'] == 1) {
+ $obj->setVar ( 'item_img', $item_handler->uploadimg ( $_POST ['item_img'] ) );
+ $obj->setVar ( 'item_thumb', $item_handler->uploadthumb ( $_POST ['item_thumb'] ) );
+ if($_POST['item_default'] == 1) {
$item_handler->updateAll ( 'item_default', 0, $obj );
}
@@ -111,14 +110,10 @@
if ($item_id > 0) {
$obj = $item_handler->get ($item_id);
$obj->setVars ( $_REQUEST );
-
$obj->setVar ( 'item_order', $item_handler->setitemorder() );
- $item_handler->uploadimg ( $obj, $_REQUEST ['item_img'] );
-
if($_REQUEST['item_default'] == 1) {
$item_handler->updateAll ( 'item_default', 0, $obj );
}
-
if (! $item_handler->insert ( $obj )) {
redirect_header ( 'onclick="javascript:history.go(-1);"', 1, _AM_SLIDESHOW_MSG_ERROR );
xoops_cp_footer ();
Modified: XoopsModules/slideshow/trunk/slideshow/class/item.php
===================================================================
--- XoopsModules/slideshow/trunk/slideshow/class/item.php 2012-09-26 09:52:13 UTC (rev 10191)
+++ XoopsModules/slideshow/trunk/slideshow/class/item.php 2012-09-26 11:50:53 UTC (rev 10192)
@@ -110,14 +110,18 @@
$imgdir = '/uploads/slideshow/image/';
$fileseltray_item_img = new XoopsFormElementTray ( _AM_SLIDESHOW_ITEM_IMG, '<br />' );
$fileseltray_item_img->addElement ( new XoopsFormLabel ( '', "<img style='max-width: 500px; max-height: 500px;' src='" . XOOPS_URL . $imgdir . $item_img . "' name='image_item' id='image_item' alt='' />" ) );
- $fileseltray_item_img->addElement ( new XoopsFormFile ( _AM_SLIDESHOW_ITEM_FORMUPLOAD, 'item_img', xoops_getModuleOption ( 'img_size', 'slideshow' ) ), false );
+ if ($this->isNew ()) {
+ $fileseltray_item_img->addElement ( new XoopsFormFile ( _AM_SLIDESHOW_ITEM_FORMUPLOAD, 'item_img', xoops_getModuleOption ( 'img_size', 'slideshow' ) ), false );
+ }
$form->addElement ( $fileseltray_item_img );
// thumb
$item_thumb = $this->getVar ( 'item_thumb' ) ? $this->getVar ( 'item_thumb' ) : 'blank.gif';
$thumbdir = '/uploads/slideshow/thumb/';
$fileseltray_item_thumb = new XoopsFormElementTray ( _AM_SLIDESHOW_ITEM_THUMB, '<br />' );
- $fileseltray_item_thumb->addElement ( new XoopsFormLabel ( '', "<img style='max-width: 200px; max-height: 200px;' src='" . XOOPS_URL . $thumbdir . $thumb_img . "' name='image_item' id='image_item' alt='' />" ) );
- $fileseltray_item_thumb->addElement ( new XoopsFormFile ( _AM_SLIDESHOW_ITEM_FORMUPLOAD, 'item_thumb', xoops_getModuleOption ( 'img_size', 'slideshow' ) ), false );
+ $fileseltray_item_thumb->addElement ( new XoopsFormLabel ( '', "<img style='max-width: 200px; max-height: 200px;' src='" . XOOPS_URL . $thumbdir . $item_thumb . "' name='image_item' id='image_item' alt='' />" ) );
+ if ($this->isNew ()) {
+ $fileseltray_item_thumb->addElement ( new XoopsFormFile ( _AM_SLIDESHOW_ITEM_FORMUPLOAD, 'item_thumb', xoops_getModuleOption ( 'img_size', 'slideshow' ) ), false );
+ }
$form->addElement ( $fileseltray_item_thumb );
// Button
$button_tray = new XoopsFormElementTray ( '', '' );
@@ -159,7 +163,7 @@
return $order;
}
- public function uploadimg($obj, $image) {
+ public function uploadimg($image) {
include_once XOOPS_ROOT_PATH . "/class/uploader.php";
$uploader_img = new XoopsMediaUploader (
XOOPS_ROOT_PATH . '/uploads/slideshow/image/',
@@ -169,48 +173,48 @@
xoops_getModuleOption ( 'img_maxheight', 'slideshow' )
);
if ($uploader_img->fetchMedia ( 'item_img' )) {
- $uploader_img->setPrefix ( 'slideshow_' );
- $uploader_img->fetchMedia ( 'item_img' );
- if (! $uploader_img->upload ()) {
- $errors = $uploader_img->getErrors ();
- fmcontent_Redirect ( "javascript:history.go(-1)", 3, $errors );
- xoops_cp_footer ();
- exit ();
- } else {
- $obj->setVar ( 'item_img', $uploader_img->getSavedFileName () );
- }
+ $uploader_img->setPrefix ( 'slideshow_' );
+ $uploader_img->fetchMedia ( 'item_img' );
+ if (! $uploader_img->upload ()) {
+ redirect_header ( 'slideshow.php?op=new_item', 1, $uploader_img->getErrors ());
+ xoops_cp_footer ();
+ exit ();
+ } else {
+ return $uploader_img->getSavedFileName ();
+ }
} else {
- if (isset ( $image )) {
- $obj->setVar ( 'item_img', $image );
- }
+ if (isset ( $image )) {
+ return $image;
+ }
}
+ return '';
}
public function uploadthumb($obj, $thumb) {
include_once XOOPS_ROOT_PATH . "/class/uploader.php";
- $uploader_thumb = new XoopsMediaUploader (
+ $uploader_img = new XoopsMediaUploader (
XOOPS_ROOT_PATH . '/uploads/slideshow/thumb/',
xoops_getModuleOption ( 'img_mime', 'slideshow' ),
xoops_getModuleOption ( 'img_size', 'slideshow' ),
xoops_getModuleOption ( 'img_maxwidth', 'slideshow' ),
xoops_getModuleOption ( 'img_maxheight', 'slideshow' )
);
- if ($uploader_thumb->fetchMedia ( 'item_thumb' )) {
- $uploader_thumb->setPrefix ( 'slideshow_' );
- $uploader_thumb->fetchMedia ( 'item_thumb' );
- if (! $uploader_thumb->upload ()) {
- $errors = $uploader_thumb->getErrors ();
- fmcontent_Redirect ( "javascript:history.go(-1)", 3, $errors );
- xoops_cp_footer ();
- exit ();
- } else {
- $obj->setVar ( 'item_thumb', $uploader_thumb->getSavedFileName () );
- }
+ if ($uploader_img->fetchMedia ( 'item_thumb' )) {
+ $uploader_img->setPrefix ( 'slideshow_' );
+ $uploader_img->fetchMedia ( 'item_thumb' );
+ if (! $uploader_img->upload ()) {
+ redirect_header ( 'slideshow.php?op=new_item', 1, $uploader_img->getErrors ());
+ xoops_cp_footer ();
+ exit ();
+ } else {
+ return $uploader_img->getSavedFileName ();
+ }
} else {
- if (isset ( $thumb )) {
- $obj->setVar ( 'item_thumb', $thumb );
- }
+ if (isset ( $image )) {
+ return $image;
+ }
}
+ return '';
}
public function itemSAdminList($info) {
Modified: XoopsModules/slideshow/trunk/slideshow/xoops_version.php
===================================================================
--- XoopsModules/slideshow/trunk/slideshow/xoops_version.php 2012-09-26 09:52:13 UTC (rev 10191)
+++ XoopsModules/slideshow/trunk/slideshow/xoops_version.php 2012-09-26 11:50:53 UTC (rev 10192)
@@ -120,7 +120,7 @@
'description' => '_MI_SLIDESHOW_IMAGE_MAXWIDTH_DESC',
'formtype' => 'textbox',
'valuetype' => 'text',
- 'default' => '700');
+ 'default' => '1200');
$modversion['config'][] = array(
'name' => 'img_maxheight',
@@ -128,5 +128,5 @@
'description' => '_MI_SLIDESHOW_IMAGE_MAXHEIGHT_DESC',
'formtype' => 'textbox',
'valuetype' => 'text',
- 'default' => '700');
+ 'default' => '1200');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-09-26 09:52:25
|
Revision: 10191
http://xoops.svn.sourceforge.net/xoops/?rev=10191&view=rev
Author: beckmi
Date: 2012-09-26 09:52:13 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Small English corrections
Modified Paths:
--------------
XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php
XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
XoopsModules/contact/branches/voltan/v1.8/contact/header.php
XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php
XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php
XoopsModules/contact/branches/voltan/v1.8/contact/index.php
XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php
XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/about.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,22 +14,22 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
- */
-
-// Call header
+ */
+
+// Call header
require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
xoops_cp_header();
$xoopsTpl->assign('navigation', $admin_class->addNavigation('about.php'));
-$xoopsTpl->assign('renderabout', $admin_class->renderabout('6KJ7RW5DR3VTJ', false));
+$xoopsTpl->assign('renderabout', $admin_class->renderabout('6KJ7RW5DR3VTJ', false));
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
+// Call footer
require dirname(__FILE__) . '/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,77 +14,77 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
- */
-
-// Call header
+ */
+
+// Call header
require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
xoops_cp_header();
// Define default value
$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
$contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int');
-// Define scripts
-$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+// Define scripts
+$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
-// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
+// Add module stylesheet
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-switch ($op)
+switch ($op)
{
case 'list':
$contact = array();
- $contact['perpage'] = xoops_getModuleOption('admin_perpage','contact');
- $contact['order'] = 'DESC';
+ $contact['perpage'] = xoops_getModuleOption('admin_perpage','contact');
+ $contact['order'] = 'DESC';
$contact['sort'] = 'contact_id';
- // get limited information
- if (isset($_REQUEST['limit'])) {
- $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
- } else {
- $contact['limit'] = $contact['perpage'];
- }
-
- // get start information
- if (isset($_REQUEST['start'])) {
- $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
- } else {
- $contact['start'] = 0;
+ // get limited information
+ if (isset($_REQUEST['limit'])) {
+ $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
+ } else {
+ $contact['limit'] = $contact['perpage'];
+ }
+
+ // get start information
+ if (isset($_REQUEST['start'])) {
+ $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
+ } else {
+ $contact['start'] = 0;
}
$contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
$contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid');
- if ($contact_numrows > $contact['limit']) {
- $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
- $contact_pagenav = $contact_pagenav->renderNav(4);
- } else {
- $contact_pagenav = '';
+ if ($contact_numrows > $contact['limit']) {
+ $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+ $contact_pagenav = $contact_pagenav->renderNav(4);
+ } else {
+ $contact_pagenav = '';
}
- $xoopsTpl->assign('contacts', $contacts);
+ $xoopsTpl->assign('contacts', $contacts);
$xoopsTpl->assign('contact_pagenav', $contact_pagenav);
$level = 'list';
break;
case 'reply':
- if ($contact_id > 0) {
+ if ($contact_id > 0) {
$obj = $contact_handler->get($contact_id);
if($obj->getVar('contact_cid') != 0) {
redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY);
- }
+ }
$form = $obj->Contact_ReplyForm();
$xoopsTpl->assign('replyform', $form->render());
- $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
- } else {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+ } else {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
}
$level = 'reply';
break;
@@ -165,11 +165,11 @@
case 'delete':
if ($contact_id > 0) {
- // Prompt message
+ // Prompt message
xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
- } else {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- }
+ } else {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ }
$level = 'delete';
break;
@@ -201,8 +201,8 @@
$xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));
$xoopsTpl->assign('level', $level);
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
+// Call footer
require dirname(__FILE__) . '/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/footer.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/header.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,40 +14,40 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
*/
-
+
$path = dirname(dirname(dirname(dirname(__FILE__))));
-
-include_once $path . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+
+include_once $path . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-global $xoopsModule;
-
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+global $xoopsModule;
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
// Contact Handler
$contact_handler = & xoops_getModuleHandler ( 'contact', 'contact' );
-// Locad admin menu class
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-}else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+// Locad admin menu class
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+}else{
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
}
$admin_class = new ModuleAdmin();
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/index.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,25 +14,25 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
- */
-
-// Call header
+ */
+
+// Call header
require dirname(__FILE__) . '/header.php';
-// Display Admin header
-xoops_cp_header();
+// Display Admin header
+xoops_cp_header();
-// Display Admin menu class
+// Display Admin menu class
$admin_class->addInfoBox(_AM_CONTACT_INDEX_ADMENU1);
-$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_TOTAL, $contact_handler->Contact_GetCount('contact_cid'));
+$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_TOTAL, $contact_handler->Contact_GetCount('contact_cid'));
$xoopsTpl->assign('navigation', $admin_class->addNavigation('index.php'));
$xoopsTpl->assign('renderindex', $admin_class->renderIndex());
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
+// Call footer
require dirname(__FILE__) . '/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/menu.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,23 +1,23 @@
<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
- * @author Trabis <lus...@gm...>
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (aka Onokazu)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
@@ -40,12 +40,12 @@
$adminmenu[$i]["title"] = _MI_CONTACT_MENU_CONTACT;
$adminmenu[$i]["link"] = "admin/contact.php";
$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_CONTACT_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/content.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/content.png';
$i++;
$adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS;
$adminmenu[$i]["link"] = "admin/tools.php";
$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_TOOLS_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
$i++;
$adminmenu[$i]["title"] = _MI_CONTACT_MENU_ABOUT;
$adminmenu[$i]["link"] = "admin/about.php";
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/tools.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,20 +14,20 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
- */
-
-// Call header
+ */
+
+// Call header
require dirname(__FILE__) . '/header.php';
-// Display Admin header
+// Display Admin header
xoops_cp_header();
// Define default value
$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
-switch ($op)
+switch ($op)
{
case 'list':
// prune manager
@@ -54,8 +54,8 @@
}
$xoopsTpl->assign('navigation', $admin_class->addNavigation('tools.php'));
-// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
-// Call footer
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
+// Call footer
require dirname(__FILE__) . '/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/ajax.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/class/contact.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -14,7 +14,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/header.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/header.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/header.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/include/functions.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,10 +14,10 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
- */
+ */
?>
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/include/functions_update.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
@@ -47,7 +47,7 @@
) ENGINE=MyISAM;";
$db->query($sql);
}
-
+
}
?>
\ No newline at end of file
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/index.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/index.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/index.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
You may not change or alter any portion of this comment or credits
of supporting developers from this source code or any supporting source code
@@ -14,7 +14,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
@@ -32,8 +32,8 @@
switch($op) {
case 'form': default:
- $obj = $contact_handler->create();
- $form = $obj->Contact_ContactForm($department);
+ $obj = $contact_handler->create();
+ $form = $obj->Contact_ContactForm($department);
$xoopsTpl->assign('form', $form->render());
$xoopsTpl->assign('breadcrumb', '<a href="' . XOOPS_URL . '">' . _YOURHOME . '</a> » ' . $xoopsModule->name());
$xoopsTpl->assign('info', xoops_getModuleOption('contact_info','contact'));
@@ -47,11 +47,11 @@
} else {
// check captcha
- xoops_load("captcha");
- $xoopsCaptcha = XoopsCaptcha::getInstance();
- if ( !$xoopsCaptcha->verify() ) {
+ xoops_load("captcha");
+ $xoopsCaptcha = XoopsCaptcha::getInstance();
+ if ( !$xoopsCaptcha->verify() ) {
redirect_header ( "javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage() );
- exit();
+ exit();
}
// check email
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -4,15 +4,15 @@
// The name of this module
define("_MI_CONTACT_NAME","Contact Us");
-define("_MI_CONTACT_DESC","Email contact page");
+define("_MI_CONTACT_DESC","Contact module with email and DB storage");
// Admin menu
define('_MI_CONTACT_MENU_HOME',"Home");
define("_MI_CONTACT_MENU_HOME_DESC","Go back to Home");
define('_MI_CONTACT_MENU_CONTACT',"Messages");
define("_MI_CONTACT_MENU_CONTACT_DESC","List of Messages");
-define('_MI_CONTACT_MENU_TOOLS',"Tools");
-define("_MI_CONTACT_MENU_TOOLS_DESC","Module Tools");
+define('_MI_CONTACT_MENU_TOOLS',"Purge");
+define("_MI_CONTACT_MENU_TOOLS_DESC","Purge Tools");
define("_MI_CONTACT_MENU_ABOUT", "About");
define("_MI_CONTACT_MENU_ABOUT_DESC" , "About this module");
define("_MI_CONTACT_MENU_HELP","Help");
@@ -44,7 +44,7 @@
."dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be separated<br />"
."by a comma ',', and each department email combination must be separated by a pipe '|'");
-define("_MI_CONTACT_PERPAGE","Per page");
+define("_MI_CONTACT_PERPAGE","Messages per page");
define("_MI_CONTACT_PERPAGE_DESC","");
define("_MI_CONTACT_TOPINFO","Header contact form");
Modified: XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php 2012-09-25 06:31:40 UTC (rev 10190)
+++ XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php 2012-09-26 09:52:13 UTC (rev 10191)
@@ -14,7 +14,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (AKA Voltan)
+ * @author Kazumi Ono (aka Onokazu)
* @author Trabis <lus...@gm...>
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
@@ -30,8 +30,8 @@
$modversion['version'] = 1.8;
$modversion['description'] = _MI_CONTACT_DESC;
$modversion['credits'] = 'The XOOPS Project, Mohtava Project';
-$modversion['author'] = 'Kazumi Ono (Onokazu), modified by Trabis, rewrite by Voltan';
-$modversion['nickname'] = 'Kazumi Ono, Trabis, Voltan';
+$modversion['author'] = 'Kazumi Ono (Onokazu), modified by Trabis, rewritten by Voltan';
+$modversion['nickname'] = '';
$modversion['help'] = 'page=help';
$modversion['license'] = 'GNU GPL 2.0';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ir...@us...> - 2012-09-25 06:31:53
|
Revision: 10190
http://xoops.svn.sourceforge.net/xoops/?rev=10190&view=rev
Author: irmtfan
Date: 2012-09-25 06:31:40 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
bug fix: add footer.php to read style.css and js files from templates/css and templates/js and add to <head>, days changed to seconds
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/action.post.php
XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php
XoopsModules/newbb/branches/irmtfan/newbb/edit.php
XoopsModules/newbb/branches/irmtfan/newbb/header.php
XoopsModules/newbb/branches/irmtfan/newbb/index.php
XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/polls.php
XoopsModules/newbb/branches/irmtfan/newbb/post.php
XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php
XoopsModules/newbb/branches/irmtfan/newbb/reply.php
XoopsModules/newbb/branches/irmtfan/newbb/search.php
XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php
XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
Added Paths:
-----------
XoopsModules/newbb/branches/irmtfan/newbb/footer.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/style.css
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/style.css
XoopsModules/newbb/branches/irmtfan/newbb/templates/js/
XoopsModules/newbb/branches/irmtfan/newbb/templates/js/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/
XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/english/
XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/english/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/english/newbb_toggle.js
XoopsModules/newbb/branches/irmtfan/newbb/templates/js/language/index.html
Removed Paths:
-------------
XoopsModules/newbb/branches/irmtfan/newbb/include/js/
XoopsModules/newbb/branches/irmtfan/newbb/include/newbb.htc
XoopsModules/newbb/branches/irmtfan/newbb/include/pngbehavior.htc
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css
Modified: XoopsModules/newbb/branches/irmtfan/newbb/action.post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/action.post.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/action.post.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -207,6 +207,7 @@
} else {
redirect_header(XOOPS_URL."/modules/newbb/viewpost.php?uid=$uid", 2, _MD_DBUPDATED);
}
-
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -171,6 +171,7 @@
} else {
redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_DBUPDATED);
}
-
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -31,9 +31,9 @@
if (!defined('XOOPS_ROOT_PATH')) {
exit();
}
+// irmtfan use full path because block maybe used outside newbb
+include_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.ini.php";
-include_once dirname(dirname(__FILE__))."/include/functions.ini.php";
-
if (defined('NEWBB_BLOCK_DEFINED')) return;
define('NEWBB_BLOCK_DEFINED',true);
@@ -882,4 +882,6 @@
$tpl->assign('block', $block);
$tpl->display('db:newbb_block_author.html');
}
+// irmtfan add local stylesheet and js footer.php
+include_once XOOPS_ROOT_PATH . "/modules/newbb/footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-25 06:31:40 UTC (rev 10190)
@@ -1,3 +1,25 @@
+date 2012-09-25
+===================================
+1- bug fix: change the method of adding stylesheet and scripts from overrighting xoops_module_header smarty variable to $xoTheme.
+move codes from header.php to the new footer.php file. add local stylesheet and js for newbb blocks outside module space.
+modify:
+in newbb/action.post.php, newbb/action.topic.php, newbb/edit.php, newbb/header.php,
+newbb/index.php, newbb/list.topic.php, newbb/newtopic.php, newbb/polls.php,
+newbb/post.php, newbb/action.post.php, newbb/ratethread.php, newbb/reply.php
+newbb/search.php, newbb/topicmanager.php, newbb/viewforum.php, newbb/viewpost.php, newbb/viewtopic.php
+add:
+in newbb/footer.php
+
+2- improve: move js files from include/js to templates/js/language/LANG. all js files inside language directory will be added to header.
+move "style.css" file from templates/images/language/LANG to templates/css/language/LANG.
+in newbb/class/icon.php, newbb/footer.php, newbb/templates/js/language/LANG/*.js, newbb/templates/css/language/LANG/style.css
+
+3- delete unneeded files:
+newbb/include/pngbehavior.htc, newbb/include/newbb.htc, newbb/include/js/*.*
+
+4- bug fix: days should be changed to seconds.
+in newbb/class/post.php, newbb/class/topic.php
+
date 2012-09-19
===================================
1- bug fix: in post delete process: wrongly delete parent post before childs but the right way is deleting childs before deleting parent post.(reverse order deleting)
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -91,31 +91,32 @@
/**
* TODO: get compatible with new theme engine
*/
-
- function getPath(/*$set, */$type, $dirname = "newbb", $default = "")
+ // START irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $end_dir
+ function getPath(/*$set, */$type, $dirname = "newbb", $default = "", $end_dir = "images")
{
global $xoopsConfig;
static $paths;
- if (isset($paths[$type])) {
- return $paths[$type];
+ if (isset($paths[$end_dir . '/' . $type])) {
+ return $paths[$end_dir . '/' . $type];
}
$theme_path = $this->template->currentTheme->path;
- $rel_images = "modules/{$dirname}/images";
+ $rel_dir = "modules/{$dirname}/{$end_dir}";
- $path = is_dir($theme_path."/{$rel_images}/{$type}/")
- ? $theme_path."/{$rel_images}/{$type}"
- : ( is_dir(XOOPS_THEME_PATH."/default/{$rel_images}/{$type}/")
- ? XOOPS_THEME_PATH."/default/{$rel_images}/{$type}"
- : ( empty($default) || is_dir(XOOPS_ROOT_PATH."/modules/{$dirname}/templates/images/{$type}/")
- ? XOOPS_ROOT_PATH."/modules/{$dirname}/templates/images/{$type}"
- : XOOPS_ROOT_PATH."/modules/{$dirname}/templates/images/{$default}"
+ $path = is_dir($theme_path."/{$rel_dir}/{$type}/")
+ ? $theme_path."/{$rel_dir}/{$type}"
+ : ( is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/")
+ ? XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}"
+ : ( empty($default) || is_dir(XOOPS_ROOT_PATH."/modules/{$dirname}/templates/{$end_dir}/{$type}/")
+ ? XOOPS_ROOT_PATH."/modules/{$dirname}/templates/{$end_dir}/{$type}"
+ : XOOPS_ROOT_PATH."/modules/{$dirname}/templates/{$end_dir}/{$default}"
)
);
- $paths[$type] = str_replace(XOOPS_ROOT_PATH, "", $path);
+ $paths[$end_dir . '/' . $type] = str_replace(XOOPS_ROOT_PATH, "", $path);
- return $paths[$type];
+ return $paths[$end_dir . '/' . $type];
}
+ // END irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $end_dir
function init(/*$set = "default", */$language = "english", $dirname = "newbb")
{
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -1018,6 +1018,7 @@
if (!func_num_args()){
$newbbConfig = newbb_load_config();
$expire = isset($newbbConfig["pending_expire"]) ? intval($newbbConfig["pending_expire"]) : 7;
+ $expire = $expire * 24 * 3600; // days to seconds
}
if (empty($expire)) return false;
$crit_expire = new CriteriaCompo(new Criteria("approved", 0, "<="));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -418,6 +418,7 @@
if (!func_num_args()){
$newbbConfig = newbb_load_config();
$expire = isset($newbbConfig["pending_expire"]) ? intval($newbbConfig["pending_expire"]) : 7;
+ $expire = $expire * 24 * 3600; // days to seconds
}
if (empty($expire)) return false;
$crit_expire = new CriteriaCompo(new Criteria("approved", 0, "<="));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/edit.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/edit.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/edit.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -75,10 +75,8 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
-// irmtfan add xoops_module_header
-$xoopsOption['xoops_module_header']= $xoops_module_header;
-include XOOPS_ROOT_PATH.'/header.php';
-$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+// irmtfan remove and move to header.php
+//include XOOPS_ROOT_PATH.'/header.php';
/*
$xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
@@ -146,6 +144,7 @@
);
}
$xoopsTpl->assign_by_ref("posts_context", $posts_context);
-
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/footer.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/footer.php (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/footer.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -0,0 +1,43 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package NEWBB
+ * @since 4.3
+ * @author irmtfan <ir...@ya...>
+ * @author The Persian Xoops Support Site<www.xoops.ir>
+ * @version $Id: footer.php 1.11 2012-09-23 20:24:01
+ */
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+global $xoopsConfig, $xoTheme;
+
+include_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.render.php";
+$icon_handler = newbb_getIconHandler();
+// get css rel path from setted language
+$css_rel_path=$icon_handler->getPath("language/" . $xoopsConfig['language'], "newbb", "language/english", "css");
+// add local stylesheet
+$xoTheme->addStylesheet($css_rel_path . '/style.css');
+
+// get js rel path from setted language
+$js_rel_path=$icon_handler->getPath("language/" . $xoopsConfig['language'], "newbb", "language/english", "js");
+// add all local js files inside js directory
+xoops_load('XoopsLists');
+$allfiles = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . $js_rel_path);
+foreach ($allfiles as $jsfile) {
+ if (strtolower(pathinfo($jsfile, PATHINFO_EXTENSION)) === 'js') {
+ $xoTheme->addScript($js_rel_path . '/' . $jsfile);
+ }
+}
+?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/header.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/header.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -71,8 +71,14 @@
foreach ($xoopsModuleConfig["valid_menumodes"] as $key => $val) {
if ($key != $menumode) $menumode_other[] = array("title"=>$val, "link"=>$menu_url.$key);
}
+// irmtfan new method for add js scripts
+global $xoopsTpl;
+$xoopsTpl->assign("xoops_module_header",'
+ <script type="text/javascript">var toggle_cookie="'.$forumCookie['prefix'].'G'.'";</script>
+ '. @$xoopsTpl->get_template_vars("xoops_module_header"));
-
+/* START irmtfan remove and move to newbb/footer.php */
+/*
$newbb_module_header = '';
$newbb_module_header .= '<link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar("name").'" href="'.XOOPS_URL.'/modules/'.$dirname.'/rss.php" />';
if (!empty($xoopsModuleConfig['pngforie_enabled'])) {
@@ -108,6 +114,8 @@
}
$xoops_module_header = $newbb_module_header; // for cache hack
+*/
+/* END irmtfan remove and move to newbb/footer.php */
if (!empty($xoopsModuleConfig["welcome_forum"]) && is_object($xoopsUser) && !$xoopsUser->getVar('posts')) {
mod_loadFunctions("welcome", $dirname);
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/include/newbb.htc
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/newbb.htc 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/newbb.htc 2012-09-25 06:31:40 UTC (rev 10190)
@@ -1,89 +0,0 @@
-<attach event="ondocumentready" handler="parseStylesheets" />
-<script language="JScript">
-/**
- * Pseudos - V1.30.050121 - hover & active
- * ---------------------------------------------
- * Peterned - http://www.xs4all.nl/~peterned/
- * (c) 2005 - Peter Nederlof
- *
- * Credits - Arnoud Berendsen
- * - Martin Reurings
- * - Robert Hanson
- *
- * howto: body { behavior:url("csshover.htc"); }
- * ---------------------------------------------
- */
-
-var currentSheet, doc = window.document, activators = {
- onhover:{on:'onmouseover', off:'onmouseout'},
- onactive:{on:'onmousedown', off:'onmouseup'}
-}
-
-function parseStylesheets() {
- var sheets = doc.styleSheets, l = sheets.length;
- for(var i=0; i<l; i++)
- parseStylesheet(sheets[i]);
-}
- function parseStylesheet(sheet) {
- if(sheet.imports) {
- try {
- var imports = sheet.imports, l = imports.length;
- for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
- } catch(securityException){}
- }
-
- try {
- var rules = (currentSheet = sheet).rules, l = rules.length;
- for(var j=0; j<l; j++) parseCSSRule(rules[j]);
- } catch(securityException){}
- }
-
- function parseCSSRule(rule) {
- var select = rule.selectorText, style = rule.style.cssText;
- if(!(/(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i).test(select) || !style) return;
-
- var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
- var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
- var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1];
- var affected = select.replace(/:hover.*$/, '');
- var elements = getElementsBySelect(affected);
-
- currentSheet.addRule(newSelect, style);
- for(var i=0; i<elements.length; i++)
- new HoverElement(elements[i], className, activators[pseudo]);
- }
-
-function HoverElement(node, className, events) {
- if(!node.hovers) node.hovers = {};
- if(node.hovers[className]) return;
- node.hovers[className] = true;
- node.attachEvent(events.on,
- function() { node.className += ' ' + className; });
- node.attachEvent(events.off,
- function() { node.className =
- node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
-}
-
-function getElementsBySelect(rule) {
- var parts, nodes = [doc];
- parts = rule.split(' ');
- for(var i=0; i<parts.length; i++) {
- nodes = getSelectedNodes(parts[i], nodes);
- } return nodes;
-}
- function getSelectedNodes(select, elements) {
- var result, node, nodes = [];
- var classname = (/\.([a-z0-9_-]+)/i).exec(select);
- var identify = (/\#([a-z0-9_-]+)/i).exec(select);
- var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
- for(var i=0; i<elements.length; i++) {
- result = tagName? elements[i].all.tags(tagName):elements[i].all;
- for(var j=0; j<result.length; j++) {
- node = result[j];
- if((identify && node.id != identify[1]) || (classname && !(new RegExp('\\b' +
- classname[1] + '\\b').exec(node.className)))) continue;
- nodes[nodes.length] = node;
- }
- } return nodes;
- }
-</script>
\ No newline at end of file
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/include/pngbehavior.htc
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/pngbehavior.htc 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/pngbehavior.htc 2012-09-25 06:31:40 UTC (rev 10190)
@@ -1,79 +0,0 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="propertyChanged()" />
-<public:attach event="onbeforeprint" for="window" onevent="beforePrint()" />
-<public:attach event="onafterprint" for="window" onevent="afterPrint()" />
-<script>
-
-/*
- * PNG Behavior
- *
- * This script was created by Erik Arvidsson (erik(at)eae.net)
- * for WebFX (http://webfx.eae.net)
- * Copyright 2002
- *
- * For usage see license at http://webfx.eae.net/license.html
- *
- * Version: 1.01a
- * Created: 2001-??-?? First working version
- * Updated: 2002-03-28 Fixed issue when starting with a non png image and
- * switching between non png images
- * 2003-01-06 Fixed RegExp to correctly work with IE 5.0x
- * 2004-04-25 Fixed PNG image printing, eliminated need for external
- * GIF file, fixed intermittent uninitialised variable
- * error [by AG, <http://www.scss.com.au/family/andrew/> ]
- * 2004-09-30 Reverted inline javascript image to transparent GIF. The
- * new XP SP2 'security' measures prevented the JS image
- * from working. [by AG]
- * 2004-10-22 Rewrote fixImage() to try and work around some reported
- * problems with PNGs vanishing! [by AG]
- *
- */
-
-var IS_PNG = /\-a\.png$/i; /* <-- NOTE: remove the "\-trans" to process *all* PNGs */
-var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == 'Win32';
-var realSrc;
-var blankSrc = 'images/blank.gif';
-if (supported) fixImage();
-function propertyChanged() {
- if (supported && event.propertyName == 'src' && element.src != blankSrc) {
- fixImage();
- }
-}
-function fixImage() {
- if (realSrc && element.src == realSrc) {
- // this is an attempt to set the image to itself!
- // pointless - leave the filter as-is, restore the blank image
- element.src = blankSrc;
- } else {
- // set the image to something different
- if (IS_PNG.test(element.src)) {
- // fixable PNG
- realSrc = element.src;
- element.src = blankSrc;
- element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + realSrc + "',sizingMethod='scale')";
- } else {
- // ordinary image - make sure the fix is removed
- if (realSrc) {
- realSrc = null;
- element.runtimeStyle.filter = '';
- }
- }
- }
-}
-function beforePrint() {
- if (realSrc) {
- supported = false;
- element.src = realSrc;
- element.runtimeStyle.filter = '';
- supported = true;
- }
-}
-function afterPrint() {
- if (realSrc) {
- var rs = realSrc;
- realSrc = null;
- element.src = rs;
- }
-}
-</script>
-</public:component>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/index.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/index.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/index.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -51,20 +51,23 @@
}
/* rss feed */
+// irmtfan new method
if (!empty($xoopsModuleConfig['rss_enable'])) {
- $xoops_module_header .= '
- <link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
- ';
+ $xoopsTpl->assign("xoops_module_header",'
+ <link rel="alternate" type="application/xml+rss" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
+ '. @$xoopsTpl->get_template_vars("xoops_module_header"));
}
$xoopsOption['template_main'] = 'newbb_index.html';
$xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
-$xoopsOption['xoops_module_header'] = $xoops_module_header;
-include $GLOBALS['xoops']->path('header.php');
+// irmtfan remove and move to footer.php
+//$xoopsOption['xoops_module_header'] = $xoops_module_header;
+//include $GLOBALS['xoops']->path('header.php');
mod_loadFunctions("render", "newbb");
$xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
-$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+// irmtfan remove and move to footer.php
+//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
$xoopsTpl->assign('forum_index_title', $forum_index_title);
//if ($xoopsModuleConfig['wol_enabled']) {
if (!empty($xoopsModuleConfig['wol_enabled'])) {
@@ -260,5 +263,7 @@
"img_forum" => newbb_displayImage('forum', _MD_NONEWPOSTS),
'img_subforum' => newbb_displayImage('subforum')));
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include $GLOBALS['xoops']->path('footer.php');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -11,15 +11,17 @@
*/
include_once dirname(__FILE__) . "/header.php";
-
+// irmtfan new method
if (!empty($xoopsModuleConfig['rss_enable'])) {
- $xoops_module_header .= '<link rel="alternate" type="application/xml+rss" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />';
+ $xoopsTpl->assign("xoops_module_header",'
+ <link rel="alternate" type="application/xml+rss" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
+ '. @$xoopsTpl->get_template_vars("xoops_module_header"));
}
-$xoopsOption['xoops_module_header']= $xoops_module_header;
+//$xoopsOption['xoops_module_header']= $xoops_module_header;
$xoopsOption['template_main'] = 'newbb_viewall.html';
-include XOOPS_ROOT_PATH."/header.php";
+//include XOOPS_ROOT_PATH."/header.php";
-$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
mod_loadFunctions("time", "newbb");
mod_loadFunctions("render", "newbb");
@@ -89,5 +91,7 @@
$xoopsTpl->assign('forum_index_title', $pagetitle);
$xoopsTpl->assign('xoops_pagetitle', $pagetitle);
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH."/footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -50,10 +50,10 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0; // Disable cache
-// irmtfan add xoops_module_header
-$xoopsOption['xoops_module_header']= $xoops_module_header;
-include XOOPS_ROOT_PATH.'/header.php';
-$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+// irmtfan remove and move to footer.php
+//$xoopsOption['xoops_module_header']= $xoops_module_header;
+//include XOOPS_ROOT_PATH.'/header.php';
+//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
/*
$xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
@@ -89,5 +89,7 @@
$post_id = 0;
$topic_id = 0;
include 'include/form.post.php';
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/polls.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/polls.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/polls.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -586,6 +586,7 @@
//include XOOPS_ROOT_PATH . "/footer.php";
//exit();
}
-
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH . "/footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -411,10 +411,10 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
-// irmtfan add xoops_module_header
-$xoopsOption['xoops_module_header']= $xoops_module_header;
-include XOOPS_ROOT_PATH . "/header.php";
-$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+// irmtfan remove and move to footer.php
+//$xoopsOption['xoops_module_header']= $xoops_module_header;
+//include XOOPS_ROOT_PATH . "/header.php";
+//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
if ( !empty($_POST['contents_upload']) ) {
$attachments_tmp = array();
@@ -536,6 +536,7 @@
include 'include/form.post.php';
}
-
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH . '/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -103,6 +103,6 @@
$ratemessage = _MD_VOTEAPPRE . "<br />" . sprintf(_MD_THANKYOU, $xoopsConfig['sitename']);
redirect_header("viewtopic.php?topic_id=".$topic_id."&forum=".$forum."", 2, $ratemessage);
exit();
-
-include 'footer.php';
+// irmtfan enhance include footer.php
+include XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/reply.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/reply.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/reply.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -86,10 +86,10 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
-// irmtfan add xoops_module_header
-$xoopsOption['xoops_module_header']= $xoops_module_header;
-include XOOPS_ROOT_PATH.'/header.php';
-$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+// irmtfan remove and move to footer.php
+//$xoopsOption['xoops_module_header']= $xoops_module_header;
+//include XOOPS_ROOT_PATH.'/header.php';
+//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
/*
$xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
@@ -192,6 +192,7 @@
);
}
$xoopsTpl->assign_by_ref("posts_context", $posts_context);
-
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/search.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/search.php 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/search.php 2012-09-25 06:31:40 UTC (rev 10190)
@@ -39,7 +39,8 @@
$xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
$xoopsOption['template_main']= 'newbb_search.html';
-include XOOPS_ROOT_PATH.'/header.php';
+// irmtfan remove and move to header.php
+//include XOOPS_ROOT_PATH.'/header.php';
mod_loadFunctions("render", "newbb");
mod_loadFunctions("forum", "newbb");
@@ -212,6 +213,7 @@
if ($xoopsConfigSearch['keyword_min'] > 0) {
$xoopsTpl->assign("search_rule", sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
}
-
+// irmtfan move to footer.php
+include_once dirname(__FILE__) . "/footer.php";
include XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/templates/css/index.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/css/index.html (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/css/index.html 2012-09-25 06:31:40 UTC (rev 10190)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/index.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/index.html (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/index.html 2012-09-25 06:31:40 UTC (rev 10190)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/style.css
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/style.css (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/english/style.css 2012-09-25 06:31:40 UTC (rev 10190)
@@ -0,0 +1,358 @@
+/* -- style.css -- */
+.forum_header {
+ float : center;
+ overflow : hidden;
+ border : 1px solid #aaaaaa;
+ width : 100%;
+}
+
+.forum_title {
+ float : left;
+ text-align : left;
+ padding : 5px;
+ width : 100%;
+
+}
+
+.forum_title a {
+ font-weight: bold;
+}
+
+
+.forum_stats {
+ float:center;
+ overflow:hidden;
+ text-align:left;
+ /* border:1px solid #aaaaaa; */
+ padding:5px;
+}
+
+.forum_stats_left {
+ float: left;
+ text-align: left;
+ width:45%;
+}
+
+.forum_stats_right {
+ float: right;
+ text-align: right;
+ width:45%;
+}
+
+.forum_body {
+ margin-top: -10px;
+ padding-top: 20px;
+ float:center;
+ width:99%;
+ overflow:hidden;
+}
+
+.forum_footer {
+ float:center;
+ width:99%;
+ overflow:hidden;
+}
+
+.index_category{
+ border: 0px;
+ /*margin-top: -10px;
+ margin-bottom: 5px;*/
+}
+
+.ThreadUserName a {
+ font-weight: bold;
+ margin-bottom: 2px;
+ /*color: #000; irmtfan */
+}
+
+.ThreadTitle, .ThreadTitle a{
+ font-weight: bold;
+ margin-bottom: 2px;
+ /*color: #fff; irmtfan */
+}
+
+.icon_left {
+ float: left; text-align: left;
+}
+
+.icon_right {
+ float: right; text-align: right;
+}
+
+div.karma
+{
+ background-color: transparent;
+ text-align: left;
+ border-top: 1px solid #DDDDFF;
+ border-left: 1px solid #DDDDFF;
+ border-right: 1px solid #AAAAAA;
+ border-bottom: 1px solid #AAAAAA;
+ padding: 10px;
+}
+
+span.digest
+{
+}
+
+span.index_title{
+ float: left;
+ border: 0px;
+}
+
+span.index_extra{
+ float: right;
+ padding: 2px;
+ border: 0px;
+}
+
+div.signature {
+ bottom: 10px;
+ border-top-width:1px;
+ border-top-style: inherit;
+}
+
+div#index_welcome{
+ margin: 10px;
+ margin-bottom: 10px;
+}
+html>body div#index_welcome {
+ margin-bottom: 15px;
+}
+
+#index_welcome div.title{
+ font-size: 18px;
+ font-weight: bold;
+ border-bottom: dashed 1px;
+ padding: 5px;
+}
+
+#index_welcome div.desc{
+ padding: 5px;
+ font-size: 12px;
+ color: #000;
+}
+
+#index_welcome div.visit{
+ padding: 10px 5px;
+}
+
+.left { text-align: left; }
+.right { text-align: right; }
+.floatleft { float: left;}
+.floatright { float: right;}
+
+#index_forum a{
+ font-weight: bold;
+}
+
+table.index_category{
+ border: 0px;
+ margin-top: -10px;
+ margin-bottom: 5px;
+}
+
+table.index_category td{
+ padding: 2px;
+}
+
+table.index_category td a:first-letter{}
+
+table.index_category .desc, table.index_category .desc a{
+ font-weight: normal !important;
+ padding-left: 0;
+ margin-top: 5px;
+ margin-bottom: 0px;
+}
+
+table.index_category .desc:first-letter, table.index_category .desc a:first-letter{}
+
+#index_forum span.item{
+ padding: 0px 0px 0px 0px;
+ margin: 0px;
+ border: 0px;
+}
+
+#index_forum span.extra{
+ float: right;
+ text-align: left;
+ margin: 0px;
+}
+
+div#forum_header{
+ margin: 5px;
+}
+#forum_header div{
+ padding-top: 5px;
+}
+
+
+
+/* -- dropdown menu -- */
+
+div.dropdown{
+ float: left;
+}
+
+div.dropdown .menu, div.dropdown .userbar{
+ font-weight: bold;
+ float: left;
+ margin: 0px 1px;
+ border: 0px !important;
+ padding: 0px;
+}
+
+div.dropdown .item{
+ font-weight: bold;
+ padding: 2px 5px;
+ white-space: nowrap;
+ border: 0px !important;
+}
+
+div.dropdown ul, div.dropdown table {
+ width: 135px;
+}
+/* -- dropdown menu -- */
+
+/* -- user level -- */
+table.userlevel{
+ width: 90%;
+ border: 0px;
+ padding: 0px;
+ border-collapse: collapse;
+ border-spacing: 0;
+ text-align: left;
+}
+
+table.userlevel td{
+ height: 13px;
+ padding: 0px;
+}
+
+table.userlevel td.end{
+ width: 3px;
+}
+
+table.userlevel td.end img{
+ width: 3px;
+ height: 13px;
+}
+
+table.userlevel td.center{
+ width: 100%;
+}
+
+table.userlevel td.center img{
+ height: 12px;
+}
+/* -- user level -- */
+
+span.online_admin{
+ color:#FFA34F;
+}
+
+span.online_moderator{
+ color:#006600;
+}
+
+
+/*
+ * From http://www.positioniseverything.net/easyclearing.html
+ */
+.clear:after {
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
+ visibility: hidden;
+}
+.clear {display: inline-table;}
+/* Hides from IE-mac \*/
+* html .clear {height: 1%;}
+.clear {display: block;}
+/* End hide from IE-mac */
+
+/* color -- dropdown menu for Forum */
+div.dropdown a, div.dropdown .menubar a{
+ /* irmtfan remove hardcode color color:#FFF; */
+}
+
+div.dropdown .menu, div.dropdown .menubar, div.dropdown .item, div.dropdown .separator{
+ /* irmtfan remove hardcode color background-color: #436792;*/
+ /* same color set as in your theme/style.ss .th{} is recommended */
+ /* irmtfan remove hardcode color color:#FFF; */
+}
+
+div.dropdown .separator{
+ border: 1px inset #e0e0e0;
+}
+
+div.dropdown .menu a:hover, div.dropdown .userbar a:hover{
+ color: #333;
+}
+/* irmtfan class added for solve some hard codes */
+.post_edit {
+ float: right;
+ padding: 5px;
+ margin-top: 10px;
+ border:1px solid #000;
+ font-size: small;
+}
+.post_ip {
+ float: right;
+ padding: 5px;
+ margin-top: 10px;
+}
+.pagenav {
+ float: right;
+ text-align: right;
+ padding: 5px;
+}
+.align_left, #align_left {
+ margin-left: 0;
+ text-align: left;
+}
+.align_right, #align_right {
+ margin-right: 0;
+ text-align: right;
+}
+.poll {
+ text-align: center;
+ margin: 3px;
+}
+.pointer {
+ cursor:pointer;
+ padding:2px;
+}
+/* irmtfan source: http://jsfiddle.net/VTLmj/
+you can customize each button like this:
+span.forum_icon.forum_button#p_edit
+span.forum_icon.forum_button#p_edit:hover
+span.forum_icon.forum_button#p_edit:active
+find all image names in newbb/include/images.php
+*/
+span.forum_icon.forum_button {
+background: #407DC7;
+background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#407DC7), to(#4279B8));
+background-image: -webkit-linear-gradient(top, #407DC7, #4279B8);
+background-image: -moz-linear-gradient(top, #407DC7, #4279B8);
+background-image: -ms-linear-gradient(top, #407DC7, #4279B8);
+background-image: -o-linear-gradient(top, #407DC7, #4279B8);
+border-width: 1px;
+color: white;
+padding: 4px 4px;
+text-shadow: 0 1px 0 gray;
+border-color: white #A1C1E6 #2B4763 #A1C1E6;
+border-style: solid;
+border-radius: 5px;
+box-shadow: 0 1px 7px #080808;
+font-weight: bold;
+}
+span.forum_icon.forum_button:hover {
+box-shadow: 0 1px 5px #222;
+}
+span.forum_icon.forum_button:active {
+box-shadow: inset 0 1px 7px #565656;
+border-color: white #a1c1e6 black #a1c1e6;
+font-weight: normal;
+}
+/* color - end */
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/index.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/index.html (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/index.html 2012-09-25 06:31:40 UTC (rev 10190)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/index.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/index.html (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/index.html 2012-09-25 06:31:40 UTC (rev 10190)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/style.css
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/style.css (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/css/language/persian/style.css 2012-09-25 06:31:40 UTC (rev 10190)
@@ -0,0 +1,361 @@
+/* -- style.css -- */
+.forum_header {
+ float : center;
+ overflow : hidden;
+ border : 1px solid #aaaaaa;
+ width : 100%;
+}
+
+.forum_title {
+ float : /*irmtfan left*/ right;
+ text-align : /*irmtfan left*/ right;
+ padding : 5px;
+ width : 100%;
+
+}
+
+.forum_title a {
+ font-weight: bold;
+}
+
+
+.forum_stats {
+ float:center;
+ overflow:hidden;
+ text-align:/*irmtfan left*/right;
+ /* border:1px solid #aaaaaa; */
+ padding:5px;
+}
+
+.forum_stats_left {
+ float: /*irmtfan left*/ right;
+ text-align: /*irmtfan left*/ right;
+ width:45%;
+}
+
+.forum_stats_right {
+ float: /*irmtfan right*/left;
+ text-align: /*irmtfan right*/ left;
+ width:45%;
+}
+
+.forum_body {
+ margin-top: -10px;
+ padding-top: 20px;
+ float:center;
+ width:99%;
+ overflow:hidden;
+}
+
+.forum_footer {
+ float:center;
+ width:99%;
+ overflow:hidden;
+}
+
+.index_category{
+ border: 0px;
+ /*margin-top: -10px;
+ margin-bottom: 5px;*/
+}
+
+.ThreadUserName a {
+ font-weight: bold;
+ margin-bottom: 2px;
+ /*color: #000; irmtfan */
+}
+
+.ThreadTitle, .ThreadTitle a{
+ font-weight: bold;
+ margin-bottom: 2px;
+ /*color: #fff; irmtfan */
+}
+
+.icon_left {
+ float: /*irmtfan left*/ right; text-align: /*irmtfan left*/ right;
+}
+
+.icon_right {
+ float: /*irmtfan right*/ left; text-align: /*irmtfan right*/ left;
+}
+
+div.karma
+{
+ background-color: transparent;
+ text-align: left;
+ border-top: 1px solid #DDDDFF;
+ border-left: 1px solid #DDDDFF;
+ border-right: 1px solid #AAAAAA;
+ border-bottom: 1px solid #AAAAAA;
+ padding: 10px;
+}
+
+span.digest
+{
+}
+
+span.index_title{
+ float: /*irmtfan left*/ right;
+ border: 0px;
+}
+
+span.index_extra{
+ float: /*irmtfan right*/ left;
+ padding: 2px;
+ border: 0px;
+}
+
+div.signature {
+ bottom: 10px;
+ border-top-width:1px;
+ border-top-style: inherit;
+}
+
+div#index_welcome{
+ margin: 10px;
+ margin-bottom: 10px;
+}
+html>body div#index_welcome {
+ margin-bottom: 15px;
+}
+
+#index_welcome div.title{
+ font-size: 18px;
+ font-weight: bold;
+ border-bottom: dashed 1px;
+ padding: 5px;
+}
+
+#index_welcome div.desc{
+ padding: 5px;
+ font-size: 12px;
+ color: #000;
+}
+
+#index_welcome div.visit{
+ padding: 10px 5px;
+}
+
+.left { text-align: /*irmtfan left*/ right; }
+.right { text-align: /*irmtfan right*/ left; }
+.floatleft { float: /*irmtfan left*/ right;}
+.floatright { float: /*irmtfan right*/ left;}
+
+#index_forum a{
+ font-weight: bold;
+}
+
+table.index_category{
+ border: 0px;
+ margin-top: -10px;
+ margin-bottom: 5px;
+}
+
+table.index_category td{
+ padding: 2px;
+}
+
+table.index_category td a:first-letter{}
+
+table.index_category .desc, table.index_category .desc a{
+ font-weight: normal !important;
+ /* irmtfan padding-left: 0; */ padding-right: 0;
+ margin-top: 5px;
+ margin-bottom: 0px;
+}
+
+table.index_category .desc:first-letter, table.index_category .desc a:first-letter{}
+
+#index_forum span.item{
+ padding: 0px 0px 0px 0px;
+ margin: 0px;
+ border: 0px;
+}
+
+#index_forum span.extra{
+ float: /*irmtfan right*/ left;
+ text-align: /*irmtfan left*/ right;
+ margin: 0px;
+}
+
+div#forum_header{
+ margin: 5px;
+}
+#forum_header div{
+ padding-top: 5px;
+}
+
+
+
+/* -- dropdown menu -- */
+
+div.dropdown{
+ float: /*irmtfan left*/ right;
+}
+
+div.dropdown .menu, div.dropdown .userbar{
+ font-weight: bold;
+ float: /*irmtfan left*/ right;
+ margin: 0px 1px;
+ border: 0px !important;
+ padding: 0px;
+}
+
+div.dropdown .item{
+ font-weight: bold;
+ padding: 2px 5px;
+ white-space: nowrap;
+ border: 0px !important;
+}
+
+div.dropdown ul, div.dropdown table {
+ width: 135px;
+}
+/* -- dropdown menu -- */
+
+/* -- user level -- */
+table.userlevel{
+ width: 90%;
+ border: 0px;
+ padding: 0px;
+ border-collapse: collapse;
+ border-spacing: 0;
+ text-align: /*irmtfan left*/ right;
+}
+
+table.userlevel td{
+ height: 13px;
+ padding: 0px;
+}
+
+table.userlevel td.end{
+ width: 3px;
+}
+
+table.userlevel td.end img{
+ width: 3px;
+ height: 13px;
+}
+
+table.userlevel td.center{
+ width: 100%;
+}
+
+table.userlevel td.center img{
+ height: 12px;
+}
+/* -- user level -- */
+
+span.online_admin{
+ color:#FFA34F;
+}
+
+span.online_moderator{
+ color:#006600;
+}
+
+
+/*
+ * From http://www.positioniseverything.net/easyclearing.html
+ */
+.clear:after {
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
+ visibility: hidden;
+}
+.clear {display: inline-table;}
+/* Hides from IE-mac \*/
+* html .clear {height: 1%;}
+.clear {display: block;}
+/* End hide from IE-mac */
+
+/* color -- dropdown menu for Forum */
+div.dropdown a, div.dropdown .menubar a{
+ /* irmtfan remove hardcode color color:#FFF; */
+}
+
+div.dropdown .menu, div.dropdown .menubar, div.dropdown .item, div.dropdown .separator{
+ /* irmtfan remove hardcode color background-color: #436792;*/
+ /* same color set as in your theme/style.ss .th{} is recommended */
+ /* irmtfan remove hardcode color color:#FFF; */
+}
+
+div.dropdown .separator{
+ border: 1px inset #e0e0e0;
+}
+
+div.dropdown .menu a:hover, div.dropdown .userbar a:hover{
+ color: #333;
+}
+/* irmtfan class added for solve some hard codes */
+.post_edit {
+ float: /*irmtfan right*/ left;
+ padding: 5px;
+ margin-top: 10px;
+ border:1px solid #000;
+ font-size: small;
+}
+.post_ip {
+ float: /*irmtfan right*/ left;
+ padding: 5px;
+ margin-top: 10px;
+}
+.pagenav {
+ float: /*irmtfan right*/ left;
+ text-align: /*irmtfan right*/ left;
+ padding: 5px;
+}
+.align_left, #align_left {
+ direction: rtl;
+ /* irmtfan margin-left: 0; */ margin-right: 0;
+ text-align: /*irmtfan left*/ right;
+}
+.align_right, #align_right {
+ direction: rtl;
+ /* irmtfan margin-right: 0; */ margin-left: 0;
+ text-align: /*irmtfan right*/ left;
+}
+.poll {
+ direction: rtl;
+ text-align: center;
+ margin: 3px;
+}
+.pointer {
+ cursor:pointer;
+ padding:2px;
+}
+/* irmtfan source: http://jsfiddle.net/VTLmj/
+you can customize each button like this:
+span.forum_icon.forum_button#p_edit
+span.forum_icon.forum_button#p_edit:hover
+span.forum_icon.forum_button#p_edit:active
+find all image names in newbb/include/images.php
+*/
+span.forum_icon.forum_button {
+background: #407DC7;
+background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#407DC7), to(#4279B8));
+background-image: -webkit-linear-gradient(top, #407DC7, #4279B8);
+background-image: -moz-linear-gradient(top, #407DC7, #4279B8);
+background-image: -ms-linear-gradient(top, #407DC7, #4279B8);
+background-image: -o-linear-gradient(top, #407DC7, #4279B8);
+border-width: 1px;
+color: white;
+padding: 4px 4px;
+text-shadow: 0 1px 0 gray;
+border-color: white #A1C1E6 #2B4763 #A1C1E6;
+border-style: solid;
+border-radius: 5px;
+box-shadow: 0 1px 7px #080808;
+font-weight: bold;
+}
+span.forum_icon.forum_button:hover {
+box-shadow: 0 1px 5px #222;
+}
+span.forum_icon.forum_button:active {
+box-shadow: inset 0 1px 7px #565656;
+border-color: white #a1c1e6 black #a1c1e6;
+font-weight: normal;
+}
+/* color - end */
\ No newline at end of file
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css 2012-09-25 06:31:40 UTC (rev 10190)
@@ -1,358 +0,0 @@
-/* -- style.css -- */
-.forum_header {
- float : center;
- overflow : hidden;
- border : 1px solid #aaaaaa;
- width : 100%;
-}
-
-.forum_title {
- float : left;
- text-align : left;
- padding : 5px;
- width : 100%;
-
-}
-
-.forum_title a {
- font-weight: bold;
-}
-
-
-.forum_stats {
- float:center;
- overflow:hidden;
- text-align:left;
- /* border:1px solid #aaaaaa; */
- padding:5px;
-}
-
-.forum_stats_left {
- float: left;
- text-align: left;
- width:45%;
-}
-
-.forum_stats_right {
- float: right;
- text-align: right;
- width:45%;
-}
-
-.forum_body {
- margin-top: -10px;
- padding-top: 20px;
- float:center;
- width:99%;
- overflow:hidden;
-}
-
-.forum_footer {
- float:center;
- width:99%;
- overflow:hidden;
-}
-
-.index_category{
- border: 0px;
- /*margin-top: -10px;
- margin-bottom: 5px;*/
-}
-
-.ThreadUserName a {
- font-weight: bold;
- margin-bottom: 2px;
- /*color: #000; irmtfan */
-}
-
-.ThreadTitle, .ThreadTitle a{
- font-weight: bold;
- margin-bottom: 2px;
- /*color: #fff; irmtfan */
-}
-
-.icon_left {
- float: left; text-align: left;
-}
-
-.icon_right {
- float: right; text-align: right;
-}
-
-div.karma
-{
- background-color: transparent;
- text-align: left;
- border-top: 1px solid #DDDDFF;
- border-left: 1px solid #DDDDFF;
- border-right: 1px solid #AAAAAA;
- border-bottom: 1px solid #AAAAAA;
- padding: 10px;
-}
-
-span.digest
-{
-}
-
-span.index_title{
- float: left;
- border: 0px;
-}
-
-span.index_extra{
- float: right;
- padding: 2px;
- border: 0px;
-}
-
-div.signature {
- bottom: 10px;
- border-top-width:1px;
- border-top-style: inherit;
-}
-
-div#index_welcome{
- margin: 10px;
- margin-bottom: 10px;
-}
-html>body div#index_welcome {
- margin-bottom: 15px;
-}
-
-#index_welcome div.title{
- font-size: 18px;
- font-weight: bold;
- border-bottom: dashed 1px;
- padding: 5px;
-}
-
-#index_welcome div.desc{
- padding: 5px;
- font-size: 12px;
- color: #000;
-}
-
-#index_welcome div.visit{
- padding: 10px 5px;
-}
-
-.left { text-align: left; }
-.right { text-align: right; }
-.floatleft { float: left;}
-.floatright { float: right;}
-
-#index_forum a{
- font-weight: bold;
-}
-
-table.index_category{
- border: 0px;
- margin-top: -10px;
- margin-bottom: 5px;
-}
-
-table.index_category td{
- padding: 2px;
-}
-
-table.index_category td a:first-letter{}
-
-table.index_category .desc, table.index_category .desc a{
- font-weight: normal !important;
- padding-left: 0;
- margin-top: 5px;
- margin-bottom: 0px;
-}
-
-table.index_category .desc:first-letter, table.index_category .desc a:first-letter{}
-
-#index_forum span.item{
- padding: 0px 0px 0px 0px;
- margin: 0px;
- border: 0px;
-}
-
-#index_forum span.extra{
- float: right;
- text-align: left;
- margin: 0px;
-}
-
-div#forum_header{
- margin: 5px;
-}
-#forum_header div{
- padding-top: 5px;
-}
-
-
-
-/* -- dropdown menu -- */
-
-div.dropdown{
- float: left;
-}
-
-div.dropdown .menu, div.dropdown .userbar{
- font-weight: bold;
- float: left;
- margin: 0px 1px;
- border: 0px !important;
- padding: 0px;
-}
-
-div.dropdown .item{
- font-weight: bold;
- padding: 2px 5px;
- white-space: nowrap;
- border: 0px !important;
-}
-
-div.dropdown ul, div.dropdown table {
- width: 135px;
-}
-/* -- dropdown menu -- */
-
-/* -- user level -- */
-table.userlevel{
- width: 90%;
- border: 0px;
- padding: 0px;
- border-collapse: collapse;
- border-spacing: 0;
- text-align: left;
-}
-
-table.userlevel td{
- height: 13px;
- padding: 0px;
-}
-
-table.userlevel td.end{
- width: 3px;
-}
-
-table.userlevel td.end img{
- width: 3px;
- height: 13px;
-}
-
-table.userlevel td.center{
- width: 100%;
-}
-
-table.userlevel td.center img{
- height: 12px;
-}
-/* -- user level -- */
-
-span.online_admin{
- color:#FFA34F;
-}
-
-span.online_moderator{
- color:#006600;
-}
-
-
-/*
- * From http://www.positioniseverything.net/easyclearing.html
- */
-.clear:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
-}
-.clear {display: inline-table;}
-/* Hides from IE-mac \*/
-* html .clear {height: 1%;}
-.clear {display: block;}
-/* End hide from IE-mac */
-
-/* color -- dropdown menu for Forum */
-div.dropdown a, div.dropdown .menubar a{
- /* irmtfan remove hardcode color color:#FFF; */
-}
-
-div.dropdown .menu, div.dropdown .menubar, div.dropdown .item, div.dropdown .separator{
- /* irmtfan remove hardcode color background-color: #436792;*/
- /* same color set as in your theme/style.ss .th{} is recommended */
- /* irmtfan remove hardcode color color:#FFF; */
-}
-
-div.dropdown .separator{
- border: 1px inset #e0e0e0;
-}
-
-div.dropdown .menu a:hover, div.dropdown .userbar a:hover{
- color: #333;
-}
-/* irmtfan class added for solve some hard codes */
-.post_edit {
- float: right;
- padding: 5px;
- margin-top: 10px;
- border:1px solid #000;
- font-size: small;
-}
-.post_ip {
- float: right;
- padding: 5px;
- margin-top: 10px;
-}
-.pagenav {
- float: right;
- text-align: right;
- padding: 5px;
-}
-.align_left, #align_left {
- margin-left: 0;
- text-align: left;
-}
-.align_right, #align_right {
- margin-right: 0;
- text-align: right;
-}
-.poll {
- text-align: center;
- margin: 3px;
-}
-.pointer {
- cursor:pointer;
- padding:2px;
-}
-/* irmtfan source: http://jsfiddle.net/VTLmj/
-you can customize each button like this:
-span.forum_icon.forum_button#p_edit
-span.forum_icon.forum_button#p_edit:hover
-span.forum_icon.forum_button#p_edit:active
-find all image names in newbb/include/images.php
-*/
-span.forum_icon.forum_button {
-background: #407DC7;
-background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#407DC7), to(#4279B8));
-background-image: -webkit-linear-gradient(top, #407DC7, #4279B8);
-background-image: -moz-linear-gradient(top, #407DC7, #4279B8);
-background-image: -ms-linear-gradient(top, #407DC7, #4279B8);
-background-image: -o-linear-gradient(top, #407DC7, #4279B8);
-border-width: 1px;
-color: white;
-padding: 4px 4px;
-text-shadow: 0 1px 0 gray;
-border-color: white #A1C1E6 #2B4763 #A1C1E6;
-border-style: solid;
-border-radius: 5px;
-box-shadow: 0 1px 7px #080808;
-font-weight: bold;
-}
-span.forum_icon.forum_button:hover {
-box-shadow: 0 1px 5px #222;
-}
-span.forum_icon.forum_button:active {
-box-shadow: inset 0 1px 7px #565656;
-border-color: white #a1c1e6 black #a1c1e6;
-font-weight: normal;
-}
-/* color - end */
\ No newline at end of file
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css 2012-09-24 22:31:08 UTC (rev 10189)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css 2012-09-25 06:31:40 UTC (rev 10190)
@@ -1,361 +0,0 @@
-/* -- style.css -- */
-.forum_header {
- float : center;
- overflow : hidden;
- border : 1px solid #aaaaaa;
- width : 100%;
-}
-
-.forum_title {
- float : /*irmtfan left*/ right;
- text-align : /*irmtfan left*/ right;
- padding : 5px;
- width : 100%;
-
-}
-
-.forum_title a {
- font-weight: bold;
-}
-
-
-.forum_stats {
- float:center;
- overflow:hidden;
- text-align:/*irmtfan left*/right;
- /* border:1px solid #aaaaaa; */
- padding:5px;
-}
-
-.forum_stats_left {
- float: /*irmtfan left*/ right;
- text-align: /*irmtfan left*/ right;
- width:45%;
-}
-
-.forum_stats_right {
- float: /*irmtfan right*/left;
- text-align: /*irmtfan right*/ left;
- width:45%;
-}
-
-.forum_body {
- margin-top: -10px;
- padding-top: 20px;
- float:center;
- width:99%;
- overflow:hidden;
-}
-
-.forum_footer {
- float:center;
- width:99%;
- overflow:hidden;
-}
-
-.index_category{
- border: 0px;
- /*margin-top: -10px;
- margin-bottom: 5px;*/
-}
-
-.ThreadUserName a {
- font-weight: bold;
- margin-bottom: 2px;
- /*color: #000; irmtfan */
-}
-
-.ThreadTitle, .ThreadTitle a{
- font-weight: bold;
- margin-bottom: 2px;
- /*color: #fff; irmtfan */
-}
-
-.icon_left {
- float: /*irmtfan left*/ right; text-align: /*irmtfan left*/ right;
-}
-
-.icon_right {
- float: /*irmtfan right*/ left; text-align: /*irmtfan right*/ left;
-}
-
-div.karma
-{
- background-color: transparent;
- text-align: left;
- border-top: 1px solid #DDDDFF;
- border-left: 1px solid #DDDDFF;
- border-right: 1px solid #AAAAAA;
- border-bottom: 1px solid #AAAAAA;
- padding: 10px;
-}
-
-span.digest
-{
-}
-
-span.index_title{
- float: /*irmtfan left*/ right;
- border: 0px;
-}
-
-span.index_extra{
- float: /*irmtfan right*/ left;
- padding: 2px;
- border: 0px;
-}
-
-div.signature {
- bottom: 10px;
- border-top-width:1px;
- border-top-style: inherit;
-}
-
-div#index_welcome{
- margin: 10px;
- margin-bottom: 10px;
-}
-html>body div#index_welcome {
- margin-bottom: 15px;
-}
-
-#index_welcome div.title{
- font-size: 18px;
- font-weight: bold;
- border-bottom: dashed 1px;
- padding: 5px;
-}
-
-#index_welcome div.desc{
- padding: 5px;
- font-size: 12px;
- color: #000;
-}
-
-#index_welcome div.visit{
- padding: 10px 5px;
-}
-
-.left { text-align: /*irmtfan left*/ right; }
-.right { text-align: /*irmtfan right*/ left; }
-.floatleft { float: /*irmtfan left*/ right;}
-.floatright { float: /*irmtfan right*/ left;}
-
-#index_forum a{
- font-weight: bold;
-}
-
-table.index_category{
- border: 0px;
- margin-top: -10px;
- margin-bottom: 5px;
-}
-
-table.index_category td{
- padding: 2px;
-}
-
-table.index_category td a:first-letter{}
-
-table.index_category .desc, table.index_category .desc a{
- font-weight: normal !important;
- /* irmtfan padding-left: 0; */ padding-right: 0;
- margin-top: 5px;
- margin-bottom: 0px;
-}
-
-table.index_category .desc:first-letter, table.index_category .desc a:first-letter{}
-
-#index_forum span.item{
- padding: 0px 0px 0px 0px;
- margin: 0px;
- border: 0px;
-}
-
-#index_forum span.extra{
- float: /*irmtfan right*/ left;
- text-align: /*irmtfan left*/ right;
- margin: 0px;
-}
-
-div#forum_header{
- margin: 5px;
-}
-#forum_header div{
- padding-top: 5px;
-}
-
-
-
-/* -- dropdown menu -- */
-
-div.dropdown{
- float: /*irmtfan left*/ right;
-}
-
-div.dropdown .menu, div.dropdown .userbar{
- font-weight: bold;
- float: /*irmtfan left*/ right;
- margin: 0px 1px;
- border: 0px !important;
- padding: 0px;
-}
-
-div.dropdown .item{
- font-weight: bold;
- padding: 2px 5px;
- white-space: nowrap;
- border: 0px !important;
-}
-
-div.dropdown ul, div.dropdown table {
- width: 135px;
-}
-/* -- dropdown menu -- */
-
-/* -- user level -- */
-table.userlevel{
- width: 90%;
- border: 0px;
- padding: 0px;
- border-collapse: collapse;
- border-spacing: 0;
- text-align: /*irmtfan left*/ right;
-}
-
-table.userlevel td{
- height: 13px;
- padding: 0px;
-}
-
-table.userlevel td.end{
- width: 3px;
-}
-
-table.userlevel td.end img{
- width: 3px;
- height: 13px;
-}
-
-table.userlevel td.center{
- width: 100%;
-}
-
-table.userlevel td.center img{
- height: 12px;
-}
-/* -- user level -- */
-
-span.online_admin{
- color:#FFA34F;
-}
-
-span.online_moderator{
- color:#006600;
-}
-
-
-/*
- * From http://www.positioniseverything.net/easyclearing.html
- */
-.clear:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
-}
-.clear {display: inline-table;}
-/* Hides from IE-mac \*/
-* html .clear {height: 1%;}
-.clear {display: block;}
-/* End hide from IE-mac */
-
-/* color -- dropdown menu for Forum */
-div.dropdown a, div.dropdown .menubar a{
- /* irmtfan remove hardcode colo...
[truncated message content] |
|
From: <be...@us...> - 2012-09-24 22:31:15
|
Revision: 10189
http://xoops.svn.sourceforge.net/xoops/?rev=10189&view=rev
Author: beckmi
Date: 2012-09-24 22:31:08 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
small bug fixes
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_configs.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/xoops_version.php
Modified: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/building.php 2012-09-24 21:19:29 UTC (rev 10188)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/building.php 2012-09-24 22:31:08 UTC (rev 10189)
@@ -93,7 +93,7 @@
const_class($modules, $modules_name, $tables_module_table, $tables_name, $tables_fields, $tables_parameters);
if ( $tables_category == 1) { //|| $tables_module_table != null
- const_admin_permissions($modules, $modules_name, $tables_name, $category);
+ const_admin_permissions($modules, $modules_name, $tables_name, $tables_category);
}
//Creation of pages admin
Modified: XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/tdmcreate_modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/tdmcreate_modules.php 2012-09-24 21:19:29 UTC (rev 10188)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/tdmcreate_modules.php 2012-09-24 22:31:08 UTC (rev 10189)
@@ -43,7 +43,7 @@
$this->initVar("modules_author",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author"], false);
$this->initVar("modules_author_mail",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author_email"],false);
$this->initVar("modules_author_website_url",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author_website_url"],false);
- $this->initVar("modules_author_website_name",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author_website_name"],false);
+ $this->initVar("modules_author_website_name",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_author_website"],false);
$this->initVar("modules_credits",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_credits"], false);
$this->initVar("modules_license",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_license"], false);
$this->initVar("modules_release_info",XOBJ_DTYPE_TXTBOX, $xoopsModuleConfig["module_release_info"], false);
Modified: XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_configs.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_configs.php 2012-09-24 21:19:29 UTC (rev 10188)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_configs.php 2012-09-24 22:31:08 UTC (rev 10189)
@@ -34,7 +34,7 @@
define("'.$stu_mn.'_AUTHOR_LOGOIMG", '.$stu_mn.'_URL . "/images/'.str_replace(" ", "", strtolower($mods_a_w_name)).'_logo.png");
}
// module information
-$mod_copyright = "<a href=\''.$$mods_a_w_url.'\' title=\''.$$mods_a_w_name.'\' target=\'_blank\'>
+$mod_copyright = "<a href=\''.$mods_a_w_url.'\' title=\''.$mods_a_w_name.'\' target=\'_blank\'>
<img src=\'".'.$stu_mn.'_AUTHOR_LOGOIMG."\' alt=\''.$mods_a_w_name.'\' /></a>";
?>';
createFile($path_file, $text,
Modified: XoopsModules/TDMCreate/branches/mamba/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/xoops_version.php 2012-09-24 21:19:29 UTC (rev 10188)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/xoops_version.php 2012-09-24 22:31:08 UTC (rev 10189)
@@ -125,7 +125,7 @@
$modversion['config'][$i]['valuetype'] = "text";
$modversion['config'][$i]['default'] = 'http://xoops.org';
$i++;
-$modversion['config'][$i]['name'] = "module_author_website_name";
+$modversion['config'][$i]['name'] = "module_author_website";
$modversion['config'][$i]['title'] = "_MI_TDMCREATE_AUTHOR_WEBSITE_NAME";
$modversion['config'][$i]['description'] = "";
$modversion['config'][$i]['formtype'] = "textbox";
@@ -276,21 +276,6 @@
$modversion['config'][$i]['valuetype'] = "text";
$modversion['config'][$i]['default'] = 'This module is for doing following...';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
$i++;
//Uploads : imagemaxsize of category_img
$modversion['config'][$i]['name'] = "imagemaxsize";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-09-24 21:19:39
|
Revision: 10188
http://xoops.svn.sourceforge.net/xoops/?rev=10188&view=rev
Author: beckmi
Date: 2012-09-24 21:19:29 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
Adding version 1.38.1 Beta 1
Added Paths:
-----------
XoopsModules/TDMCreate/branches/mamba/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/about.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/admin_footer.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/admin_header.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/includes.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/index.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/menu.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/constArch.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/constArchitecture.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/logoGenerator.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/class/tdmcreate_tables.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_about_language.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_about.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_footer.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_header.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_help.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_index.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_language.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_menu.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_pages.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_admin_permissions.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_architecture.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_blocks.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_blocks_language.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_blocks_templates.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_changelog.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_class.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_class_admin.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_class_menu.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_css_admin.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_css_style.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_entete.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_header.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_help_language.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_comments.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_comments_functions.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_configs.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_functions.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_install.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_jquery.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_notification.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_include_search.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_js_jquery.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_languages.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_main_header.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_main_index.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_main_language.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_modinfo_language.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_sql.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_templates.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_templates_admin_about.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_templates_admin_help.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_templates_footer.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_templates_header.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_templates_index.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_templates_pages.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_user_comments.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_user_header.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_user_index.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_user_pages.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_waiting.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/const/const_xoopsversion.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/css/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/css/admin.css
XoopsModules/TDMCreate/branches/mamba/TDMCreate/css/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/docs/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/docs/changelog.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/docs/credits.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/docs/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/docs/install.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/docs/lang_diff.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/docs/license.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/docs/readme.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/32/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/32/addmodule.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/32/addtable.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/32/builder.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/32/dashboard.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/32/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/icons/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/icons/arrow.gif
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/icons/blank.gif
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/icons/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/icons/loading.gif
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/icons/off.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/icons/on.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/loading.gif
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/logos/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/logos/VeraBd.ttf
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/logos/green.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/logos/red.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/logos/xoops2.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/menu/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/menu/bg.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/menu/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/menu/left_both.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/menu/right_both.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/module_logo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/tdmcreate_slogo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/Test1Logo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/empty.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/module_logo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/test3_logo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/test4_logo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/test5_logo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/test6_logo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/test7_logo.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/modules/xcvLogo.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/tables/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/tables/blank.gif
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/uploads/tables/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/images/xoops2.png
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/comment_delete.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/comment_edit.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/comment_new.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/comment_post.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/comment_reply.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/functions.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/functions_const.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/install.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/jq.init.js
XoopsModules/TDMCreate/branches/mamba/TDMCreate/include/update.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/js/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/js/functions.js
XoopsModules/TDMCreate/branches/mamba/TDMCreate/js/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/english/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/english/help/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/english/help/help.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/english/help/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/english/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/english/modinfo.php
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/update language 1.0 to 1.1.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/update language 1.1 to 1.15.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/update language 1.1 to 1.37.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/update language 1.15 to 1.37.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/language/update language 1.37 to 1.38.txt
XoopsModules/TDMCreate/branches/mamba/TDMCreate/modules/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/modules/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/sql/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/sql/index.html
XoopsModules/TDMCreate/branches/mamba/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/branches/mamba/TDMCreate/templates/
XoopsModules/TDMCreate/branches/mamba/TDMCreate/xoops_version.php
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/about.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/about.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/about.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,22 @@
+<?php
+/**
+ * TDMCreate module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project (http://www.xoops.org)
+ * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
+ * @package TDMCreate
+ * @since 2.5.0
+ * @author Mage, Mamba
+ * @version $Id $
+ **/
+include 'admin_header.php';
+echo $adminMenu->addNavigation('about.php');
+echo $adminMenu->renderabout('6KJ7RW5DR3VTJ', false);
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/admin_footer.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/admin_footer.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,22 @@
+<?php
+/**
+ * XoopsPoll module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package XoopsPoll
+ * @since 2.5.0
+ * @author Mamba (www.xoops.org)
+ * @version $Id $
+**/
+
+echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . $pathIcon32.'/xoopsmicrobutton.gif'.' '." alt='XOOPS' title='XOOPS'></a></div>";
+echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/admin_header.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/admin_header.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Marquee module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package Marquee
+ * @since 2.5.0
+ * @author XOOPS Module Team
+ * @version $Id $
+**/
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once("../include/functions.php");
+include_once 'includes.php';
+//
+$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
+//
+
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+//load class
+$modulesHandler =& xoops_getModuleHandler('tdmcreate_modules', 'TDMCreate');
+$tablesHandler =& xoops_getModuleHandler('tdmcreate_tables', 'TDMCreate');
+//
+$myts =& MyTextSanitizer::getInstance();
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+//
+$xoopsTpl->assign('pathIcon16', $pathIcon16);
+$xoopsTpl->assign('pathIcon32', $pathIcon32);
+//Load languages
+xoops_loadLanguage('admin', $thisDirname);
+xoops_loadLanguage('modinfo', $thisDirname);
+xoops_loadLanguage('main', $thisDirname);
+// Locad admin menu class
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+}else{
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+}
+xoops_cp_header();
+$adminMenu = new ModuleAdmin();
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/building.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/building.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,224 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+include 'admin_header.php';
+echo $adminMenu->addNavigation('const.php');
+$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
+
+if (isset($_REQUEST['modules_name'])) {
+ $modules =& $modulesHandler->get($_REQUEST['modules_name']);
+} else {
+ $modules = & $modulesHandler;
+}
+
+$modules_name = $modules->getVar('modules_name');
+$modules_desc = $modules->getVar('modules_description');
+$modules_author_website_name = $modules->getVar('modules_author_website_name');
+$modules_author_website_url = $modules->getVar('modules_author_website_url');
+$modules_image = $modules->getVar('modules_image');
+$modules_active_search = $modules->getVar('modules_active_search');
+$modules_active_comments = $modules->getVar('modules_active_comments');
+
+//Nom des tables et combien de tables
+$criteria = new CriteriaCompo();
+if (isset($_REQUEST['modules_name'])) {
+ $criteria->add(new Criteria('tables_modules', $_REQUEST['modules_name']));
+} else {
+ $criteria->add(new Criteria('tables_modules'));
+}
+
+$nb_tables = $tablesHandler->getCount($criteria);
+$tables_arr = $tablesHandler->getall($criteria);
+
+switch ($op) {
+ case "creation":
+
+ //Effacer repertoire du nouveau module s'il existe
+ clearDir($modPath.'/modules/'.$modules_name);
+
+ //Debut
+ OpenTable();
+ /************************************************/
+ /*Structure*/
+ /************************************************/
+ //Creation de l'architecture
+ const_architecture($modules_name, $modules_image);
+ //Creation du changelog.txt
+ const_changelog($modules, $modules_name);
+ //Creation de admin index.php
+ const_admin_index($modules, $modules_name, $tables_arr);
+ //const_class_admin($modules, $modules_name);
+
+ foreach (array_keys($tables_arr) as $i)
+ {
+ //Variables
+ $tables_id = $tables_arr[$i]->getVar('tables_id');
+ $tables_name = $tables_arr[$i]->getVar('tables_name');
+ $tables_category = $tables_arr[$i]->getVar('tables_category');
+ $tables_module_table = $tables_arr[$i]->getVar('tables_module_table');
+ $tables_img = $tables_arr[$i]->getVar('tables_img');
+ $tables_fields = $tables_arr[$i]->getVar('tables_fields');
+ $tables_parameters = $tables_arr[$i]->getVar('tables_parameters');
+ $tables_blocks = $tables_arr[$i]->getVar('tables_blocks');
+ $tables_display_admin = $tables_arr[$i]->getVar('tables_display_admin');
+ $tables_display_user = $tables_arr[$i]->getVar('tables_display_user');
+ $tables_search = $tables_arr[$i]->getVar('tables_search');
+ $tables_comments = $tables_arr[$i]->getVar('tables_comments');
+ $tables_waiting = $tables_arr[$i]->getVar('tables_waiting');
+
+ //Fabrication
+ //Copie of images tables
+ $tables_img1 = $modPath."/images/uploads/tables/".$tables_img;
+ if (file_exists($tables_img1)) {
+ copy($tables_img1, $modPath."/modules/".$modules_name."/images/icons/".$tables_img);
+ }
+ //Creation des classes
+ const_class($modules, $modules_name, $tables_module_table, $tables_name, $tables_fields, $tables_parameters);
+
+ if ( $tables_category == 1) { //|| $tables_module_table != null
+ const_admin_permissions($modules, $modules_name, $tables_name, $category);
+ }
+
+ //Creation of pages admin
+ if ( $tables_display_admin == 1 ) {
+ const_admin_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_category, $tables_name, $tables_img, $tables_fields, $tables_parameters);
+ }
+ //Creation of pages and templates user
+ if ( $tables_display_user == 1 && $tables_module_table != NULL ) {
+ const_user_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_img, $tables_fields, $tables_parameters);
+ const_templates_pages($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters);
+ }
+ //Creation de search
+ if ( $modules_active_search == 1 && $tables_search == 1 ) {
+ const_include_search($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters, $tables_img);
+ }
+ //Creation of comments
+ if ( $modules_active_comments == 1 && $tables_comments == 1 ) {
+ const_include_comments($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters, $tables_img);
+ }
+
+ //Creation of the file mysql.sql
+ const_sql($modules_name, $tables_module_table, $tables_name, $tables_fields);
+
+ $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE tables_name = 'category'");
+ list( $category ) = $xoopsDB->fetchRow($result);
+ //Creation des blocks
+ if ( $tables_blocks == 1 ) {
+ const_blocks($modules, $modules_name, $tables_module_table, $tables_name, $tables_fields, $tables_parameters, $category);
+ //Creation du template des blocks
+ const_blocks_templates($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters);
+ }
+ }
+
+ //Creation of Waiting Plugin
+ const_waiting($modules, $modules_name, $tables_arr);
+
+
+ //Creation de xoopsversion.php
+ /*Mettre xoops version vers la fin pour integrer les bloc, etc*/
+ const_xoopsversion($modules, $modules_name, $tables_arr, $tables_module_table);
+ // Creation of template index
+ const_templates_index($modules, $modules_name, $tables_name, $tables_module_table, $tables_fields, $tables_parameters);
+ // Creation of template header
+ const_templates_header($modules, $modules_name);
+ // Creation of template footer
+ const_templates_footer($modules, $modules_name, $tables_module_table);
+ // Creation of template admin about
+ const_templates_admin_about($modules, $modules_name);
+ // Creation of template admin help
+ const_templates_admin_help($modules, $modules_name);
+ //Creation du fichier permissions
+
+
+ //Include
+ //Configs
+ const_include_configs($modules, $modules_name, $modules_author_website_name, $modules_author_website_url);
+ //Style
+ //const_css_admin($modules, $modules_name);
+ //const_include_style($modules, $modules_name);
+ //Functions
+ const_include_functions($modules, $modules_name);
+ //Creation du fichier install pour l'uploads
+ const_include_install($modules, $modules_name, $tables_arr);
+ //Language
+ ///////////////////////////////////////////////////////////////////////
+ //Creation du language main.php
+ const_main_language($modules, $modules_name, $modules_desc, $tables_arr);
+ //Creation du language modinfo.php
+ const_modinfo_language($modules, $modules_name, $modules_desc, $tables_arr, $category);
+ //Creation du language admin.php
+ const_admin_language($modules, $modules_name, $tables_arr, $tables_name);
+ //Creation du language blocks.php
+ const_blocks_language($modules, $modules_name, $tables_arr);
+ //Creation du language help/help.html
+ const_help_language($modules, $modules_name, $modules_desc);
+ ///////////////////////////////////////////////////////////////////////
+ //Creation de la class menu
+ //const_class_menu($modules, $modules_name);
+
+ /************************************************/
+ /*Admin*/
+ /************************************************/
+ //Creation de admin header.php
+ const_admin_header($modules, $modules_name, $tables_arr);
+ //Creation de admin footer.php
+ const_admin_footer($modules, $modules_name, $tables_arr);
+ //Creation de admin menu.php
+ const_admin_menu($modules, $modules_name, $tables_arr, $category);
+ //Creation de admin about.php
+ //$menu++;
+ const_admin_about($modules, $modules_name);
+ /************************************************/
+ /*Admin*/
+ /************************************************/
+ const_user_header($modules, $modules_name, $tables_id, $tables_module_table, $tables_name);
+ const_user_index($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_fields, $tables_parameters);
+ CloseTable();
+
+ break;
+
+ case "default":
+ default:
+
+ include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+ $action = $_SERVER['REQUEST_URI'];
+
+ $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'form_creation', $action, 'post', TRUE);
+
+ $modules_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'modules_name', 'modules_name');
+ $modules_select->addOptionArray($modulesHandler->getList());
+ $form->addElement($modules_select, TRUE);
+
+ foreach (array_keys($tables_arr) as $i)
+ {
+ //Variables
+ $tables_name = $tables_arr[$i]->getVar('tables_name');
+ }
+
+ $tables_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_TABLES, 'tables_name', $tables_name, 4);
+ $tables_select->addOptionArray($tablesHandler->getList());
+ $form->addElement($tables_select, FALSE);
+
+ $form->addElement(new XoopsFormHidden('op', 'creation'));
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $form->display();
+ break;
+}
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/includes.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/includes.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/includes.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,67 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+include '../../../include/cp_header.php';
+include_once("../include/functions.php");
+
+$modPath = XOOPS_ROOT_PATH.'/modules/TDMCreate';
+$cPath = $modPath.'/const';
+
+include_once $cPath.'/const_architecture.php';
+include_once $cPath.'/const_xoopsversion.php';
+include_once $cPath.'/const_changelog.php';
+include_once $cPath.'/const_include_search.php';
+include_once $cPath.'/const_include_comments.php';
+include_once $cPath.'/const_include_configs.php';
+include_once $cPath.'/const_include_functions.php';
+include_once $cPath.'/const_include_install.php';
+include_once $cPath.'/const_waiting.php';
+//include_once $cPath.'/const_include_style.php';
+include_once $cPath.'/const_sql.php';
+include_once $cPath.'/const_blocks.php';
+include_once $cPath.'/const_blocks_templates.php';
+include_once $cPath.'/const_class.php';
+include_once $cPath.'/const_class_admin.php';
+//include_once $cPath.'/const_class_menu.php';
+
+include_once $cPath.'/const_admin_header.php';
+include_once $cPath.'/const_admin_footer.php';
+include_once $cPath.'/const_admin_menu.php';
+include_once $cPath.'/const_admin_index.php';
+include_once $cPath.'/const_admin_pages.php';
+include_once $cPath.'/const_admin_about.php';
+include_once $cPath.'/const_admin_permissions.php';
+include_once $cPath.'/const_admin_language.php';
+include_once $cPath.'/const_modinfo_language.php';
+include_once $cPath.'/const_about_language.php';
+include_once $cPath.'/const_help_language.php';
+include_once $cPath.'/const_blocks_language.php';
+include_once $cPath.'/const_main_language.php';
+include_once $cPath.'/const_user_header.php';
+include_once $cPath.'/const_user_index.php';
+include_once $cPath.'/const_user_pages.php';
+include_once $cPath.'/const_templates_header.php';
+include_once $cPath.'/const_templates_index.php';
+include_once $cPath.'/const_templates_pages.php';
+include_once $cPath.'/const_templates_footer.php';
+include_once $cPath.'/const_templates_admin_about.php';
+include_once $cPath.'/const_templates_admin_help.php';
+
+?>
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/index.html
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/index.html (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/index.html 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/index.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/index.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,33 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+include 'admin_header.php';
+ $criteria = new CriteriaCompo();
+ $count_modules = $modulesHandler->getCount($criteria);
+ $count_tables = $tablesHandler->getCount($criteria);
+
+$adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES) ;
+$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, "<label>" ._AM_TDMCREATE_THEREARE_NUMMODULES. "</label>", $count_modules, 'Green') ;
+$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, "<label>" ._AM_TDMCREATE_THEREARE_NUMTABLES. "</label>", $count_tables, 'Orange');
+
+ echo $adminMenu->addNavigation('index.php');
+ echo $adminMenu->renderIndex();
+
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/menu.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/menu.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,46 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+$module_handler =& xoops_gethandler('module');
+$xoopsModule =& XoopsModule::getByDirname('TDMCreate');
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathIcon32 = $moduleInfo->getInfo('icons32');
+$adminmenu = array();
+$i = 1;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_INDEX;
+$adminmenu[$i]["link"] = 'admin/index.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_MODULES;
+$adminmenu[$i]["link"] = 'admin/modules.php';
+$adminmenu[$i]["icon"] = 'images/32/addmodule.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_TABLES;
+$adminmenu[$i]["link"] = 'admin/tables.php';
+$adminmenu[$i]["icon"] = 'images/32/addtable.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_CONST;
+$adminmenu[$i]["link"] = 'admin/building.php';
+$adminmenu[$i]["icon"] = 'images/32/builder.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_ABOUT;
+$adminmenu[$i]["link"] = 'admin/about.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+unset($i);
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/modules.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/modules.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,167 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+include_once 'admin_header.php';
+$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
+switch ($op) {
+ case "modules_save":
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if (isset($_REQUEST['modules_id'])) {
+ $obj =& $modulesHandler->get($_REQUEST['modules_id']);
+ } else {
+ $obj =& $modulesHandler->create();
+ }
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/modules/";
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
+ $name_img = $_REQUEST['modules_name'].'_slogo.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('modules_image', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('modules_image', $_REQUEST['modules_image']);
+ }
+ //remove all spaces from the new name
+ $spacesRemoved = str_replace(' ', '', $_REQUEST['modules_name']);
+
+ $obj->setVar('modules_name', $spacesRemoved );
+ $obj->setVar('modules_version', $_REQUEST['modules_version']);
+ $obj->setVar('modules_description', $_REQUEST['modules_description']);
+ $obj->setVar('modules_author', $_REQUEST['modules_author']);
+ $obj->setVar('modules_author_mail', $_REQUEST['modules_author_mail']);
+ $obj->setVar('modules_author_website_url', $_REQUEST['modules_author_website_url']);
+ $obj->setVar('modules_author_website_name', $_REQUEST['modules_author_website_name']);
+ $obj->setVar('modules_credits', $_REQUEST['modules_credits']);
+ $obj->setVar('modules_license', $_REQUEST['modules_license']);
+ $obj->setVar('modules_release_info', $_REQUEST['modules_release_info']);
+ $obj->setVar('modules_release_file', $_REQUEST['modules_release_file']);
+ $obj->setVar('modules_manual', $_REQUEST['modules_manual']);
+ $obj->setVar('modules_manual_file', $_REQUEST['modules_manual_file']);
+ $obj->setVar('modules_demo_site_url', $_REQUEST['modules_demo_site_url']);
+ $obj->setVar('modules_demo_site_name', $_REQUEST['modules_demo_site_name']);
+ $obj->setVar('modules_forum_site_url', $_REQUEST['modules_forum_site_url']);
+ $obj->setVar('modules_forum_site_name', $_REQUEST['modules_forum_site_name']);
+ $obj->setVar('modules_module_website_url', $_REQUEST['modules_module_website_url']);
+ $obj->setVar('modules_module_website_name', $_REQUEST['modules_module_website_name']);
+ $obj->setVar('modules_release', $_REQUEST['modules_release']);
+ $obj->setVar('modules_module_status', $_REQUEST['modules_module_status']);
+ $obj->setVar('modules_display_admin', $_REQUEST['modules_display_admin']);
+ $obj->setVar('modules_display_user', $_REQUEST['modules_display_user']);
+ $obj->setVar('modules_active_search', $_REQUEST['modules_active_search']);
+ $obj->setVar('modules_active_comments', $_REQUEST['modules_active_comments']);
+
+ if ($modulesHandler->insert($obj)) {
+ redirect_header('modules.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ }
+ break;
+
+ case "modules_create":
+ echo $adminMenu->addNavigation('modules.php');
+ $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=modules_list', 'list');
+ echo $adminMenu->renderButton();
+
+ $obj =& $modulesHandler->create();
+ $form = $obj->getForm();
+ break;
+ case "modules_edit":
+ $obj =& $modulesHandler->get($_REQUEST['modules_id']);
+ $form = $obj->getForm();
+ break;
+ case "modules_delete":
+ $obj =& $modulesHandler->get($_REQUEST['modules_id']);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1)
+ {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($modulesHandler->delete($obj)) {
+ $xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE modules_id = ".$_REQUEST['modules_id']);
+ redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'modules_id' => $_REQUEST['modules_id'], 'op' => 'modules_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('modules_name')));
+ }
+ break;
+ case "modules_list":
+ default:
+ echo $adminMenu->addNavigation('modules.php');
+ $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_NEW, 'modules.php?op=modules_create', 'add');
+ echo $adminMenu->renderButton();
+
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('modules_name');
+ $criteria->setOrder('ASC');
+ $modules_arr = $modulesHandler->getall($criteria);
+ $numrows_modules = $modulesHandler->getCount();
+
+ if ( $numrows_modules > 0 )
+ {
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr class="center">';
+ echo '<th width="20%">'._AM_TDMCREATE_NAME.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_BLOCKS.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_NB_FIELDS.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_FORMACTION.'</th>';
+ echo '</tr>';
+ $class = 'odd';
+ foreach (array_keys($modules_arr) as $i)
+ {
+ $modules_id = $modules_arr[$i]->getVar('modules_id');
+ $modules_name = $modules_arr[$i]->getVar('modules_name');
+ $modules_image = $modules_arr[$i]->getVar('modules_image');
+ //$modules_blocks = $modules_arr[$i]->getVar('modules_blocks');
+ $modules_display_admin = $modules_arr[$i]->getVar('modules_display_admin');
+ $modules_display_user = $modules_arr[$i]->getVar('modules_display_user');
+ $display_admin = ($modules_display_admin == 1) ? _YES : _NO;
+ $display_user = ($modules_display_user == 1) ? _YES : _NO;
+ echo '<tr class="odd center">';
+ echo '<td><b>'.$modules_name.'</b></td>';
+ echo '<td><img src="../images/uploads/modules/'.$modules_image.'" height="30px"></td>';
+ echo '<td>'.$display_admin.'</td>';
+ echo '<td>'.$display_user.'</td>';
+ echo '<td> </td>';
+ echo '<td> </td>';
+ echo '<td>';
+ echo '<a href="modules.php?op=modules_edit&modules_id='.$modules_id.'"><img src='. $pathIcon16 ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="modules.php?op=modules_delete&modules_id='.$modules_id.'"><img src='. $pathIcon16 ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '</td>';
+ echo '</tr>';
+ }
+ echo '</table><br><br>';
+ }
+ break;
+}
+include_once "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/tables.php (rev 0)
+++ XoopsModules/TDMCreate/branches/mamba/TDMCreate/admin/tables.php 2012-09-24 21:19:29 UTC (rev 10188)
@@ -0,0 +1,569 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+include_once 'admin_header.php';
+$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
+switch ($op) {
+ case "tables_save":
+ if (isset($_REQUEST['tables_id'])) {
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ } else {
+ $obj =& $tablesHandler->create();
+ }
+
+ //Module Name
+ $modules =& $modulesHandler->get($_REQUEST['tables_modules']);
+ $modules_name = $modules->getVar('modules_name');
+
+ $obj->setVar('tables_modules', $_REQUEST['tables_modules']);
+
+ if ( $_REQUEST['select'] == 1 )
+ {
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_category'));
+ $obj->setVar('tables_category', 1);
+ $obj->setVar('tables_name', 'category');
+ $obj->setVar('tables_blocks', 0);
+ $obj->setVar('tables_display_admin', 1);
+ $obj->setVar('tables_display_user', 1);
+ $obj->setVar('tables_status', 0);
+ $obj->setVar('tables_waiting', 0);
+ $obj->setVar('tables_online', 0);
+ $obj->setVar('tables_search', 0);
+ $obj->setVar('tables_comments', 0);
+ $obj->setVar('tables_nb_fields', 7);
+
+ $tables_fields = 'category_id:int:11:unsigned:NOT NULL: :|category_pid:int:5:unsigned:NOT NULL:0:|category_title:varchar:255: :NOT NULL: :|category_desc:text: : :NOT NULL: :|category_img:varchar:255: :NOT NULL: :|category_weight:int:5: :NOT NULL:0:|category_color:varchar:10: :NULL: :';
+
+ $tables_parameters = 'XoopsFormCategory:0:0:0:0:0:0|XoopsFormText:1:1:0:1:0:1|XoopsFormTextArea:0:1:0:0:0:1|XoopsFormUploadImage:1:1:0:0:0:0|XoopsFormText:1:1:0:0:0:0|XoopsFormColorPicker:1:1:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1';
+
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+
+ if(is_dir($pathIcon32)){
+ $uploaddir = $pathIcon32;
+ }else{
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
+ }
+
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
+ $name_img = 'category.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('tables_img', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('tables_img', $_REQUEST['tables_img1']);
+ }
+ } else {
+
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
+ $obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
+ $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']);
+ $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
+ $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
+ $obj->setVar('tables_status', $_REQUEST['tables_status']);
+ $obj->setVar('tables_waiting', $_REQUEST['tables_waiting']);
+ $obj->setVar('tables_online', $_REQUEST['tables_online']);
+ $obj->setVar('tables_search', $_REQUEST['tables_search']);
+ $obj->setVar('tables_comments', $_REQUEST['tables_comments']);
+
+ $obj->setVar('tables_nb_fields', $_REQUEST['tables_nb_fields']);
+
+ $tables_fields = '';
+ $tables_parameters = '';
+ for($i=0; $i<$_REQUEST['tables_nb_fields']; $i++)
+ {
+ //Additions of parameters: text: on: off: ...
+ if ( $i != 0 ) {
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_elements'][$i]) ) ? "".$_REQUEST['fields_param_elements'][$i].":" : " :";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_display_admin'][$i]) ) ? "1:" : "0:";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_display_user'][$i]) ) ? "1:" : "0:";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_display_blocks'][$i]) ) ? "1:" : "0:";
+ $tables_parameters .= ( $i == $_REQUEST['fields_param_main_field']) ? "1:" : "0:";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_search_field'][$i]) ) ? "1:" : "0:";
+ $tables_parameters .= ( !empty($_REQUEST['fields_param_required_field'][$i]) ) ? "1" : "0";
+ }
+
+ //Additions of fields: test: int: 4: ...
+ $tables_fields .= (!empty($_REQUEST['fields_name'][$i])) ? "".$_REQUEST['fields_name'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_type'][$i])) ? "".$_REQUEST['fields_type'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_value'][$i])) ? "".$_REQUEST['fields_value'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_attributes'][$i])) ? "".$_REQUEST['fields_attributes'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_null'][$i])) ? "".strtoupper($_REQUEST['fields_null'][$i]).":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_default'][$i])) ? "".$_REQUEST['fields_default'][$i].":" : " :";
+ $tables_fields .= (!empty($_REQUEST['fields_index'][$i])) ? "".$_REQUEST['fields_index'][$i]."" : " ";
+
+ //Break between fields and between the parameters
+ if ( $i != $_REQUEST['tables_nb_fields'] - 1) {
+ $tables_fields .= '|';
+ if ( $i != 0 )
+ $tables_parameters .= '|';
+ } else {
+ $tables_fields .= '|'.strtolower($_REQUEST['tables_name']).'_status:int:10: :NOT NULL:0:|'.strtolower($_REQUEST['tables_name']).'_waiting:int:10: :NOT NULL:0:|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:';
+ $tables_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1';
+ }
+ }
+ }
+ $obj->setVar('tables_fields', $tables_fields);
+ $obj->setVar('tables_parameters', $tables_parameters);
+
+ if ($tablesHandler->insert($obj))
+ {
+ redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ }
+
+ break;
+
+ case "tables_save1":
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if (isset($_REQUEST['tables_id'])) {
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ } else {
+ $obj =& $tablesHandler->create();
+ }
+ //Module Name
+ $modules =& $modulesHandler->get($_REQUEST['tables_modules']);
+ $modules_name = $modules->getVar('modules_name');
+
+ $tables_blocks = (isset($_REQUEST['tables_blocks'])) ? $_REQUEST['tables_blocks'] : '0';
+ $tables_display_admin = (isset($_REQUEST['tables_display_admin'])) ? $_REQUEST['tables_display_admin'] : '0';
+ $tables_display_user = (isset($_REQUEST['tables_display_user'])) ? $_REQUEST['tables_display_user'] : '0';
+ $tables_status = (isset($_REQUEST['tables_status'])) ? $_REQUEST['tables_status'] : '0';
+ $tables_waiting = (isset($_REQUEST['tables_waiting'])) ? $_REQUEST['tables_waiting'] : '0';
+ $tables_online = (isset($_REQUEST['tables_online'])) ? $_REQUEST['tables_online'] : '0';
+ $tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0';
+ $tables_comments = (isset($_REQUEST['tables_comments'])) ? $_REQUEST['tables_comments'] : '0';
+ $select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
+
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ if(is_dir($pathIcon32)){
+ $uploaddir = $pathIcon32;
+ }else{
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
+ }
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
+ $name_img = $_REQUEST['tables_name'].'.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('tables_img', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('tables_img', $_REQUEST['tables_img']);
+ }
+
+
+ $oldname=$obj->getVar('tables_name');
+
+
+ $obj->setVar('tables_modules', strtolower($_REQUEST['tables_modules']));
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
+ $obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
+ $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']);
+ $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
+ $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
+ $obj->setVar('tables_status', $_REQUEST['tables_status']);
+ $obj->setVar('tables_waiting', $_REQUEST['tables_waiting']);
+ $obj->setVar('tables_online', $_REQUEST['tables_online']);
+ //Setting isset for Search
+ if ( isset($_REQUEST['tables_search']) )
+ $obj->setVar('tables_search', $_REQUEST['tables_search']);
+ if ( isset($_REQUEST['tables_comments']) )
+ $obj->setVar('tables_comments', $_REQUEST['tables_comments']);
+ $obj->setVar('tables_nb_fields', $_REQUEST['tables_nb_fields']);
+
+ $tables_fields = $obj->getVar('tables_fields');
+ $tables_nb_fields=$_REQUEST['tables_nb_fields'];
+
+ $fields_total = explode("|", $tables_fields);
+ $count_fields = count($fields_total);
+
+ $newname=strtolower($_REQUEST['tables_name']);
+ //echo $count_parameters;
+ //fields
+ for($i=0; $i<$count_fields; $i++)
+ {
+// if ( $i >= $count_fields ) {
+// $fields_name[$i] = '';
+// $fields_type[$i] = '';
+// $fields_value[$i] = '';
+// $fields_attributes[$i] = '';
+// $fields_null[$i] = '';
+// $fields_default[$i] = '';
+// $fields_index[$i] = '';
+// } else {
+ $fields = explode(":", $fields_total[$i]);
+
+ $fields[0] = $newname . substr($fields[0],stripos($fields[0],'_'));
+// $fields_type[$i] = $fields[1];
+// $fields_value[$i] = $fields[2];
+// $fields_attributes[$i] = $fields[3];
+// $fields_null[$i] = $fields[4];
+// $fields_default[$i] = $fields[5];
+// $fields_index[$i] = $fields[6];
+ $newfields[$i]=implode(":",$fields);
+ //}
+ }
+
+$newTableFields=implode("|",$newfields);
+ $obj->setVar('tables_fields', $newTableFields);
+
+
+
+ if ($tablesHandler->insert($obj)) {
+ redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ }
+ break;
+
+ case "edit_tables":
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ $form = $obj->getFormTable();
+ break;
+
+ case "edit_fields":
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ $form = $obj->getFormEditFields(false, $_REQUEST['tables_id']);
+ break;
+
+ case "delete_tables":
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($tablesHandler->delete($obj)) {
+ redirect_header('tables.php', 3, _AM_TDMCREATE_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'tables_id' => $_REQUEST['tables_id'], 'op' => 'delete_tables'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('tables_name')));
+ }
+ break;
+ //-------------- MODULE -------------------------
+ case "modules_save":
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if (isset($_REQUEST['modules_id'])) {
+ $obj =& $modulesHandler->get($_REQUEST['modules_id']);
+ } else {
+ $obj =& $modulesHandler->create();
+ }
+
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/modules/";
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']);
+ $name_img = $_REQUEST['modules_name'].'_slogo.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('modules_image', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('modules_image', $_REQUEST['modules_image']);
+ }
+ $spacesRemoved = str_replace(' ', '', $_REQUEST['modules_name']);
+ $obj->setVar('modules_name', $spacesRemoved);
+ $obj->setVar('modules_version', $_REQUEST['modules_version']);
+ $obj->setVar('modules_description', $_REQUEST['modules_description']);
+ $obj->setVar('modules_author', $_REQUEST['modules_author']);
+ $obj->setVar('modules_author_email', $_REQUEST['modules_author_email']);
+ $obj->setVar('modules_author_website_url', $_REQUEST['modules_author_website_url']);
+ $obj->setVar('modules_author_website_name', $_REQUE...
[truncated message content] |
|
From: <lor...@us...> - 2012-09-23 13:41:25
|
Revision: 10187
http://xoops.svn.sourceforge.net/xoops/?rev=10187&view=rev
Author: lord_venom
Date: 2012-09-23 13:41:18 +0000 (Sun, 23 Sep 2012)
Log Message:
-----------
add integration
Modified Paths:
--------------
XoopsModules/TDMMp/trunk/TDMMp/admin/index.php
XoopsModules/TDMMp/trunk/TDMMp/include/functions.php
XoopsModules/TDMMp/trunk/TDMMp/language/french/admin.php
Modified: XoopsModules/TDMMp/trunk/TDMMp/admin/index.php
===================================================================
--- XoopsModules/TDMMp/trunk/TDMMp/admin/index.php 2012-09-19 20:50:05 UTC (rev 10186)
+++ XoopsModules/TDMMp/trunk/TDMMp/admin/index.php 2012-09-23 13:41:18 UTC (rev 10187)
@@ -64,12 +64,39 @@
//$stop = strtotime("+30 days", "1255338748");
//echo tdmmp_mathtemps('1255338748', $stop, 2);
+//prepare la comparaison des fichiers
+ $i=0;
+ $tdmmp_files[$i]['path'] = TDMMP_ROOT_PATH.'/root/pmlite.php';
+ $tdmmp_files[$i]['dest'] = XOOPS_ROOT_PATH.'/pmlite.php';
+ $i++;
+ $tdmmp_files[$i]['path'] = TDMMP_ROOT_PATH.'/root/readpmsg.php';
+ $tdmmp_files[$i]['dest'] = XOOPS_ROOT_PATH.'/readpmsg.php';
+ $i++;
+ $tdmmp_files[$i]['path'] = TDMMP_ROOT_PATH.'/root/viewpmsg.php';
+ $tdmmp_files[$i]['dest'] = XOOPS_ROOT_PATH.'/viewpmsg.php';
+ $i++;
+ $tdmmp_files[$i]['path'] = TDMMP_ROOT_PATH.'/root/class/smarty/xoops_plugins/function.xoInboxCount.php';
+ $tdmmp_files[$i]['dest'] = XOOPS_ROOT_PATH.'/class/smarty/xoops_plugins/function.xoInboxCount.php';
+ $i++;
+
+
if($op == "optimise"){
$sq1 = "OPTIMIZE TABLE ".$xoopsDB->prefix("priv_msgs");
$result1 = $xoopsDB->queryF($sq1);
if($result1){
redirect_header( 'index.php', 1, _PM_AM_BASE);
} }
+
+ if($op == "integ"){
+
+ foreach ($tdmmp_files as $file) {
+$result .= tdmmp_copyFile($file['path'],$file['dest']);
+}
+ if($result){
+ redirect_header( 'index.php', 1, _PM_AM_BASE);
+ }
+
+ }
if (phpversion() >= 5){
include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/class/menu.php';
@@ -85,26 +112,13 @@
//$menu->addItem('permissions', 'permissions.php', '../images/decos/permissions.png', _AM_TDMSOUND_NAVPERMISSIONS);
$menu->addItem('import', 'import.php', '../images/decos/import.png', _PM_AM_MANAGE_IMPORT);
$menu->addItem('optimise', 'index.php?op=optimise', '../images/decos/optimise.png', _PM_AM_OPTIMISE);
+ $menu->addItem('integration', 'index.php?op=integ', '../images/decos/optimie.png', _PM_AM_FILE);
$menu->addItem('Preference', '../../system/admin.php?fct=preferences&op=showmod&mod='.$xoopsModule ->getVar('mid').
'&&confcat_id=1', '../images/decos/pref.png', _PM_AM_NAVPREFERENCES);
echo $menu->getCSS();
}
-//prepare la comparaison des fichiers
- $i=0;
- $tdmmp_files[$i]['path'] = TDMMP_ROOT_PATH.'/root/pmlite.php';
- $tdmmp_files[$i]['dest'] = XOOPS_ROOT_PATH.'/pmlite.php';
- $i++;
- $tdmmp_files[$i]['path'] = TDMMP_ROOT_PATH.'/root/readpmsg.php';
- $tdmmp_files[$i]['dest'] = XOOPS_ROOT_PATH.'/readpmsg.php';
- $i++;
- $tdmmp_files[$i]['path'] = TDMMP_ROOT_PATH.'/root/viewpmsg.php';
- $tdmmp_files[$i]['dest'] = XOOPS_ROOT_PATH.'/viewpmsg.php';
- $i++;
- $tdmmp_files[$i]['path'] = TDMMP_ROOT_PATH.'/root/class/smarty/xoops_plugins/function.xoInboxCount.php';
- $tdmmp_files[$i]['dest'] = XOOPS_ROOT_PATH.'/class/smarty/xoops_plugins/function.xoInboxCount.php';
- $i++;
echo '<div class="CPbigTitle" style="background-image: url(../images/decos/index.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;">
<h3><strong>'._PM_AM_INDEXDESC.'</strong></h3>
Modified: XoopsModules/TDMMp/trunk/TDMMp/include/functions.php
===================================================================
--- XoopsModules/TDMMp/trunk/TDMMp/include/functions.php 2012-09-19 20:50:05 UTC (rev 10186)
+++ XoopsModules/TDMMp/trunk/TDMMp/include/functions.php 2012-09-23 13:41:18 UTC (rev 10187)
@@ -154,6 +154,21 @@
return false;
}
}
+
+ function tdmmp_copyFile($source,$dest) {
+
+ if(file_exists($dest)){
+ $result = rename($dest,$dest.'.svg');
+ } else {
+ $result = copy($source,$dest);
+ }
+ if ($result) {
+ return true;
+ }else{
+ return false;
+ }
+ }
+
/**
* admin menu
Modified: XoopsModules/TDMMp/trunk/TDMMp/language/french/admin.php
===================================================================
--- XoopsModules/TDMMp/trunk/TDMMp/language/french/admin.php 2012-09-19 20:50:05 UTC (rev 10186)
+++ XoopsModules/TDMMp/trunk/TDMMp/language/french/admin.php 2012-09-23 13:41:18 UTC (rev 10187)
@@ -37,6 +37,8 @@
define("_PM_AM_NAVABOUT","About");
define("_PM_AM_NOTIF","Notifications");
define("_PM_AM_ERREURPHP","ERREUR: Le menu est disponible uniquement sous PHP 5.0 ou supérieur");
+//news
+define("_PM_AM_FILE","Integration automatique");
define("_PM_AM_INDEXDESC","Index du module");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tst...@us...> - 2012-09-19 20:50:21
|
Revision: 10186
http://xoops.svn.sourceforge.net/xoops/?rev=10186&view=rev
Author: tstempko
Date: 2012-09-19 20:50:05 +0000 (Wed, 19 Sep 2012)
Log Message:
-----------
Rollback of beckmi's changes due to incorrect encoding in ISO-8859-2 files after the changes; And also all encodings have been changed to UTF-8.
Wycofanie zmian beckmi z powodu b?\197?\130?\196?\153d?\195?\179w wprowadzonych do plik?\195?\179w iso-8859-2 przez te zmiany; A tak?\197?\188e zmiana kodowa?\197?\132 wszystkich plik?\195?\179w na UTF-8
Modified Paths:
--------------
XoopsLanguages/polish/modules/AMS/2.41/czytaj_to.txt
XoopsLanguages/polish/modules/AMS/2.41/language/polish/admin.php
XoopsLanguages/polish/modules/AMS/2.41/language/polish/blocks.php
XoopsLanguages/polish/modules/AMS/2.41/language/polish/main.php
XoopsLanguages/polish/modules/AMS/2.41/language/polish/modinfo.php
XoopsLanguages/polish/modules/addresses/language/polish/blocks.php
XoopsLanguages/polish/modules/addresses/language/polish/mail_template/category_linksubmit_notify.tpl
XoopsLanguages/polish/modules/addresses/language/polish/mail_template/category_newlink_notify.tpl
XoopsLanguages/polish/modules/addresses/language/polish/mail_template/global_linkbroken_notify.tpl
XoopsLanguages/polish/modules/addresses/language/polish/mail_template/global_linkmodify_notify.tpl
XoopsLanguages/polish/modules/addresses/language/polish/mail_template/global_linksubmit_notify.tpl
XoopsLanguages/polish/modules/addresses/language/polish/mail_template/global_newcategory_notify.tpl
XoopsLanguages/polish/modules/addresses/language/polish/mail_template/global_newlink_notify.tpl
XoopsLanguages/polish/modules/addresses/language/polish/mail_template/link_approve_notify.tpl
XoopsLanguages/polish/modules/addresses/language/polish/main.php
XoopsLanguages/polish/modules/addresses/language/polish/modinfo.php
XoopsLanguages/polish/modules/altern8news/language/polski/admin.php
XoopsLanguages/polish/modules/altern8news/language/polski/blocks.php
XoopsLanguages/polish/modules/altern8news/language/polski/main.php
XoopsLanguages/polish/modules/altern8news/language/polski/modinfo.php
XoopsLanguages/polish/modules/articles/language/polish/admin.php
XoopsLanguages/polish/modules/articles/language/polish/blocks.php
XoopsLanguages/polish/modules/articles/language/polish/czytaj_to.txt
XoopsLanguages/polish/modules/articles/language/polish/main.php
XoopsLanguages/polish/modules/articles/language/polish/modinfo.php
XoopsLanguages/polish/modules/atopsites/language/polish/polish.php
XoopsLanguages/polish/modules/avaman/language/polski/admin.php
XoopsLanguages/polish/modules/avaman/language/polski/modinfo.php
XoopsLanguages/polish/modules/backup/czytaj_to.txt
XoopsLanguages/polish/modules/backup/language/polish/admin.php
XoopsLanguages/polish/modules/backup/language/polish/modinfo.php
XoopsLanguages/polish/modules/backupandrestore/language/polish/admin.php
XoopsLanguages/polish/modules/backupandrestore/language/polish/modinfo.php
XoopsLanguages/polish/modules/booklists/language/english/main.php
XoopsLanguages/polish/modules/booklists/language/english/modinfo.php
XoopsLanguages/polish/modules/booklists/language/polish/blocks.php
XoopsLanguages/polish/modules/booklists/language/polish/main.php
XoopsLanguages/polish/modules/booklists/language/polish/modinfo.php
XoopsLanguages/polish/modules/catads/language/polish/admin.php
XoopsLanguages/polish/modules/catads/language/polish/blocks.php
XoopsLanguages/polish/modules/catads/language/polish/mail_template/ads_approve_notify.tpl
XoopsLanguages/polish/modules/catads/language/polish/mail_template/category_newads_notify.tpl
XoopsLanguages/polish/modules/catads/language/polish/mail_template/global_newads_notify.tpl
XoopsLanguages/polish/modules/catads/language/polish/main.php
XoopsLanguages/polish/modules/catads/language/polish/modinfo.php
XoopsLanguages/polish/modules/chatmx/language/polski/admin.php
XoopsLanguages/polish/modules/chatmx/language/polski/blocks.php
XoopsLanguages/polish/modules/chatmx/language/polski/main.php
XoopsLanguages/polish/modules/chatmx/language/polski/modinfo.php
XoopsLanguages/polish/modules/contact/czytaj_to.txt
XoopsLanguages/polish/modules/contact/language/english/main.php
XoopsLanguages/polish/modules/contact/language/english/modinfo.php
XoopsLanguages/polish/modules/contact/language/polish/main.php
XoopsLanguages/polish/modules/contact/language/polish/modinfo.php
XoopsLanguages/polish/modules/content/language/english/modinfo.php
XoopsLanguages/polish/modules/content/language/polish/admin.php
XoopsLanguages/polish/modules/content/language/polish/blocks.php
XoopsLanguages/polish/modules/content/language/polish/main.php
XoopsLanguages/polish/modules/content/language/polish/modinfo.php
XoopsLanguages/polish/modules/counter/language/polish/admin.php
XoopsLanguages/polish/modules/counter/language/polish/blocks.php
XoopsLanguages/polish/modules/d3forum/language/english/modinfo.php
XoopsLanguages/polish/modules/d3forum/language/polish/admin.php
XoopsLanguages/polish/modules/d3forum/language/polish/blocks_common.php
XoopsLanguages/polish/modules/d3forum/language/polish/blocks_each.php
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/category_newforum.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/category_newpost.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/category_newtopic.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/forum_newpost.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/forum_newtopic.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/global_newpost.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/global_newtopic.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/global_waiting.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/mail_template/topic_newpost.tpl
XoopsLanguages/polish/modules/d3forum/language/polish/main.php
XoopsLanguages/polish/modules/d3forum/language/polish/modinfo.php
XoopsLanguages/polish/modules/dokuwiki/README.txt
XoopsLanguages/polish/modules/dokuwiki/language/polish/admin.php
XoopsLanguages/polish/modules/dokuwiki/language/polish/modinfo.php
XoopsLanguages/polish/modules/dokuwiki/uploads/dokuwiki/pages/start.txt
XoopsLanguages/polish/modules/dokuwiki/uploads/dokuwiki/pages/wiki/dokuwiki.txt
XoopsLanguages/polish/modules/dokuwiki/uploads/dokuwiki/pages/wiki/syntax.txt
XoopsLanguages/polish/modules/dynamenu/language/polish/blocks.php
XoopsLanguages/polish/modules/ephemerides/language/polish/admin.php
XoopsLanguages/polish/modules/ephemerides/language/polish/modinfo.php
XoopsLanguages/polish/modules/extcal/polish/admin.php
XoopsLanguages/polish/modules/extcal/polish/blocks.php
XoopsLanguages/polish/modules/extcal/polish/main.php
XoopsLanguages/polish/modules/extcal/polish/modinfo.php
XoopsLanguages/polish/modules/extgallery/language/polish/main.php
XoopsLanguages/polish/modules/extgallery/language/polish/modinfo.php
XoopsLanguages/polish/modules/headlines/language/polish/admin.php
XoopsLanguages/polish/modules/headlines/language/polish/blocks.php
XoopsLanguages/polish/modules/headlines/language/polish/modinfo.php
XoopsLanguages/polish/modules/icontent/admin.php
XoopsLanguages/polish/modules/icontent/blocks.php
XoopsLanguages/polish/modules/icontent/main.php
XoopsLanguages/polish/modules/icontent/modinfo.php
XoopsLanguages/polish/modules/istats/czytaj_to.txt
XoopsLanguages/polish/modules/istats/language/polski/admin.php
XoopsLanguages/polish/modules/istats/language/polski/blocks.php
XoopsLanguages/polish/modules/istats/language/polski/instalacja.txt
XoopsLanguages/polish/modules/istats/language/polski/main.php
XoopsLanguages/polish/modules/istats/language/polski/modinfo.php
XoopsLanguages/polish/modules/kshop/language/english/admin.php
XoopsLanguages/polish/modules/kshop/language/english/mail_template/contact.tpl
XoopsLanguages/polish/modules/kshop/language/english/mail_template/send_order.tpl
XoopsLanguages/polish/modules/kshop/language/english/main.php
XoopsLanguages/polish/modules/kshop/language/english/modinfo.php
XoopsLanguages/polish/modules/liaise/language/polish/admin.php
XoopsLanguages/polish/modules/liaise/language/polish/main.php
XoopsLanguages/polish/modules/liaise/language/polish/modinfo.php
XoopsLanguages/polish/modules/marquee/language/polski/admin.php
XoopsLanguages/polish/modules/marquee/language/polski/modinfo.php
XoopsLanguages/polish/modules/multiMenu/README.txt
XoopsLanguages/polish/modules/multiMenu/language/polish/admin.php
XoopsLanguages/polish/modules/multiMenu/language/polish/blocks.php
XoopsLanguages/polish/modules/multiMenu/language/polish/modinfo.php
XoopsLanguages/polish/modules/my_egallery/language/polish/admin.php
XoopsLanguages/polish/modules/my_egallery/language/polish/main.php
XoopsLanguages/polish/modules/my_egallery/language/polish/modinfo.php
XoopsLanguages/polish/modules/myalbum/language/polish/admin.php
XoopsLanguages/polish/modules/myalbum/language/polish/blocks.php
XoopsLanguages/polish/modules/myalbum/language/polish/mail_template/category_newphoto_notify.tpl
XoopsLanguages/polish/modules/myalbum/language/polish/mail_template/global_newphoto_notify.tpl
XoopsLanguages/polish/modules/myalbum/language/polish/main.php
XoopsLanguages/polish/modules/myalbum/language/polish/modinfo.php
XoopsLanguages/polish/modules/myalbum/language/polish/myalbum_constants.php
XoopsLanguages/polish/modules/mylinks/language/polish/blocks.php
XoopsLanguages/polish/modules/mylinks/language/polish/main.php
XoopsLanguages/polish/modules/mylinks/language/polish/modinfo.php
XoopsLanguages/polish/modules/myquiz/language/polish/informacja.txt
XoopsLanguages/polish/modules/myquiz/language/polish/informacja_iso.txt
XoopsLanguages/polish/modules/myquiz/language/polish/main.php
XoopsLanguages/polish/modules/myquiz/language/polish/main_pl_ang_iso.php
XoopsLanguages/polish/modules/myquiz/language/polish/main_pl_ang_win.php
XoopsLanguages/polish/modules/newbb/README.txt
XoopsLanguages/polish/modules/newbb/language/polish/admin.php
XoopsLanguages/polish/modules/newbb/language/polish/blocks.php
XoopsLanguages/polish/modules/newbb/language/polish/mail_template/forum_newpost_notify.tpl
XoopsLanguages/polish/modules/newbb/language/polish/mail_template/forum_newthread_notify.tpl
XoopsLanguages/polish/modules/newbb/language/polish/mail_template/global_digest_notify.tpl
XoopsLanguages/polish/modules/newbb/language/polish/mail_template/global_newforum_notify.tpl
XoopsLanguages/polish/modules/newbb/language/polish/mail_template/global_newfullpost_notify.tpl
XoopsLanguages/polish/modules/newbb/language/polish/mail_template/global_newpost_notify.tpl
XoopsLanguages/polish/modules/newbb/language/polish/mail_template/thread_newpost_notify.tpl
XoopsLanguages/polish/modules/newbb/language/polish/main.php
XoopsLanguages/polish/modules/newbb/language/polish/modinfo.php
XoopsLanguages/polish/modules/newbb/language/polish/user.php
XoopsLanguages/polish/modules/news/language/polish/admin.php
XoopsLanguages/polish/modules/news/language/polish/blocks.php
XoopsLanguages/polish/modules/news/language/polish/main.php
XoopsLanguages/polish/modules/news/language/polish/modinfo.php
XoopsLanguages/polish/modules/news/language/polish/newsletter.php
XoopsLanguages/polish/modules/partners/language/polish/admin.php
XoopsLanguages/polish/modules/partners/language/polish/blocks.php
XoopsLanguages/polish/modules/partners/language/polish/main.php
XoopsLanguages/polish/modules/partners/language/polish/modinfo.php
XoopsLanguages/polish/modules/piCal/language/polish/admin.php
XoopsLanguages/polish/modules/piCal/language/polish/blocks.php
XoopsLanguages/polish/modules/piCal/language/polish/main.php
XoopsLanguages/polish/modules/piCal/language/polish/modinfo.php
XoopsLanguages/polish/modules/piCal/language/polish/pical_constants.php
XoopsLanguages/polish/modules/piCal/language/polish/pical_vars.phtml
XoopsLanguages/polish/modules/protector/README_PL.txt
XoopsLanguages/polish/modules/protector/language/polish/admin.php
XoopsLanguages/polish/modules/protector/language/polish/blocks.php
XoopsLanguages/polish/modules/protector/language/polish/modinfo.php
XoopsLanguages/polish/modules/protector30/language/polish/README_PL.txt
XoopsLanguages/polish/modules/protector30/language/polish/admin.php
XoopsLanguages/polish/modules/protector30/language/polish/main.php
XoopsLanguages/polish/modules/protector30/language/polish/modinfo.php
XoopsLanguages/polish/modules/rmgs/admin/images.php
XoopsLanguages/polish/modules/rmgs/language/polish/admin.php
XoopsLanguages/polish/modules/rmgs/language/polish/blocks.php
XoopsLanguages/polish/modules/rmgs/language/polish/mail_template/postales.tpl
XoopsLanguages/polish/modules/rmgs/language/polish/main.php
XoopsLanguages/polish/modules/rmgs/language/polish/modinfo.php
XoopsLanguages/polish/modules/rmgs/language/polish/users.php
XoopsLanguages/polish/modules/rmgs/tpls/green.tpl
XoopsLanguages/polish/modules/rmgs/tpls/kids.tpl
XoopsLanguages/polish/modules/rmgs/tpls/outline.tpl
XoopsLanguages/polish/modules/rmgs/tpls/outline_blue.tpl
XoopsLanguages/polish/modules/rmlib/language/polish/admin.php
XoopsLanguages/polish/modules/rmlib/language/polish/blocks.php
XoopsLanguages/polish/modules/rmlib/language/polish/main.php
XoopsLanguages/polish/modules/rmlib/language/polish/modinfo.php
XoopsLanguages/polish/modules/rmmf/class/table.class.php
XoopsLanguages/polish/modules/rmmf/language/polish/admin.php
XoopsLanguages/polish/modules/rmmf/language/polish/blocks.php
XoopsLanguages/polish/modules/rmmf/language/polish/main.php
XoopsLanguages/polish/modules/rmmf/language/polish/modinfo.php
XoopsLanguages/polish/modules/rmmf/templates/rmmf_categos.html
XoopsLanguages/polish/modules/rmmf/templates/rmmf_index.html
XoopsLanguages/polish/modules/simplywiki/1.2/language/polish/admin.php
XoopsLanguages/polish/modules/simplywiki/1.2/language/polish/blocks.php
XoopsLanguages/polish/modules/simplywiki/1.2/language/polish/main.php
XoopsLanguages/polish/modules/simplywiki/1.2/language/polish/modinfo.php
XoopsLanguages/polish/modules/sitemap/language/polish/blocks.php
XoopsLanguages/polish/modules/sitemap/language/polish/main.php
XoopsLanguages/polish/modules/sitemap/language/polish/modinfo.php
XoopsLanguages/polish/modules/smartclient/language/english/admin.php
XoopsLanguages/polish/modules/smartclient/language/english/blocks.php
XoopsLanguages/polish/modules/smartclient/language/english/common.php
XoopsLanguages/polish/modules/smartclient/language/english/join.tpl
XoopsLanguages/polish/modules/smartclient/language/english/main.php
XoopsLanguages/polish/modules/smartclient/language/english/modinfo.php
XoopsLanguages/polish/modules/smartfaq/language/polish/admin.php
XoopsLanguages/polish/modules/smartfaq/language/polish/blocks.php
XoopsLanguages/polish/modules/smartfaq/language/polish/main.php
XoopsLanguages/polish/modules/smartfaq/language/polish/modinfo.php
XoopsLanguages/polish/modules/smartpartner/language/polish/admin.php
XoopsLanguages/polish/modules/smartpartner/language/polish/blocks.php
XoopsLanguages/polish/modules/smartpartner/language/polish/common.php
XoopsLanguages/polish/modules/smartpartner/language/polish/main.php
XoopsLanguages/polish/modules/smartpartner/language/polish/modinfo.php
XoopsLanguages/polish/modules/smartsection/language/english/admin.php
XoopsLanguages/polish/modules/smartsection/language/english/blocks.php
XoopsLanguages/polish/modules/smartsection/language/english/common.php
XoopsLanguages/polish/modules/smartsection/language/english/main.php
XoopsLanguages/polish/modules/smartsection/language/english/modinfo.php
XoopsLanguages/polish/modules/smartsection/language/english/smartdbupdater.php
XoopsLanguages/polish/modules/smartsection/language/polish/admin.php
XoopsLanguages/polish/modules/smartsection/language/polish/blocks.php
XoopsLanguages/polish/modules/smartsection/language/polish/common.php
XoopsLanguages/polish/modules/smartsection/language/polish/main.php
XoopsLanguages/polish/modules/smartsection/language/polish/modinfo.php
XoopsLanguages/polish/modules/smartsection/language/polish/smartdbupdater.php
XoopsLanguages/polish/modules/smartsection/readme.txt
XoopsLanguages/polish/modules/snx_guestbook/index.php
XoopsLanguages/polish/modules/snx_guestbook/language/polish/modinfo.php
XoopsLanguages/polish/modules/umfrage/language/polish/admin.php
XoopsLanguages/polish/modules/umfrage/language/polish/blocks.php
XoopsLanguages/polish/modules/umfrage/language/polish/mail_template/mail_results.tpl
XoopsLanguages/polish/modules/umfrage/language/polish/main.php
XoopsLanguages/polish/modules/umfrage/language/polish/modinfo.php
XoopsLanguages/polish/modules/uservisit/czytaj_to_koniecznie!!!!!!!.txt
XoopsLanguages/polish/modules/uservisit/language/polish/main.php
XoopsLanguages/polish/modules/uservisit/language/polish/modinfo.php
XoopsLanguages/polish/modules/visitors2/language/polish/main.php
XoopsLanguages/polish/modules/visitors2/language/polish/modinfo.php
XoopsLanguages/polish/modules/webchat/language/polish/blocks.php
XoopsLanguages/polish/modules/webchat/language/polish/global.php
XoopsLanguages/polish/modules/webchat/language/polish/modinfo.php
XoopsLanguages/polish/modules/wfdownloads/language/polish/admin.php
XoopsLanguages/polish/modules/wfdownloads/language/polish/blocks.php
XoopsLanguages/polish/modules/wfdownloads/language/polish/main.php
XoopsLanguages/polish/modules/wfdownloads/language/polish/modinfo.php
XoopsLanguages/polish/modules/wflinks/language/polish/admin.php
XoopsLanguages/polish/modules/wflinks/language/polish/blocks.php
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/category_linksubmit_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/category_newlink_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/global_linkbroken_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/global_linkmodify_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/global_linksubmit_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/global_newcategory_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/global_newlink_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/link_approve_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/mail_template/linkbroken_notify.tpl
XoopsLanguages/polish/modules/wflinks/language/polish/main.php
XoopsLanguages/polish/modules/wflinks/language/polish/modinfo.php
XoopsLanguages/polish/modules/wfquotes/language/polish/admin.php
XoopsLanguages/polish/modules/wfquotes/language/polish/main.php
XoopsLanguages/polish/modules/wfquotes/language/polish/modinfo.php
XoopsLanguages/polish/modules/whosonline/language/polish/blocks.php
XoopsLanguages/polish/modules/whosonline/language/polish/modinfo.php
XoopsLanguages/polish/modules/wiwimod/czytaj_to.txt
XoopsLanguages/polish/modules/wiwimod/language/polish/admin.php
XoopsLanguages/polish/modules/wiwimod/language/polish/blocks.php
XoopsLanguages/polish/modules/wiwimod/language/polish/mail_template/global_pagemodified_notify.tpl
XoopsLanguages/polish/modules/wiwimod/language/polish/main.php
XoopsLanguages/polish/modules/wiwimod/language/polish/modinfo.php
XoopsLanguages/polish/modules/wordbook/czytaj_to.txt
XoopsLanguages/polish/modules/wordbook/english/admin.php
XoopsLanguages/polish/modules/wordbook/english/blocks.php
XoopsLanguages/polish/modules/wordbook/english/main.php
XoopsLanguages/polish/modules/wordbook/english/modinfo.php
XoopsLanguages/polish/modules/wordbook/polish/admin.php
XoopsLanguages/polish/modules/wordbook/polish/blocks.php
XoopsLanguages/polish/modules/wordbook/polish/main.php
XoopsLanguages/polish/modules/wordbook/polish/modinfo.php
XoopsLanguages/polish/modules/xcgal/language/polish/admin.php
XoopsLanguages/polish/modules/xcgal/language/polish/blocks.php
XoopsLanguages/polish/modules/xcgal/language/polish/main.php
XoopsLanguages/polish/modules/xcgal/language/polish/modinfo.php
XoopsLanguages/polish/modules/xcgal/readme.txt
XoopsLanguages/polish/modules/xfguestbook/README.txt
XoopsLanguages/polish/modules/xfguestbook/language/polish/admin.php
XoopsLanguages/polish/modules/xfguestbook/language/polish/blocks.php
XoopsLanguages/polish/modules/xfguestbook/language/polish/main.php
XoopsLanguages/polish/modules/xfguestbook/language/polish/modinfo.php
XoopsLanguages/polish/modules/xfsection/polish/admin.php
XoopsLanguages/polish/modules/xfsection/polish/blocks.php
XoopsLanguages/polish/modules/xfsection/polish/main.php
XoopsLanguages/polish/modules/xfsection/polish/modinfo.php
XoopsLanguages/polish/modules/xlanguage/language/polish/admin.php
XoopsLanguages/polish/modules/xlanguage/language/polish/blocks.php
XoopsLanguages/polish/modules/xlanguage/language/polish/modinfo.php
XoopsLanguages/polish/modules/xmline/language/polish/utf-8/admin.php
XoopsLanguages/polish/modules/xmline/language/polish/utf-8/main.php
XoopsLanguages/polish/modules/xmline/language/polish/utf-8/modinfo.php
XoopsLanguages/polish/modules/xmmemberstats/language/polish/blocks.php
XoopsLanguages/polish/modules/xmmemberstats/language/polish/main.php
XoopsLanguages/polish/modules/xmmemberstats/language/polish/modinfo.php
XoopsLanguages/polish/modules/xmspotlight/language/polish/blocks.php
XoopsLanguages/polish/modules/xnews/1.71/language/polish/admin.php
XoopsLanguages/polish/modules/xnews/1.71/language/polish/blocks.php
XoopsLanguages/polish/modules/xnews/1.71/language/polish/main.php
XoopsLanguages/polish/modules/xnews/1.71/language/polish/modinfo.php
XoopsLanguages/polish/modules/xnews/1.71/language/polish/newsletter.php
XoopsLanguages/polish/modules/xoopschat/language/polish/admin.php
XoopsLanguages/polish/modules/xoopschat/language/polish/main.php
XoopsLanguages/polish/modules/xoopschat/language/polish/modinfo.php
XoopsLanguages/polish/modules/xoopsgallery/language/english/admin.php
XoopsLanguages/polish/modules/xoopsgallery/language/english/blocks.php
XoopsLanguages/polish/modules/xoopsgallery/language/english/main.php
XoopsLanguages/polish/modules/xoopsgallery/language/english/modinfo.php
XoopsLanguages/polish/modules/xoopsgallery/language/polish/admin.php
XoopsLanguages/polish/modules/xoopsgallery/language/polish/blocks.php
XoopsLanguages/polish/modules/xoopsgallery/language/polish/main.php
XoopsLanguages/polish/modules/xoopsgallery/language/polish/modinfo.php
XoopsLanguages/polish/modules/xoopspoll/language/polish/admin.php
XoopsLanguages/polish/modules/xoopspoll/language/polish/mail_template/mail_results.tpl
XoopsLanguages/polish/modules/xoopspoll/language/polish/main.php
XoopsLanguages/polish/modules/xoopspoll/language/polish/modinfo.php
XoopsLanguages/polish/modules/xoopstube/language/english/admin.php
XoopsLanguages/polish/modules/xoopstube/language/english/main.php
XoopsLanguages/polish/modules/xoopstube/language/english/modinfo.php
XoopsLanguages/polish/modules/xoopstube/language/polish/admin.php
XoopsLanguages/polish/modules/xoopstube/language/polish/main.php
XoopsLanguages/polish/modules/xoopstube/language/polish/modinfo.php
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/admin_activate.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/admin_send_email.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/admin_welcome_activated.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/admin_welcome_inactive.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/coppa_welcome_inactive.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/group_added.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/group_approved.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/group_request.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/privmsg_notify.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/profile_send_email.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/topic_notify.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/user_activate.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/user_activate_passwd.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/user_welcome.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/email/user_welcome_inactive.tpl
XoopsLanguages/polish/modules/xphpbbi/lang_polish/lang_admin.php
XoopsLanguages/polish/modules/xphpbbi/lang_polish/lang_bbcode.php
XoopsLanguages/polish/modules/xphpbbi/lang_polish/lang_faq.php
XoopsLanguages/polish/modules/xphpbbi/lang_polish/lang_main.php
XoopsLanguages/polish/modules/xphpbbi/lang_polish/search_stopwords.txt
XoopsLanguages/polish/modules/xphpbbi/polski/blocks.php
XoopsLanguages/polish/modules/xphpbbi/polski/modinfo.php
XoopsLanguages/polish/modules/xsgal/language/polish/main.php
XoopsLanguages/polish/modules/xsgal/language/polish/modinfo.php
XoopsLanguages/polish/modules/xt_temas/polish/blocks.php
XoopsLanguages/polish/modules/xt_temas/polish/modinfo.php
XoopsLanguages/polish/modules/xtremguestbook/language/polish/admin.php
XoopsLanguages/polish/modules/xtremguestbook/language/polish/main.php
XoopsLanguages/polish/modules/xtremguestbook/language/polish/modinfo.php
XoopsLanguages/polish/modules/yogurt/language/polish/main.php
Removed Paths:
-------------
XoopsLanguages/polish/modules/xmline/language/polish/iso-8859-2/
Modified: XoopsLanguages/polish/modules/AMS/2.41/czytaj_to.txt
===================================================================
--- XoopsLanguages/polish/modules/AMS/2.41/czytaj_to.txt 2012-09-19 10:47:00 UTC (rev 10185)
+++ XoopsLanguages/polish/modules/AMS/2.41/czytaj_to.txt 2012-09-19 20:50:05 UTC (rev 10186)
@@ -1,2 +1,2 @@
--2005-01-07 dap997
-T\xB3umaczenie do wersji AMS 2.41 bazuj\xB1ce na t\xB3umaczeniu AMS 2.2 ze strony www.xoops.pl.
+Tłumaczenie do wersji AMS 2.41 bazujące na tłumaczeniu AMS 2.2 ze strony www.xoops.pl.
Modified: XoopsLanguages/polish/modules/AMS/2.41/language/polish/admin.php
===================================================================
--- XoopsLanguages/polish/modules/AMS/2.41/language/polish/admin.php 2012-09-19 10:47:00 UTC (rev 10185)
+++ XoopsLanguages/polish/modules/AMS/2.41/language/polish/admin.php 2012-09-19 20:50:05 UTC (rev 10186)
@@ -3,187 +3,187 @@
//%%%%%% Admin Module Name Articles %%%%%
define("_AMS_AM_DBUPDATED","Baza Danych zaktualizowana!");
define("_AMS_AM_CONFIG","Konfiguracja AMS");
-define("_AMS_AM_AUTOARTICLES","Zautomatyzowane Artyku³y");
+define("_AMS_AM_AUTOARTICLES","Zautomatyzowane Artykuły");
define("_AMS_AM_STORYID","ID Opowiadania");
-define("_AMS_AM_TITLE","Tytu³");
+define("_AMS_AM_TITLE","Tytuł");
define("_AMS_AM_TOPIC","Temat");
-define("_AMS_AM_ARTICLE","Artyku³");
-define("_AMS_AM_POSTER","Pisz±cy");
+define("_AMS_AM_ARTICLE", "Artykuł");
+define("_AMS_AM_POSTER","Piszący");
define("_AMS_AM_PROGRAMMED","Zaprogramowana Data/Czas");
-define("_AMS_AM_ACTION","Czynno¶æ");
+define("_AMS_AM_ACTION","Czynność");
define("_AMS_AM_EDIT","Edycja");
-define("_AMS_AM_DELETE","Usuñ");
-define("_AMS_AM_LAST10ARTS","Ostatnie %d Aryku³ów");
+define("_AMS_AM_DELETE","Usuń");
+define("_AMS_AM_LAST10ARTS","Ostatnie %d Arykułów");
define("_AMS_AM_PUBLISHED","Opublikowano"); // Published Date
-define("_AMS_AM_GO","Id¼!");
-define("_AMS_AM_EDITARTICLE","Edytuj Artyku³");
-define("_AMS_AM_POSTNEWARTICLE","Napisz nowy Artyku³");
-define("_AMS_AM_ARTPUBLISHED","Twój artyku³ zosta³ opublikowany!");
+define("_AMS_AM_GO","Idź!");
+define("_AMS_AM_EDITARTICLE","Edytuj Artykuł");
+define("_AMS_AM_POSTNEWARTICLE","Napisz nowy Artykuł");
+define("_AMS_AM_ARTPUBLISHED","Twój artykuł został opublikowany!");
define("_AMS_AM_HELLO","Witaj %s,");
-define("_AMS_AM_YOURARTPUB","Twój artyku³ zosta³ zaakceptowany i opublikowany.");
-define("_AMS_AM_TITLEC","Tytu³: ");
+define("_AMS_AM_YOURARTPUB","Twój artykuł został zaakceptowany i opublikowany.");
+define("_AMS_AM_TITLEC","Tytuł: ");
define("_AMS_AM_URLC","URL: ");
define("_AMS_AM_PUBLISHEDC","Opublikowano: ");
-define("_AMS_AM_RUSUREDEL","Czy na pewno chcesz usun±æ ten artyku³ oraz wszystkie jego komentarze?");
+define("_AMS_AM_RUSUREDEL","Czy na pewno chcesz usunąć ten artykuł oraz wszystkie jego komentarze?");
define("_AMS_AM_YES","Tak");
define("_AMS_AM_NO","Nie");
-define("_AMS_AM_INTROTEXT","Wstêp");
-define("_AMS_AM_EXTEXT","Pe³ny tekst");
-define("_AMS_AM_ALLOWEDHTML","Zezwalaæ na HTML:");
-define("_AMS_AM_DISAMILEY","Wy³±cz emotikony");
-define("_AMS_AM_DISHTML","Wy³±cz HTML");
-define("_AMS_AM_APPROVE","Zatwierd¼");
-define("_AMS_AM_MOVETOTOP","Przenie¶ t± historiê na sam± górê");
-define("_AMS_AM_CHANGEDATETIME","Zmieñ datê/czas publikacji");
+define("_AMS_AM_INTROTEXT","Wstęp");
+define("_AMS_AM_EXTEXT","Pełny tekst");
+define("_AMS_AM_ALLOWEDHTML","Zezwalać na HTML:");
+define("_AMS_AM_DISAMILEY","Wyłącz emotikony");
+define("_AMS_AM_DISHTML","Wyłącz HTML");
+define("_AMS_AM_APPROVE","Zatwierdź");
+define("_AMS_AM_MOVETOTOP","Przenieś tą historię na samą górę");
+define("_AMS_AM_CHANGEDATETIME","Zmień datę/czas publikacji");
define("_AMS_AM_NOWSETTIME","Teraz jest ustawione na: %s"); // %s is datetime of publish
define("_AMS_AM_CURRENTTIME","Aktualny czas: %s"); // %s is the current datetime
-define("_AMS_AM_SETDATETIME","Ustaw datê/czas publikacji");
-define("_AMS_AM_MONTHC","Miesi±c:");
-define("_AMS_AM_DAYC","Dzieñ:");
+define("_AMS_AM_SETDATETIME","Ustaw datę/czas publikacji");
+define("_AMS_AM_MONTHC","Miesiąc:");
+define("_AMS_AM_DAYC","Dzień:");
define("_AMS_AM_YEARC","Rok:");
define("_AMS_AM_TIMEC","Czas:");
-define("_AMS_AM_PREVIEW","Podgl±d");
+define("_AMS_AM_PREVIEW","Podgląd");
define("_AMS_AM_SAVE","Zapisz");
-define("_AMS_AM_PUBINHOME","Opublikowaæ na stronie g³ównej?");
+define("_AMS_AM_PUBINHOME","Opublikować na stronie głównej?");
define("_AMS_AM_ADD","Dodaj");
//%%%%%% Admin Module Name Topics %%%%%
-define("_AMS_AM_ADDMTOPIC","Dodaj G£ÓWNY Temat");
+define("_AMS_AM_ADDMTOPIC","Dodaj GŁÓWNY Temat");
define("_AMS_AM_TOPICNAME","Nazwa Tematu");
define("_AMS_AM_MAX40CHAR","(Maksymalnie 40 znaków)");
define("_AMS_AM_TOPICIMG","Obrazek tematu");
-define("_AMS_AM_IMGNAEXLOC","Nazwa obrazka + rozszerzenie znajduje siê w %s");
-define("_AMS_AM_FEXAMPLE","Dla przyk³adu: games.gif");
-define("_AMS_AM_ADDSUBTOPIC","Dodaj Temat podrzêdny");
+define("_AMS_AM_IMGNAEXLOC","Nazwa obrazka + rozszerzenie znajduje się w %s");
+define("_AMS_AM_FEXAMPLE","Dla przykładu: games.gif");
+define("_AMS_AM_ADDSUBTOPIC","Dodaj Temat podrzędny");
define("_AMS_AM_IN","w");
define("_AMS_AM_MODIFYTOPIC","Modyfikuj Temat");
define("_AMS_AM_MODIFY","Modyfikuj");
-define("_AMS_AM_PARENTTOPIC","Nadrzêdny Temat");
+define("_AMS_AM_PARENTTOPIC","Nadrzędny Temat");
define("_AMS_AM_SAVECHANGE","Zapisz zmiany");
define("_AMS_AM_DEL","Kasuj");
define("_AMS_AM_CANCEL","Anuluj");
-define("_AMS_AM_WAYSYWTDTTAL","UWAGA: Czy na pewno chcesz usun±æ ten temat oraz wszystkie jego komentarze?");
+define("_AMS_AM_WAYSYWTDTTAL","UWAGA: Czy na pewno chcesz usunąć ten temat oraz wszystkie jego komentarze?");
// Added in Beta6
-define("_AMS_AM_TOPICSMNGR","Menad¿er Tematów");
-define("_AMS_AM_PEARTICLES","Zarz±dzaj artyku³ami");
+define("_AMS_AM_TOPICSMNGR","Menadżer Tematów");
+define("_AMS_AM_PEARTICLES","Zarządzaj artykułami");
define("_AMS_AM_NEWSUB","Nowe sugestie");
define("_AMS_AM_POSTED","Napisany");
-define("_AMS_AM_GENERALCONF","Ustawienia G³ówne");
+define("_AMS_AM_GENERALCONF","Ustawienia Główne");
// Added in RC2
-define("_AMS_AM_TOPICDISPLAY","Wy¶wietliæ obrazek Tematu?");
+define("_AMS_AM_TOPICDISPLAY","Wyświetlić obrazek Tematu?");
define("_AMS_AM_TOPICALIGN","Pozycja");
define("_AMS_AM_RIGHT","Z prawej");
define("_AMS_AM_LEFT","Z lewej");
-define("_AMS_AM_EXPARTS","Artyku³y które wygas³y");
-define("_AMS_AM_EXPIRED","Wyga¶niête");
-define("_AMS_AM_CHANGEEXPDATETIME","Zmieñ datê/czas wyga¶niêcia");
-define("_AMS_AM_SETEXPDATETIME","Ustaw datê/czas wyga¶niêcia");
+define("_AMS_AM_EXPARTS","Artykuły które wygasły");
+define("_AMS_AM_EXPIRED","Wygaśnięte");
+define("_AMS_AM_CHANGEEXPDATETIME","Zmień datę/czas wygaśnięcia");
+define("_AMS_AM_SETEXPDATETIME","Ustaw datę/czas wygaśnięcia");
define("_AMS_AM_NOWSETEXPTIME","Teraz jest ustawione na: %s");
// Added in RC3
-define("_AMS_AM_ERRORTOPICNAME","Musisz wprowadziæ Temat!");
-define("_AMS_AM_EMPTYNODELETE","Nie ma nic do skasowania!");
+define("_AMS_AM_ERRORTOPICNAME", "Musisz wprowadzić Temat!");
+define("_AMS_AM_EMPTYNODELETE", "Nie ma nic do skasowania!");
// Added 240304 (Mithrandir)
-define('_AMS_AM_GROUPPERM','Zezwolenia przedstawiania/zatwierdzania');
+define('_AMS_AM_GROUPPERM', 'Zezwolenia przedstawiania/zatwierdzania');
define('_AMS_AM_SELFILE','Wybierz Plik');
// Added by Hervé
-define('_AMS_AM_UPLOAD_DBERROR_SAVE','B³±d podczas dodawania pliku do artyku³u');
-define('_AMS_AM_UPLOAD_ERROR','B³±d podczas wysy³ania pliku');
-define('_AMS_AM_UPLOAD_ATTACHFILE','Do³±czon(y)e Plik(i)');
-define('_AMS_AM_APPROVEFORM','Zezwolenia zatwierdzania');
-define('_AMS_AM_SUBMITFORM','Zezwolenia dodawania');
-define('_AMS_AM_VIEWFORM','Zobacz zezwolenia');
-define('_AMS_AM_APPROVEFORM_DESC','Wybierz, kto mo¿e zatwierdzaæ artyku³y');
-define('_AMS_AM_SUBMITFORM_DESC','Wybierz, kto mo¿e przedstawiaæ artyku³y');
-define('_AMS_AM_VIEWFORM_DESC','Wybierz, kto mo¿e ogl±daæ które artyku³y');
-define('_AMS_AM_DELETE_SELFILES','Usuñ wybrane pliki');
-define('_AMS_AM_TOPIC_PICTURE','Wy¶lij obrazek');
-define('_AMS_AM_UPLOAD_WARNING','<B>Uwaga! Nie zapomnij ustawiæ atrybutów CHMOD dla nastêpuj±cych katalogów : %s</B>');
+define('_AMS_AM_UPLOAD_DBERROR_SAVE','Błąd podczas dodawania pliku do artykułu');
+define('_AMS_AM_UPLOAD_ERROR','Błąd podczas wysyłania pliku');
+define('_AMS_AM_UPLOAD_ATTACHFILE','Dołączon(y)e Plik(i)');
+define('_AMS_AM_APPROVEFORM', 'Zezwolenia zatwierdzania');
+define('_AMS_AM_SUBMITFORM', 'Zezwolenia dodawania');
+define('_AMS_AM_VIEWFORM', 'Zobacz zezwolenia');
+define('_AMS_AM_APPROVEFORM_DESC', 'Wybierz, kto może zatwierdzać artykuły');
+define('_AMS_AM_SUBMITFORM_DESC', 'Wybierz, kto może przedstawiać artykuły');
+define('_AMS_AM_VIEWFORM_DESC', 'Wybierz, kto może oglądać które artykuły');
+define('_AMS_AM_DELETE_SELFILES', 'Usuń wybrane pliki');
+define('_AMS_AM_TOPIC_PICTURE', 'Wyślij obrazek');
+define('_AMS_AM_UPLOAD_WARNING', '<B>Uwaga! Nie zapomnij ustawić atrybutów CHMOD dla następujących katalogów : %s</B>');
-define('_AMS_AM_NEWS_UPGRADECOMPLETE','Aktualizacja zakoñczona');
-define('_AMS_AM_NEWS_UPDATEMODULE','Aktualizuj szablony i bloki');
-define('_AMS_AM_NEWS_UPGRADEFAILED','Nie dokonano aktualizacji');
-define('_AMS_AM_NEWS_UPGRADE','Aktualizacja');
+define('_AMS_AM_NEWS_UPGRADECOMPLETE', 'Aktualizacja zakończona');
+define('_AMS_AM_NEWS_UPDATEMODULE', 'Aktualizuj szablony i bloki');
+define('_AMS_AM_NEWS_UPGRADEFAILED', 'Nie dokonano aktualizacji');
+define('_AMS_AM_NEWS_UPGRADE', 'Aktualizacja');
define('_AMS_AM_ADD_TOPIC','Dodaj temat');
-define('_AMS_AM_ADD_TOPIC_ERROR','B³±d, Taki temat ju¿ istnieje!');
-define('_AMS_AM_ADD_TOPIC_ERROR1','B£¡D: Nie mo¿na wybraæ tego tematu jako nadrzêdnego!');
-define('_AMS_AM_SUB_MENU','Publikuj ten Temat jako podrzêdny');
-define('_AMS_AM_SUB_MENU_YESNO','Czy ma to byæ temat podrzêdny?');
-define('_AMS_AM_HITS','Trafieñ');
-define('_AMS_AM_CREATED','Stworzony');
-define('_AMS_AM_COMMENTS',"Komentarze");
-define('_AMS_AM_VERSION',"Wersja");
-define('_AMS_AM_PUBLISHEDARTICLES','Opublikowane Artyku³y');
-define('_AMS_AM_TOPICBANNER',"Banner");
-define('_AMS_AM_BANNERINHERIT',"Dziedziczenie z nadrzêdnego");
-define('_AMS_AM_RATING',"Ocena");
-define('_AMS_AM_FILTER',"Filtr");
-define('_AMS_AM_SORTING','Opcje sortowania');
-define('_AMS_AM_SORT','Sortuj');
-define('_AMS_AM_ORDER','Kolejno¶æ');
-define('_AMS_AM_STATUS','Status');
-define('_AMS_AM_OF','z');
+define('_AMS_AM_ADD_TOPIC_ERROR','Błąd, Taki temat już istnieje!');
+define('_AMS_AM_ADD_TOPIC_ERROR1','BŁĄD: Nie można wybrać tego tematu jako nadrzędnego!');
+define('_AMS_AM_SUB_MENU','Publikuj ten Temat jako podrzędny');
+define('_AMS_AM_SUB_MENU_YESNO','Czy ma to być temat podrzędny?');
+define('_AMS_AM_HITS', 'Trafień');
+define('_AMS_AM_CREATED', 'Stworzony');
+define('_AMS_AM_COMMENTS', "Komentarze");
+define('_AMS_AM_VERSION', "Wersja");
+define('_AMS_AM_PUBLISHEDARTICLES', 'Opublikowane Artykuły');
+define('_AMS_AM_TOPICBANNER', "Banner");
+define('_AMS_AM_BANNERINHERIT', "Dziedziczenie z nadrzędnego");
+define('_AMS_AM_RATING', "Ocena");
+define('_AMS_AM_FILTER', "Filtr");
+define('_AMS_AM_SORTING', 'Opcje sortowania');
+define('_AMS_AM_SORT', 'Sortuj');
+define('_AMS_AM_ORDER', 'Kolejność');
+define('_AMS_AM_STATUS', 'Status');
+define('_AMS_AM_OF', 'z');
-define('_AMS_AM_MANAGEAUDIENCES','Zarz±dzaj poziomami czytelników');
-define('_AMS_AM_AUDIENCENAME','Nazwa Czytelników');
-define('_AMS_AM_ACCESSRIGHTS','Prawa dostêpu');
-define('_AMS_AM_LINKEDFORUM','Powi±zane Forum');
-define('_AMS_AM_VERSIONCOUNT','Wersje');
-define('_AMS_AM_AUDIENCEHASSTORIES','artyku³ %u ma ju¿ t± grupê czytelników, wybierz now± grupê dla tych artyku³u³ów');
-define('_AMS_AM_RUSUREDELAUDIENCE','Czy na pewno chcesz zupe³nie usun±æ t± grupê czytelników?');
-define('_AMS_AM_PLEASESELECTNEWAUDIENCE','Proszê wybierz grupê czytelników która zast±pi obecn±');
-define('_AMS_AM_AUDIENCEDELETED','Grupa zosta³a usuniêta');
-define('_AMS_AM_ERROR_AUDIENCENOTDELETED','B³±d - czytelnicy nie zostali usuniêci');
-define("_AMS_AM_CANNOTDELETEDEFAULTAUDIENCE","B³±d - nie mo¿na usun±c standardowych praw dla czytelników");
+define('_AMS_AM_MANAGEAUDIENCES', 'Zarządzaj poziomami czytelników');
+define('_AMS_AM_AUDIENCENAME', 'Nazwa Czytelników');
+define('_AMS_AM_ACCESSRIGHTS', 'Prawa dostępu');
+define('_AMS_AM_LINKEDFORUM', 'Powiązane Forum');
+define('_AMS_AM_VERSIONCOUNT', 'Wersje');
+define('_AMS_AM_AUDIENCEHASSTORIES', 'artykuł %u ma już tą grupę czytelników, wybierz nową grupę dla tych artykułułów');
+define('_AMS_AM_RUSUREDELAUDIENCE', 'Czy na pewno chcesz zupełnie usunąć tą grupę czytelników?');
+define('_AMS_AM_PLEASESELECTNEWAUDIENCE', 'Proszę wybierz grupę czytelników która zastąpi obecną');
+define('_AMS_AM_AUDIENCEDELETED', 'Grupa została usunięta');
+define('_AMS_AM_ERROR_AUDIENCENOTDELETED', 'Błąd - czytelnicy nie zostali usunięci');
+define("_AMS_AM_CANNOTDELETEDEFAULTAUDIENCE", "Błąd - nie można usunąc standardowych praw dla czytelników");
-define("_AMS_AM_NOTOPICSELECTED","Nie wybrano tematu");
-define("_AMS_AM_SUBMIT","Dodaj");
-define("_AMS_AM_ERROR_REORDERERROR","B³±d - w czasie ponownego sortowania");
-define("_AMS_AM_REORDERSUCCESSFUL","Tematy zosta³y posortowane na nowo");
+define("_AMS_AM_NOTOPICSELECTED", "Nie wybrano tematu");
+define("_AMS_AM_SUBMIT", "Dodaj");
+define("_AMS_AM_ERROR_REORDERERROR", "Błąd - w czasie ponownego sortowania");
+define("_AMS_AM_REORDERSUCCESSFUL", "Tematy zostały posortowane na nowo");
-define("_AMS_AM_NONE","Brak obrazka");
-define("_AMS_AM_AUTHOR","Avatarek autora ");
+define("_AMS_AM_NONE", "Brak obrazka");
+define("_AMS_AM_AUTHOR", "Avatarek autora ");
-define("_AMS_AM_SPOT_ADD","Dodaj ma³y blok - spotlight");
-define("_AMS_AM_SPOT_EDITBLOCK","Zmieñ ustawienia bloku");
-define("_AMS_AM_SPOT_NAME","Nazwa");
-define("_AMS_AM_SPOT_SHOWIMAGE","Poka¿ obrazek");
-define("_AMS_AM_SPOT_SHOWIMAGE_DESC","Wybierz obrazek aby pokazaæ obrazek albo ustaw go jako obrazek tematu albo jako avaterek autora");
-define("_AMS_AM_SPOT_WEIGHT","Waga");
-define("_AMS_AM_SPOT_DISPLAY","Publikuj");
-define("_AMS_AM_SPOT_MAIN","G³ówny");
-define("_AMS_AM_SPOT_MINI","Mini");
-define("_AMS_AM_SPOTLIGHT","Spotlight");
-define("_AMS_AM_WEIGHT","Waga");
-define("_AMS_AM_SPOT_SAVESUCCESS","Zapisano spotlight");
-define("_AMS_AM_SPOT_DELETESUCCESS","Skasowano spotlight");
-define("_AMS_AM_RUSUREDELSPOTLIGHT","Czy na pewno chcesz skasowaæ tego spotlight?");
+define("_AMS_AM_SPOT_ADD", "Dodaj mały blok - spotlight");
+define("_AMS_AM_SPOT_EDITBLOCK", "Zmień ustawienia bloku");
+define("_AMS_AM_SPOT_NAME", "Nazwa");
+define("_AMS_AM_SPOT_SHOWIMAGE", "Pokaż obrazek");
+define("_AMS_AM_SPOT_SHOWIMAGE_DESC", "Wybierz obrazek aby pokazać obrazek albo ustaw go jako obrazek tematu albo jako avaterek autora");
+define("_AMS_AM_SPOT_WEIGHT", "Waga");
+define("_AMS_AM_SPOT_DISPLAY", "Publikuj");
+define("_AMS_AM_SPOT_MAIN", "Główny");
+define("_AMS_AM_SPOT_MINI", "Mini");
+define("_AMS_AM_SPOTLIGHT", "Spotlight");
+define("_AMS_AM_WEIGHT", "Waga");
+define("_AMS_AM_SPOT_SAVESUCCESS", "Zapisano spotlight");
+define("_AMS_AM_SPOT_DELETESUCCESS", "Skasowano spotlight");
+define("_AMS_AM_RUSUREDELSPOTLIGHT", "Czy na pewno chcesz skasować tego spotlight?");
-define("_AMS_AM_SPOT_LATESTARTICLE","Ostatnie artyku³y");
-define("_AMS_AM_SPOT_LATESTINTOPIC","Ostatnie artyku³y w temacie");
-define("_AMS_AM_SPOT_SPECIFICARTICLE","Wybrany artyku³");
-define("_AMS_AM_SPOT_NOIMAGE","Bez obrazka");
-define("_AMS_AM_SPOT_MODE_SELECT","Spotlight Mode");
-define("_AMS_AM_SPOT_SPECIFYIMAGE","Wybrany obrazek");
-define("_AMS_AM_SPOT_TOPICIMAGE","Obrazek z tematu");
-define("_AMS_AM_SPOT_AUTHORIMAGE","Avatarek autora");
-define("_AMS_AM_SPOT_IMAGE","Obrazek");
-define("_AMS_AM_SPOT_AUTOTEASER","Automatyczne wprowadzenie - teaser");
-define("_AMS_AM_SPOT_MAXLENGTH","Maksymalna d³ugo¶æ automatycznego wprowadzenia");
-define("_AMS_AM_SPOT_TEASER","Nieautomatyczny tekst wprowadzenia");
-define("_AMS_AM_SPOT_TOPIC_DESC","Je¶li wybrano 'Ostatnie artyku³y w temacie', który temat powinien zostaæ wybrany?");
-define("_AMS_AM_SPOT_ARTICLE_DESC","Je¶li wybrano 'Ostatnie artyku³y', który artyku³ powinien zostaæ pokazany ?");
-define("_AMS_AM_SPOT_CUSTOM","W³asny");
+define("_AMS_AM_SPOT_LATESTARTICLE", "Ostatnie artykuły");
+define("_AMS_AM_SPOT_LATESTINTOPIC", "Ostatnie artykuły w temacie");
+define("_AMS_AM_SPOT_SPECIFICARTICLE", "Wybrany artykuł");
+define("_AMS_AM_SPOT_NOIMAGE", "Bez obrazka");
+define("_AMS_AM_SPOT_MODE_SELECT", "Spotlight Mode");
+define("_AMS_AM_SPOT_SPECIFYIMAGE", "Wybrany obrazek");
+define("_AMS_AM_SPOT_TOPICIMAGE", "Obrazek z tematu");
+define("_AMS_AM_SPOT_AUTHORIMAGE", "Avatarek autora");
+define("_AMS_AM_SPOT_IMAGE", "Obrazek");
+define("_AMS_AM_SPOT_AUTOTEASER", "Automatyczne wprowadzenie - teaser");
+define("_AMS_AM_SPOT_MAXLENGTH", "Maksymalna długość automatycznego wprowadzenia");
+define("_AMS_AM_SPOT_TEASER", "Nieautomatyczny tekst wprowadzenia");
+define("_AMS_AM_SPOT_TOPIC_DESC", "Jeśli wybrano 'Ostatnie artykuły w temacie', który temat powinien zostać wybrany?");
+define("_AMS_AM_SPOT_ARTICLE_DESC", "Jeśli wybrano 'Ostatnie artykuły', który artykuł powinien zostać pokazany ?");
+define("_AMS_AM_SPOT_CUSTOM", "Własny");
-define("_AMS_AM_PREFERENCES","Preferencje");
-define("_AMS_AM_GOMOD","Id¼ do modu³u");
-define("_AMS_AM_ABOUT","O module");
-define("_AMS_AM_MODADMIN","Administracja modu³u");
+define("_AMS_AM_PREFERENCES", "Preferencje");
+define("_AMS_AM_GOMOD", "Idź do modułu");
+define("_AMS_AM_ABOUT", "O module");
+define("_AMS_AM_MODADMIN", "Administracja modułu");
?>
\ No newline at end of file
Modified: XoopsLanguages/polish/modules/AMS/2.41/language/polish/blocks.php
===================================================================
--- XoopsLanguages/polish/modules/AMS/2.41/language/polish/blocks.php 2012-09-19 10:47:00 UTC (rev 10185)
+++ XoopsLanguages/polish/modules/AMS/2.41/language/polish/blocks.php 2012-09-19 20:50:05 UTC (rev 10186)
@@ -1,47 +1,47 @@
<?php
// $Id: blocks.php,v 1.1 2007/02/10 18:55:22 dap997 Exp $
-define("_AMS_MB_NEWS_NOTYET","Nie ma jeszcze dzisiaj Najwiêkszego Artyku³u.");
-define("_AMS_MB_NEWS_TMRSI","Dzisiaj najczê¶ciej czytan artyku³:");
-define("_AMS_MB_NEWS_ORDER","Segreguj wed³ug");
+define("_AMS_MB_NEWS_NOTYET","Nie ma jeszcze dzisiaj Największego Artykułu.");
+define("_AMS_MB_NEWS_TMRSI","Dzisiaj najczęściej czytan artykuł:");
+define("_AMS_MB_NEWS_ORDER","Segreguj według");
define("_AMS_MB_NEWS_DATE","Daty publikacji");
-define("_AMS_MB_NEWS_HITS","Liczby ods³on");
-define("_AMS_MB_NEWS_DISP","Wy¶wietl");
-define("_AMS_MB_NEWS_ARTCLS","artyku³y");
-define("_AMS_MB_NEWS_CHARS","D³ugo¶æ tytu³u");
+define("_AMS_MB_NEWS_HITS","Liczby odsłon");
+define("_AMS_MB_NEWS_DISP","Wyświetl");
+define("_AMS_MB_NEWS_ARTCLS","artykuły");
+define("_AMS_MB_NEWS_CHARS","Długość tytułu");
define("_AMS_MB_NEWS_LENGTH"," znaki");
-define("_AMS_MB_TITLE","Tytu³");
-define("_AMS_MB_POSTED","Napisany");
-define("_AMS_MB_POSTER","Autor");
-define("_AMS_MB_ACTION","Czynno¶æ");
-define("_AMS_MB_TOPIC","Temat");
-define("_AMS_MB_DELETE","Kasuj");
-define("_AMS_MB_NEWS_RESTRICTTOPICS","Ograniczyæ wgl±d do Tematu przez u¿ytkownika?");
-define("_AMS_MB_NEWS_TEASER","Poka¿ d³ugo¶æ trudnego pytania (0 brak)");
-define("_AMS_MB_NEWS_SPOTLIGHT","W³±cz prezentacjê Zainteresowania Publicznego");
-define("_AMS_MB_NEWS_FIRST","--Pierwszy element--");
-define("_AMS_MB_NEWS_IMAGE","Obrazek dla Zainteresowania Publicznego");
-define("_AMS_MB_NEWS_RATING","Ocena");
-define("_AMS_MB_NEWS_ARTCOUNT","Najwiêcej artyku³ów");
-define("_AMS_MB_NEWS_DISPLAYNAME","Wy¶wietl Nazwê");
-define("_AMS_MB_NEWS_USERNAME","U¿ytkownik");
-define("_AMS_MB_NEWS_REALNAME","Czas Realny");
-define('_AMS_MB_NEWS_COMPUTING','Metoda Podsumowania');
-define('_AMS_MB_NEWS_AVERAGE','¦rednio');
-define('_AMS_MB_NEWS_TOTAL','£±cznie');
-define('_AMS_MB_NEWS_ONECOLUMN','U¿yæ tej kolumny z Zainteresowaniem Publicznym?');
-define("_AMS_MB_NEWS_ALLTOPICS","Wszystkie tematy");
+define("_AMS_MB_TITLE", "Tytuł");
+define("_AMS_MB_POSTED", "Napisany");
+define("_AMS_MB_POSTER", "Autor");
+define("_AMS_MB_ACTION", "Czynność");
+define("_AMS_MB_TOPIC", "Temat");
+define("_AMS_MB_DELETE", "Kasuj");
+define("_AMS_MB_NEWS_RESTRICTTOPICS", "Ograniczyć wgląd do Tematu przez użytkownika?");
+define("_AMS_MB_NEWS_TEASER", "Pokaż długość trudnego pytania (0 brak)");
+define("_AMS_MB_NEWS_SPOTLIGHT", "Włącz prezentację Zainteresowania Publicznego");
+define("_AMS_MB_NEWS_FIRST", "--Pierwszy element--");
+define("_AMS_MB_NEWS_IMAGE", "Obrazek dla Zainteresowania Publicznego");
+define("_AMS_MB_NEWS_RATING", "Ocena");
+define("_AMS_MB_NEWS_ARTCOUNT", "Najwięcej artykułów");
+define("_AMS_MB_NEWS_DISPLAYNAME", "Wyświetl Nazwę");
+define("_AMS_MB_NEWS_USERNAME", "Użytkownik");
+define("_AMS_MB_NEWS_REALNAME", "Czas Realny");
+define('_AMS_MB_NEWS_COMPUTING', 'Metoda Podsumowania');
+define('_AMS_MB_NEWS_AVERAGE', 'Średnio');
+define('_AMS_MB_NEWS_TOTAL', 'Łącznie');
+define('_AMS_MB_NEWS_ONECOLUMN', 'Użyć tej kolumny z Zainteresowaniem Publicznym?');
+define("_AMS_MB_NEWS_ALLTOPICS", "Wszystkie tematy");
-define("_AMS_MB_SPOT_OTHERARTICLES","Inne artyku³y");
-define("_AMS_MB_SPOT_NUMARTICLES","Ilo¶æ pokazywanych 'Innych artyku³ów'");
-define("_AMS_MB_SPOT_SHOWMINISTATS","Poka¿ mini statystyki");
-define("_AMS_MB_SPOT_TOTALARTICLES","Artyku³ów w sumie");
-define("_AMS_MB_SPOT_TOTALREADS","Ca³o¶æ przeczytanych artyku³ów");
-define("_AMS_MB_SPOT_TOTALCOMMENTS","Ca³o¶æ komentarzy");
-define("_AMS_MB_READMORE","Czytaj wiêcej");
+define("_AMS_MB_SPOT_OTHERARTICLES", "Inne artykuły");
+define("_AMS_MB_SPOT_NUMARTICLES", "Ilość pokazywanych 'Innych artykułów'");
+define("_AMS_MB_SPOT_SHOWMINISTATS", "Pokaż mini statystyki");
+define("_AMS_MB_SPOT_TOTALARTICLES", "Artykułów w sumie");
+define("_AMS_MB_SPOT_TOTALREADS", "Całość przeczytanych artykułów");
+define("_AMS_MB_SPOT_TOTALCOMMENTS", "Całość komentarzy");
+define("_AMS_MB_READMORE", "Czytaj więcej");
-define("_AMS_MB_SPOTLIGHT_TEMPLATE","Wzór spotlight");
-define("_AMS_MB_SPOTLIGHT_TEMPLATE_DESC","Wzór u¿ywany w bloku spotlight");
-define("_AMS_MB_SPOTLIGHT_TEMPLATE_CENTER","Minis pod g³ównym");
-define("_AMS_MB_SPOTLIGHT_TEMPLATE_RIGHT","Minis na lewo od g³ównego");
-define("_AMS_MB_SPOTLIGHT_TEMPLATE_LEFT","Minis na prawo od g³ównego");
+define("_AMS_MB_SPOTLIGHT_TEMPLATE", "Wzór spotlight");
+define("_AMS_MB_SPOTLIGHT_TEMPLATE_DESC", "Wzór używany w bloku spotlight");
+define("_AMS_MB_SPOTLIGHT_TEMPLATE_CENTER", "Minis pod głównym");
+define("_AMS_MB_SPOTLIGHT_TEMPLATE_RIGHT", "Minis na lewo od głównego");
+define("_AMS_MB_SPOTLIGHT_TEMPLATE_LEFT", "Minis na prawo od głównego");
?>
\ No newline at end of file
Modified: XoopsLanguages/polish/modules/AMS/2.41/language/polish/main.php
===================================================================
--- XoopsLanguages/polish/modules/AMS/2.41/language/polish/main.php 2012-09-19 10:47:00 UTC (rev 10185)
+++ XoopsLanguages/polish/modules/AMS/2.41/language/polish/main.php 2012-09-19 20:50:05 UTC (rev 10186)
@@ -1,133 +1,133 @@
<?php
// $Id: main.php,v 1.1 2007/02/10 18:55:22 dap997 Exp $
//%%%%%% File Name index.php %%%%%
-define("_AMS_NW_PRINTER","Drukuj Stronê");
-define("_AMS_NW_SENDSTORY","Wy¶lij ten artyku³ znajomemu");
-define("_AMS_NW_READMORE","Czytaj wiêcej...");
+define("_AMS_NW_PRINTER","Drukuj Stronę");
+define("_AMS_NW_SENDSTORY","Wyślij ten artykuł znajomemu");
+define("_AMS_NW_READMORE","Czytaj więcej...");
define("_AMS_NW_COMMENTS","Skomentujesz?");
define("_AMS_NW_ONECOMMENT","1 komentarz");
-define("_AMS_NW_BYTESMORE","%s bajtów wiêcej");
+define("_AMS_NW_BYTESMORE","%s bajtów więcej");
define("_AMS_NW_NUMCOMMENTS","%s kamentarz(y)");
-define("_AMS_NW_MORERELEASES","Wiêcej wydañ w ");
+define("_AMS_NW_MORERELEASES", "Więcej wydań w ");
//%%%%%% File Name submit.php %%%%%
-define("_AMS_NW_SUBMITNEWS","Dodaj artyku³");
-define("_AMS_NW_TITLE","Tytu³");
+define("_AMS_NW_SUBMITNEWS","Dodaj artykuł");
+define("_AMS_NW_TITLE","Tytuł");
define("_AMS_NW_TOPIC","Temat");
-define("_AMS_NW_THESCOOP","Tekst Artyku³u");
+define("_AMS_NW_THESCOOP","Tekst Artykułu");
define("_AMS_NW_NOTIFYPUBLISH","Poinformuj mnie gdy zostanie opublikowany");
define("_AMS_NW_POST","Napisz");
-define("_AMS_NW_GO","Id¼!");
-define("_AMS_NW_THANKS","Dziêkujemy za napisanie artyku³u."); //submission of news article
+define("_AMS_NW_GO","Idź!");
+define("_AMS_NW_THANKS","Dziękujemy za napisanie artykułu."); //submission of news article
-define("_AMS_NW_NOTIFYSBJCT","Artyku³ na moj± stronê"); // Notification mail subject
-define("_AMS_NW_NOTIFYMSG","Masz now± wiadomo¶æ któr± mo¿esz przedstawiæ na swojej stronie."); // Notification mail message
+define("_AMS_NW_NOTIFYSBJCT","Artykuł na moją stronę"); // Notification mail subject
+define("_AMS_NW_NOTIFYMSG","Masz nową wiadomość którą możesz przedstawić na swojej stronie."); // Notification mail message
//%%%%%% File Name archive.php %%%%%
-define("_AMS_NW_NEWSARCHIVES","Archiwum artyku³ów");
-define("_AMS_NW_ARTICLES","Artyku³y");
-define("_AMS_NW_VIEWS","Ods³on");
+define("_AMS_NW_NEWSARCHIVES","Archiwum artykułów");
+define("_AMS_NW_ARTICLES","Artykuły");
+define("_AMS_NW_VIEWS","Odsłon");
define("_AMS_NW_DATE","Data");
-define("_AMS_NW_ACTIONS","Czynno¶æ");
-define("_AMS_NW_PRINTERFRIENDLY","Drukuj stronê");
+define("_AMS_NW_ACTIONS","Czynność");
+define("_AMS_NW_PRINTERFRIENDLY","Drukuj stronę");
-define("_AMS_NW_THEREAREINTOTAL","Wszystkich artyku³ów w Bazie : %s ");
+define("_AMS_NW_THEREAREINTOTAL","Wszystkich artykułów w Bazie : %s ");
// %s is your site name
-define("_AMS_NW_INTARTICLE","Ciekawy artyku³ na %s");
-define("_AMS_NW_INTARTFOUND","Znalaz³em ciekawy artyku³ na %s");
+define("_AMS_NW_INTARTICLE","Ciekawy artykuł na %s");
+define("_AMS_NW_INTARTFOUND","Znalazłem ciekawy artykuł na %s");
define("_AMS_NW_TOPICC","Temat:");
define("_AMS_NW_URL","URL:");
-define("_AMS_NW_NOSTORY","Przepraszamy, wybrany artyku³ nie istnieje.");
+define("_AMS_NW_NOSTORY","Przepraszamy, wybrany artykuł nie istnieje.");
//%%%%%% File Name print.php %%%%%
-define("_AMS_NW_URLFORSTORY","URL artyku³u to:");
+define("_AMS_NW_URLFORSTORY","URL artykułu to:");
// %s represents your site name
-define("_AMS_NW_THISCOMESFROM","Ten artyku³ pochodzi z %s");
+define("_AMS_NW_THISCOMESFROM","Ten artykuł pochodzi z %s");
// Added by Hervé
-define("_AMS_NW_ATTACHEDFILES","Do³±czone pliki:");
+define("_AMS_NW_ATTACHEDFILES","Dołączone pliki:");
-define("_AMS_NW_MAJOR","Najistotniejsze zmiany?");
-define("_AMS_NW_STORYID","ID Artyku³u");
-define("_AMS_NW_VERSION","Wersja");
-define("_AMS_NW_SETVERSION","Wybierz aktualn± wersjê");
-define("_AMS_NW_VERSIONUPDATED","Aktualna wersja ustawiona na %s");
-define("_AMS_NW_OVERRIDE","Przekroczenie");
-define("_AMS_NW_FINDVERSION","Znajd¼ wersjê");
-define("_AMS_NW_REVISION","Korekta");
-define("_AMS_NW_MINOR","Mniejsza korekta");
-define("_AMS_NW_VERSIONDESC","Wybierz poziom zmiany - Je¶li tego nie okre¶lisz, tekst nie zostanie zaktualizowany!");
-define("_AMS_NW_NOVERSIONCHANGE","Nie nast±pi³a zmiana wersji");
+define("_AMS_NW_MAJOR", "Najistotniejsze zmiany?");
+define("_AMS_NW_STORYID", "ID Artykułu");
+define("_AMS_NW_VERSION", "Wersja");
+define("_AMS_NW_SETVERSION", "Wybierz aktualną wersję");
+define("_AMS_NW_VERSIONUPDATED", "Aktualna wersja ustawiona na %s");
+define("_AMS_NW_OVERRIDE", "Przekroczenie");
+define("_AMS_NW_FINDVERSION", "Znajdź wersję");
+define("_AMS_NW_REVISION", "Korekta");
+define("_AMS_NW_MINOR", "Mniejsza korekta");
+define("_AMS_NW_VERSIONDESC", "Wybierz poziom zmiany - Jeśli tego nie określisz, tekst nie zostanie zaktualizowany!");
+define("_AMS_NW_NOVERSIONCHANGE", "Nie nastąpiła zmiana wersji");
-define("_AMS_NW_RATEARTICLE","Oceñ ten artyku³");
-define("_AMS_NW_RATE","Oceñ artyku³");
-define("_AMS_NW_SUBMITRATING","Potwierd¼ ocenê");
-define("_AMS_NW_RATING_SUCCESSFUL","Oceniono artyku³");
-define("_AMS_NW_PUBLISHED_DATE","Data publikacji: ");
-define("_AMS_NW_POSTEDBY","Autor");
-define("_AMS_NW_READS","Przeczytano");
-define("_AMS_NW_AUDIENCE","Czytelnicy");
-define('_AMS_NW_SWITCHAUTHOR',"Zaktualizowaæ autora?");
+define("_AMS_NW_RATEARTICLE", "Oceń ten artykuł");
+define("_AMS_NW_RATE", "Oceń artykuł");
+define("_AMS_NW_SUBMITRATING", "Potwierdź ocenę");
+define("_AMS_NW_RATING_SUCCESSFUL", "Oceniono artykuł");
+define("_AMS_NW_PUBLISHED_DATE", "Data publikacji: ");
+define("_AMS_NW_POSTEDBY", "Autor");
+define("_AMS_NW_READS", "Przeczytano");
+define("_AMS_NW_AUDIENCE", "Czytelnicy");
+define('_AMS_NW_SWITCHAUTHOR', "Zaktualizować autora?");
//Warnings
-define("_AMS_NW_VERSIONSEXIST","Istniej± %s wersje z wy¿sz± wersj± i <strong>zostan±</strong> nadpisane BEZ mo¿liwo¶ci odtworzenia:");
-define("_AMS_NW_AREYOUSUREOVERRIDE","Czy napewno chcesz zamieniæ te wersje");
-define("_AMS_NW_CONFLICTWHAT2DO","An article with the calculated version number exists<br />What do You want to do?<br />Override: This version is saved with the calculated version number and all higher versions in the same version group (xx.xx.xx) will be deleted<br />Find Version: Let the system find the next available version in the same version group");
-define("_AMS_NW_VERSIONCONFLICT","Konflikt wersji");
-define("_AMS_NW_TRYINGTOSAVE","Próba zapisu ");
+define("_AMS_NW_VERSIONSEXIST", "Istnieją %s wersje z wyższą wersją i <strong>zostaną</strong> nadpisane BEZ możliwości odtworzenia:");
+define("_AMS_NW_AREYOUSUREOVERRIDE", "Czy napewno chcesz zamienić te wersje");
+define("_AMS_NW_CONFLICTWHAT2DO", "An article with the calculated version number exists<br />What do You want to do?<br />Override: This version is saved with the calculated version number and all higher versions in the same version group (xx.xx.xx) will be deleted<br />Find Version: Let the system find the next available version in the same version group");
+define("_AMS_NW_VERSIONCONFLICT", "Konflikt wersji");
+define("_AMS_NW_TRYINGTOSAVE", "Próba zapisu ");
//Error messages
-define("_AMS_NW_ERROR","Wyst±pi³ b³±d!");
-define("_AMS_NW_RATING_FAILED","Ocenianie nie powiod³o siê");
-define("_AMS_NW_SAVEFAILED","B³±d podczas zapisywania artyku³u");
-define("_AMS_NW_TEXTSAVEFAILED","Nie mo¿na zapisaæ tekstu artyku³u");
-define("_AMS_NW_VERSIONUPDATEFAILED","Nie mo¿na zaktualizowaæ wersji");
-define("_AMS_NW_COULDNOTRESET","Nie mo¿na wyczy¶ciæ wersji");
-define("_AMS_NW_COULDNOTUPDATEVERSION","Nie mo¿na zmieniæ do obecnej wersji");
+define("_AMS_NW_ERROR", "Wystąpił błąd!");
+define("_AMS_NW_RATING_FAILED", "Ocenianie nie powiodło się");
+define("_AMS_NW_SAVEFAILED", "Błąd podczas zapisywania artykułu");
+define("_AMS_NW_TEXTSAVEFAILED", "Nie można zapisać tekstu artykułu");
+define("_AMS_NW_VERSIONUPDATEFAILED", "Nie można zaktualizować wersji");
+define("_AMS_NW_COULDNOTRESET", "Nie można wyczyścić wersji");
+define("_AMS_NW_COULDNOTUPDATEVERSION", "Nie można zmienić do obecnej wersji");
-define("_AMS_NW_COULDNOTSAVERATING","Nie mo¿na zapisaæ oceny");
-define("_AMS_NW_COULDNOTUPDATERATING","Nie mo¿na zaktualizowaæ oceny artyku³u");
+define("_AMS_NW_COULDNOTSAVERATING", "Nie można zapisać oceny");
+define("_AMS_NW_COULDNOTUPDATERATING", "Nie można zaktualizować oceny artykułu");
-define("_AMS_NW_COULDNOTADDLINK","Nie mo¿na powi±zaæ linku z tym artyku³em");
-define("_AMS_NW_COULDNOTDELLINK","B³±d - Nie usuniêto linka");
+define("_AMS_NW_COULDNOTADDLINK", "Nie można powiązać linku z tym artykułem");
+define("_AMS_NW_COULDNOTDELLINK", "Błąd - Nie usunięto linka");
-define("_AMS_NW_CANNOTVOTESELF","Autor nie mo¿e oceniaæ artyku³u");
-define("_AMS_NW_ANONYMOUSVOTEDISABLED","Ocenianie przez niezarejestrowanych u¿ytkowników wy³±czone");
-define("_AMS_NW_ANONYMOUSHASVOTED","Kto¶ z tego IP ju¿ oceni³ ten artyku³");
-define("_AMS_NW_USERHASVOTED","Ju¿ oceni³e¶ ten artyku³");
+define("_AMS_NW_CANNOTVOTESELF", "Autor nie może oceniać artykułu");
+define("_AMS_NW_ANONYMOUSVOTEDISABLED", "Ocenianie przez niezarejestrowanych użytkowników wyłączone");
+define("_AMS_NW_ANONYMOUSHASVOTED", "Ktoś z tego IP już ocenił ten artykuł");
+define("_AMS_NW_USERHASVOTED", "Już oceniłeś ten artykuł");
-define("_AMS_NW_NOTALLOWEDAUDIENCE","Nie mo¿esz czytaæ artyku³ów %s poziomu");
-define("_AMS_NW_NOERRORSENCOUNTERED","Nie wyliczono ¿adnych b³êdów");
+define("_AMS_NW_NOTALLOWEDAUDIENCE", "Nie możesz czytać artykułów %s poziomu");
+define("_AMS_NW_NOERRORSENCOUNTERED", "Nie wyliczono żadnych błędów");
//Additional constants
-define("_AMS_NW_USERNAME","U¿ytkownik");
-define("_AMS_NW_ADDLINK","Dodaj Link(i)");
-define("_AMS_NW_DELLINK","Usuñ Link(i)");
-define("_AMS_NW_RELATEDARTICLES","Zalecone odczytywanie");
-define("_AMS_NW_SEARCHRESULTS","Wyniki Szukania:");
-define("_AMS_NW_MANAGELINK","Linki");
-define("_AMS_NW_DELVERSIONS","Usuñ wersje poni¿ej tej wersji");
-define("_AMS_NW_DELALLVERSIONS","Usuñ wszystkie wersje na równi z t± wersj±");
-define("_AMS_NW_SUBMIT","Zatwierd¼");
-define("_AMS_NW_RUSUREDELVERSIONS","Czy na pewno chcesz usun±æ wszystkie wersje bêd±ce Poza Zasiêgiem Odtworzenia!!! poni¿ej tej wersji?");
-define("_AMS_NW_RUSUREDELALLVERSIONS","Czy na pewno chcesz usun±æ wszystkie wersje bêd±ce Poza Zasiêgiem Odtworzenia!!! na równi z t± wersj±?");
-define("_AMS_NW_EXTERNALLINK","Linki zewnêtrzne");
-define("_AMS_NW_ADDEXTERNALLINK","Dodaj zewnêtrzny link");
-define("_AMS_NW_PREREQUISITEARTICLES","Warunek wstêpny czytania");
-define("_AMS_NW_LINKTYPE","Typ Linku");
-define("_AMS_NW_SETTITLE","Ustaw tytu³ Linku");
-define("_AMS_NW_BANNER","Banner/Sponsor");
+define("_AMS_NW_USERNAME", "Użytkownik");
+define("_AMS_NW_ADDLINK", "Dodaj Link(i)");
+define("_AMS...
[truncated message content] |
|
From: <ir...@us...> - 2012-09-19 10:47:10
|
Revision: 10185
http://xoops.svn.sourceforge.net/xoops/?rev=10185&view=rev
Author: irmtfan
Date: 2012-09-19 10:47:00 +0000 (Wed, 19 Sep 2012)
Log Message:
-----------
fix bug: delete child posts first, pagenav select, missing xoops_module_header smarty
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
XoopsModules/newbb/branches/irmtfan/newbb/edit.php
XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/post.php
XoopsModules/newbb/branches/irmtfan/newbb/reply.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-19 10:47:00 UTC (rev 10185)
@@ -1,3 +1,16 @@
+date 2012-09-19
+===================================
+1- bug fix: in post delete process: wrongly delete parent post before childs but the right way is deleting childs before deleting parent post.(reverse order deleting)
+in newbb/class/post.php
+
+2- bug fix: solve nested forms issue when the pagenav type is select
+in newbb/templates/newbb_viewall.html, newbb/templates/newbb_viewforum.html,
+newbb/templates/newbb_viewpost.html, newbb/templates/newbb_viewtopic.html
+
+3- bug fix: xoops_module_header smarty variable is missing.
+newbb/edit.php, newbb/newtopic.php, newbb/post.php, newbb/reply.php
+
+
date 2012-09-18
===================================
1- bug fix: in topic delete process: in view all and view forum: after delete selected topics all topics and their posts will be wrongly deleted from database.(very important)
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-09-19 10:47:00 UTC (rev 10185)
@@ -810,7 +810,8 @@
require_once XOOPS_ROOT_PATH . "/class/xoopstree.php";
$mytree = new XoopsTree($this->db->prefix("bb_posts"), "post_id", "pid");
$arr = $mytree->getAllChild($post->getVar('post_id'));
- for ($i = 0; $i < count($arr); $i++) {
+ // irmtfan - delete childs in a reverse order
+ for ($i = count($arr) - 1; $i >= 0 ; $i--) {
$childpost =& $this->create(false);
$childpost->assignVars($arr[$i]);
$this->_delete($childpost, $force);
Modified: XoopsModules/newbb/branches/irmtfan/newbb/edit.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/edit.php 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/edit.php 2012-09-19 10:47:00 UTC (rev 10185)
@@ -75,7 +75,10 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
+// irmtfan add xoops_module_header
+$xoopsOption['xoops_module_header']= $xoops_module_header;
include XOOPS_ROOT_PATH.'/header.php';
+$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
/*
$xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php 2012-09-19 10:47:00 UTC (rev 10185)
@@ -50,7 +50,10 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0; // Disable cache
+// irmtfan add xoops_module_header
+$xoopsOption['xoops_module_header']= $xoops_module_header;
include XOOPS_ROOT_PATH.'/header.php';
+$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
/*
$xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-09-19 10:47:00 UTC (rev 10185)
@@ -411,7 +411,10 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
+// irmtfan add xoops_module_header
+$xoopsOption['xoops_module_header']= $xoops_module_header;
include XOOPS_ROOT_PATH . "/header.php";
+$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
if ( !empty($_POST['contents_upload']) ) {
$attachments_tmp = array();
Modified: XoopsModules/newbb/branches/irmtfan/newbb/reply.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/reply.php 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/reply.php 2012-09-19 10:47:00 UTC (rev 10185)
@@ -86,7 +86,10 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
+// irmtfan add xoops_module_header
+$xoopsOption['xoops_module_header']= $xoops_module_header;
include XOOPS_ROOT_PATH.'/header.php';
+$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
/*
$xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html 2012-09-19 10:47:00 UTC (rev 10185)
@@ -123,7 +123,7 @@
</div>
<!-- irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" -->
<div class="pagenav">
-<{$pagenav}>
+<{$pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue -->
</div>
</div>
<div class="clear"></div>
@@ -203,7 +203,7 @@
<{if $pagenav}>
<!-- irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" -->
-<div class="pagenav"><{$pagenav}></div>
+<div class="pagenav"><{$pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --></div>
<br />
<{/if}>
<div class="clear"></div>
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html 2012-09-19 10:47:00 UTC (rev 10185)
@@ -76,7 +76,7 @@
</div>
<!-- irmtfan hardcode removed style="float: right; text-align:right;" -->
<div class="icon_right">
- <{$forum_pagenav}>
+ <{$forum_pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue -->
</div>
</div>
<div class="clear"></div>
@@ -184,7 +184,7 @@
<{$forum_addpoll}> <{$forum_post_or_register}>
</div>
<div class="right">
- <{$forum_pagenav}>
+ <{$forum_pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue -->
</div>
</div>
<div class="clear"></div>
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html 2012-09-19 10:47:00 UTC (rev 10185)
@@ -82,7 +82,7 @@
</div>
<!-- irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" -->
<div class="pagenav">
- <{$pagenav}>
+ <{$pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue -->
</div>
</div>
<div class="clear"></div>
@@ -116,7 +116,7 @@
</div>
<!-- irmtfan hardcode removed style="float: right; text-align:right;" -->
<div class="icon_right">
- <{$pagenav}>
+ <{$pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue -->
</div>
</div>
<div class="clear"></div>
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-18 09:51:54 UTC (rev 10184)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-19 10:47:00 UTC (rev 10185)
@@ -151,7 +151,7 @@
</div>
<!-- irmtfan hardcode removed style="float: right; text-align:right;" -->
<div class="icon_right">
- <{$forum_page_nav}>
+ <{$forum_page_nav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue -->
</div>
</div>
<div class="clear"></div>
@@ -205,7 +205,7 @@
</div>
<!-- irmtfan hardcode removed style="float: right; text-align:right;"" -->
<div class="icon_right">
- <{$forum_page_nav}>
+ <{$forum_page_nav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue -->
</div>
</div>
<div class="clear"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ir...@us...> - 2012-09-18 09:52:05
|
Revision: 10184
http://xoops.svn.sourceforge.net/xoops/?rev=10184&view=rev
Author: irmtfan
Date: 2012-09-18 09:51:54 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
bug fix: delete, pending, restore functionality (very important)
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php
XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt
XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html
XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -96,7 +96,8 @@
$topics_obj =& $topic_handler->getAll(new Criteria("topic_id", "(".implode(",", $topic_id).")", "IN"));
foreach (array_keys($topics_obj) as $id) {
$topic_obj =& $topics_obj[$id];
- $topic_handler->delete($topic_obj,true);
+ // irmtfan should be set to false to not delete topic from database
+ $topic_handler->delete($topic_obj,false);
$topic_handler->synchronization($topic_obj);
$forums[$topic_obj->getVar("forum_id")] = 1;
}
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -9,7 +9,7 @@
* @version $Id: admin_synchronization.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb
*/
-
+// irmtfan - TODO - should be changed completly with Newbb new function newbb_synchronization
include 'admin_header.php';
xoops_cp_header();
@@ -84,7 +84,8 @@
$forums_obj[$key]->setVar("forum_posts", $posts);
}
}
- $sql = "SELECT COUNT(*) AS total FROM ".$xoopsDB->prefix("bb_topics")." WHERE approved=1 AND forum_id = ".$key;
+ // irmtfan approved=1 AND
+ $sql = "SELECT COUNT(*) AS total FROM ".$xoopsDB->prefix("bb_topics")." WHERE forum_id = ".$key;
$result = $xoopsDB->query($sql);
if ( $row = $xoopsDB->fetchArray($result) ) {
if ($forums_obj[$key]->getVar("forum_topics") != $row['total']) {
@@ -105,9 +106,10 @@
if ($start >= ($count = $topic_handler->getCount(new Criteria("approved", 1))) ) {
break;
}
+ // irmtfan WHERE approved=1
$sql = " SELECT topic_id, topic_last_post_id, topic_replies".
" FROM " . $xoopsDB->prefix("bb_topics") .
- " WHERE approved=1";
+ " ";
$result = $xoopsDB->query($sql, $limit, $start);
while ( list($topic_id, $last_post, $replies) = $xoopsDB->fetchRow($result) ) {
$sql = " SELECT MAX(post_id) AS last_post, COUNT(*) - 1 AS replies ".
@@ -133,14 +135,16 @@
if ($start >= ($count = $post_handler->getCount(new Criteria("approved", 1))) ) {
break;
}
+ // irmtfan WHERE approved=1 AND
$sql = " SELECT topic_id".
" FROM " . $xoopsDB->prefix("bb_topics") .
- " WHERE approved=1";
+ " ";
$result = $xoopsDB->query($sql, $limit, $start);
while ( list($topic_id) = $xoopsDB->fetchRow($result) ) {
+ // irmtfan approved=1 AND
$sql = " SELECT MIN(post_id) AS top_post".
" FROM " . $xoopsDB->prefix("bb_posts") .
- " WHERE approved=1 AND topic_id = {$topic_id}";
+ " WHERE topic_id = {$topic_id}";
$ret = $xoopsDB->query($sql);
list($top_post) = $xoopsDB->fetchRow($ret);
$sql = " UPDATE ".$xoopsDB->prefix("bb_posts").
@@ -174,21 +178,22 @@
" FROM " . $xoopsDB->prefix("users");
$result = $xoopsDB->query($sql, $limit, $start);
while ( list($uid) = $xoopsDB->fetchRow($result) ) {
+ // irmtfan approved=1 AND
$sql = " SELECT count(*)".
" FROM " . $xoopsDB->prefix("bb_topics") .
- " WHERE approved=1 AND topic_poster = {$uid}";
+ " WHERE topic_poster = {$uid}";
$ret = $xoopsDB->query($sql);
list($topics) = $xoopsDB->fetchRow($ret);
-
+ // irmtfan approved=1 AND
$sql = " SELECT count(*)".
" FROM " . $xoopsDB->prefix("bb_topics") .
- " WHERE approved=1 AND topic_digest > 0 AND topic_poster = {$uid}";
+ " WHERE topic_digest > 0 AND topic_poster = {$uid}";
$ret = $xoopsDB->query($sql);
list($digests) = $xoopsDB->fetchRow($ret);
-
+ // irmtfan approved=1 AND
$sql = " SELECT count(*), MAX(post_time)".
" FROM " . $xoopsDB->prefix("bb_posts") .
- " WHERE approved=1 AND uid = {$uid}";
+ " WHERE uid = {$uid}";
$ret = $xoopsDB->query($sql);
list($posts, $lastpost) = $xoopsDB->fetchRow($ret);
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-18 09:51:54 UTC (rev 10184)
@@ -1,3 +1,45 @@
+date 2012-09-18
+===================================
+1- bug fix: in topic delete process: in view all and view forum: after delete selected topics all topics and their posts will be wrongly deleted from database.(very important)
+in newbb/action.topic.php
+
+2- bug fix: in post restore process: it will not approve post if approved = -1 (deleted) (important)
+in newbb/class/post.php
+
+3- bug fix: in post delete process: wrongly set new pid for not approved posts and set pid=0(very important)
+in newbb/class/post.php
+
+4- bug fix: wrongly check topic is not object after set it as object (important)
+in newbb/class/topic.php
+
+5- bug fix: in view all topic page: if empty($_GET(status)) it will show all topics include deleted and pendings.
+in newbb/list.topic.php
+
+6- bug fix: sync topic not added after delete
+in newbb/topicmanager.php
+
+7- bug fix: remove unneeded codes: manually approve posts after restore
+in newbb/topicmanager.php
+
+8- improve: ability to restore a topic in viewtopic page
+in newbb/topicmanager.php, newbb/viewtopic.php
+newbb/language/english/main.php, newbb/docs/lang_diff.txt
+
+9- fix: slash "/" missing in URL
+in newbb/topicmanager.php
+
+10- fix: add "mode" smarty variable in viewforum to see admin links
+in newbb/viewforum.php
+
+11- improve: in view all topic page: show all admin links in admin mode in the initial page loading
+newbb/templates/newbb_viewall.html
+
+12- bug fix: admin main sync wrongly delete all pending and deleted posts/topics (very important)
+in newbb/admin_synchronization.php
+
+13- bug fix: admin main sync (misc) wrongly delete all pending and deleted posts/topics when the pending_expire=0 in newbb/include/plugin.php (very important)
+in newbb/class/post.php, newbb/class/topic.php
+
date 2012-09-16
===================================
1- improve: Add forum_post_prefix smarty variable to have unique Ids for posts. Add js function to scroll to current post in viewtopic.php links.
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -634,7 +634,8 @@
$post_id = $post->getVar("post_id");
$wasApproved = $post->getVar("approved");
- if (empty($force) && $wasApproved) {
+ // irmtfan approve post if the approved = 0 (pending) or -1 (deleted)
+ if (empty($force) && $wasApproved > 0) {
return true;
}
$post->setVar("approved", 1);
@@ -913,10 +914,12 @@
unset($poster);
}
}
-
- $sql = "UPDATE " . $this->db->prefix("bb_posts") . " SET pid = " . $post->getVar('pid') . " WHERE pid=" . $post->getVar('post_id');
- if (!$result = $this->db->queryF($sql)) {
- //xoops_error($this->db->error());
+ // irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
+ if (!$post->isTopic()) {
+ $sql = "UPDATE " . $this->db->prefix("bb_posts") . " SET pid = " . $post->getVar('pid') . " WHERE approved=1 AND pid=" . $post->getVar('post_id');
+ if (!$result = $this->db->queryF($sql)) {
+ //xoops_error($this->db->error());
+ }
}
}
@@ -1010,6 +1013,12 @@
*/
function cleanExpires($expire = 0)
{
+ // irmtfan if 0 no cleanup look include/plugin.php
+ if (!func_num_args()){
+ $newbbConfig = newbb_load_config();
+ $expire = isset($newbbConfig["pending_expire"]) ? intval($newbbConfig["pending_expire"]) : 7;
+ }
+ if (empty($expire)) return false;
$crit_expire = new CriteriaCompo(new Criteria("approved", 0, "<="));
//if (!empty($expire)) {
$crit_expire->add(new Criteria("post_time", time()-intval($expire), "<"));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -414,6 +414,12 @@
*/
function cleanExpires($expire = 0)
{
+ // irmtfan if 0 no cleanup look include/plugin.php
+ if (!func_num_args()){
+ $newbbConfig = newbb_load_config();
+ $expire = isset($newbbConfig["pending_expire"]) ? intval($newbbConfig["pending_expire"]) : 7;
+ }
+ if (empty($expire)) return false;
$crit_expire = new CriteriaCompo(new Criteria("approved", 0, "<="));
$crit_expire->add(new Criteria("topic_time", time() - intval($expire), "<"));
return $this->deleteAll($crit_expire, true/*, true*/);
@@ -424,7 +430,8 @@
if (!is_object($object)) {
$object =& $this->get(intval($object));
}
- if (!is_object($object) || !$object->getVar("topic_id")) return false;
+ // irmtfan bad coding error - $object is object now
+ if (!$object->getVar("topic_id")) return false;
$sql = " SELECT MAX(post_id) AS last_post, COUNT(*) AS total ".
" FROM " . $this->db->prefix("bb_posts") .
Modified: XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt 2012-09-18 09:51:54 UTC (rev 10184)
@@ -46,3 +46,7 @@
define('_MD_NEWBB_HIDEUSERDATA','Hide User information');
define('_MD_NEWBB_HIDE','Hide');
define('_MD_NEWBB_SEE','See');
+
+define('_MD_RESTORETOPIC','Restore this topic');
+define('_MD_TOPICRESTORE','The topic has been restored.');
+define('_MD_DESC_RESTORE','Once you press the restore button at the bottom of this form the topic you have selected, and all its related posts, will be restored.');
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -154,6 +154,8 @@
define('_MD_MERGETOPIC','Merge this topic');
define('_MD_MOVETOPIC','Move this topic');
define('_MD_DELETETOPIC','Delete this topic');
+// irmtfan add restore to viewtopic
+define('_MD_RESTORETOPIC','Restore this topic');
define('_MD_TOP','Top');
define('_MD_BOTTOM','Bottom');
define('_MD_PREVTOPIC','Previous Topic');
@@ -285,6 +287,8 @@
define('_MD_ERROR_BACK','Error - Please go back and try again.');
define('_MD_GOTONEWFORUM','View the updated topic');
define('_MD_TOPICDELETE','The topic has been deleted.');
+// irmtfan add restore to viewtopic
+define('_MD_TOPICRESTORE','The topic has been restored.');
define('_MD_TOPICMERGE','The topic has been merged.');
define('_MD_TOPICMOVE','The topic has been moved.');
define('_MD_TOPICLOCK','The topic has been locked.');
@@ -303,6 +307,8 @@
define('_MD_DIGEST','Digest');
define('_MD_UNDIGEST','unDigest');
define('_MD_DESC_DELETE','Once you press the delete button at the bottom of this form the topic you have selected, and all its related posts, will be <strong>permanently</strong> removed.');
+// irmtfan add restore to viewtopic
+define('_MD_DESC_RESTORE','Once you press the restore button at the bottom of this form the topic you have selected, and all its related posts, will be restored.');
define('_MD_DESC_MOVE','Once you press the move button at the bottom of this form the topic you have selected, and its related posts, will be moved to the forum you have selected.');
define('_MD_DESC_MERGE','Once you press the merge button at the bottom of this form the topic you have selected, and its related posts, will be merged to the topic you have selected.<br /><strong>The destination topic ID must be smaller than current one</strong>.');
define('_MD_DESC_LOCK','Once you press the lock button at the bottom of this form the topic you have selected will be locked. You may unlock it at a later time if you like.');
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -62,7 +62,7 @@
//page_header.php
define('_MD_MODERATEDBY','نظارت توسط');
define('_MD_SEARCH','جستجو');
-define('_MD_FORUMINDEX','%s صفحهی اصلی انجمنها');
+define('_MD_FORUMINDEX','صفحهی اصلی انجمنها');
define('_MD_POSTNEW','ارسال عنوان جدید');
define('_MD_REGTOPOST','برای ارسال پیام باید ابتدا ثبت نام کنید');
@@ -154,6 +154,8 @@
define('_MD_MERGETOPIC','این عنوان را ادغام کن');
define('_MD_MOVETOPIC','این عنوان را منتقل کن');
define('_MD_DELETETOPIC','این عنوان را حذف کن');
+// irmtfan add restore to viewtopic
+define('_MD_RESTORETOPIC','این عنوان را بازیابی کن');
define('_MD_TOP','بالا');
define('_MD_BOTTOM','پایین');
define('_MD_PREVTOPIC','پیام قبلی');
@@ -284,14 +286,16 @@
define('_MD_RETURNFORUMINDEX','بازگشت به صفحهی اصلی انجمنها');
define('_MD_ERROR_BACK','خطا - لطفا بازگردید و دوباره سعی کنید.');
define('_MD_GOTONEWFORUM','دیدن عنوانهای به روز شده');
-define('_MD_TOPICDELETE','عنوان حذف شده.');
-define('_MD_TOPICMERGE','عنوان ادغام شده.');
-define('_MD_TOPICMOVE','عنوان منتقل شده.');
-define('_MD_TOPICLOCK','عنوان مورد نظر قفل شده.');
+define('_MD_TOPICDELETE','عنوان حذف شده است.');
+// irmtfan add restore to viewtopic
+define('_MD_TOPICRESTORE','عنوان بازیابی شده است.');
+define('_MD_TOPICMERGE','عنوان ادغام شده است.');
+define('_MD_TOPICMOVE','عنوان منتقل شده است.');
+define('_MD_TOPICLOCK','عنوان مورد نظر قفل شده است.');
define('_MD_TOPICUNLOCK','قفل عنوان مورد نظر باز شد.');
-define('_MD_TOPICSTICKY','عنوان مورد نظر مهم(چسبان) شده.');
+define('_MD_TOPICSTICKY','عنوان مورد نظر مهم(چسبان) شده است.');
define('_MD_TOPICUNSTICKY','عنوان مورد نظر از حالت مهم(چسبان) در آمده.');
-define('_MD_TOPICDIGEST','عنوان خلاصه شده.');
+define('_MD_TOPICDIGEST','عنوان خلاصه شده است.');
define('_MD_TOPICUNDIGEST','عنوان از خلاصه درآمده.');
define('_MD_DELETE','حذف کن');
define('_MD_MOVE','منتقلکن');
@@ -303,6 +307,7 @@
define('_MD_DIGEST','خلاصه کن');
define('_MD_UNDIGEST','غیر خلاصه کن');
define('_MD_DESC_DELETE','وقتی شما دکمه حذف کن را در پایین میزنید؛ این عنوان که انتخاب کرده اید به همراه تمام پیامهای نوشته شده و متعلق به آن <strong>کاملاً</strong>حذف خواهند شد.');
+define('_MD_DESC_RESTORE','وقتی شما دکمه بازیابی کن را در پایین میزنید؛ این عنوان که انتخاب کرده اید به همراه تمام پیامهای نوشته شده و متعلق به آن بازیابی خواهند شد.');
define('_MD_DESC_MOVE','وقتی شما دکمه منتقل کن در پایین را میزنید، این عنوان که انتخاب کرده اید به همراه تمام پیامهای نوشته شده و متعلق به آن به انجمنی که انتخاب کرده اید منتقل میشود.');
define('_MD_DESC_MERGE','وقتی شما دکمه ادغام کن در پایین را میزنید، این عنوان که انتخاب کرده اید به همراه تمام پیامهای نوشته شده و متعلق به آن با عنوانی که انتخاب خواهید کرد ادغام می شود.<br /><strong>شماره شناسایی (ID) عنوان مقصد باید کوچکتر از این عنوان باشد</strong>.');
define('_MD_DESC_LOCK','وقتی شما دکمه قفل کن در پایین را میزنید، این عنوان که انتخاب کرده اید قفل خواهد شد. شما بعدا اگر بخواهید دوباره می توانید آن را از حالت قفل خارج کنید.');
Modified: XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -33,6 +33,8 @@
$type = intval( @$_GET['type'] );
$status = (!empty($_GET['status']) && in_array($_GET['status'], array("active", "pending", "deleted", "digest", "unreplied", "unread")))? $_GET['status'] : "all";
+//irmtfan parse status for rendering topic correctly - if empty($_GET(status)) it will show all topics include deleted and pendings.
+$topic_renderer->parseVar('status',$status);
$mode = (!empty($status) && in_array($status, array("active", "pending", "deleted"))) ? 2 : (!empty($_GET['mode']) ? intval($_GET['mode']) : 0);
$isadmin = $GLOBALS["xoopsUserIsAdmin"];
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html 2012-09-18 09:51:54 UTC (rev 10184)
@@ -45,13 +45,16 @@
<input type="hidden" name="forum_id" value="<{$forum_id}>" />
<input type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" /> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
-<{elseif $mode eq 1}>
+<!-- irmtfan remove < { elseif $mode eq 1} > to show all admin links in admin mode in the initial page loading -->
+<{else}>
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php" target="_self" title="<{$smarty.const._MD_TYPE_SUSPEND}>"><{$smarty.const._MD_TYPE_SUSPEND}></a>
-<{else}>
-<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?mode=1#admin" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
+<!-- irmtfan remove < { else } > no need for mode=1
+< { else } >
+<!--<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?mode=1#admin" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
+-->
<{/if}>
</div>
<br />
Modified: XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -70,8 +70,8 @@
$online_handler =& xoops_getmodulehandler('online', 'newbb');
$online_handler->init($forum);
}
-
-$action_array = array('merge', 'delete','move','lock','unlock','sticky','unsticky','digest','undigest');
+// irmtfan add restore to viewtopic
+$action_array = array('merge', 'delete','restore', 'move','lock','unlock','sticky','unsticky','digest','undigest');
foreach ($action_array as $_action) {
$action[$_action] = array(
"name" => $_action,
@@ -98,6 +98,8 @@
foreach ($topic_id as $tid) {
$topic_obj =& $topic_handler->get($tid);
$topic_handler->delete($topic_obj,false);
+ // irmtfan - sync topic after delete
+ $topic_handler->synchronization($topic_obj);
$forum_handler->synchronization($forum);
//$topic_obj->loadFilters("delete");
//sync($topic_id, "topic");
@@ -115,16 +117,20 @@
$topic_handler->synchronization($topic_obj);
$forums[$topic_obj->getVar("forum_id")] = 1;
}
- $criteria = new Criteria('topic_id', "(".implode(",", $topic_id).")", "IN");
- $post_handler =& xoops_getmodulehandler('post', 'newbb');
- $post_handler->updateAll("approved", 1, $criteria, true);
+ //irmtfan remove - no need to approve posts manually - see class/post.php approve function
$criteria_forum = new Criteria("forum_id", "(".implode(",", array_keys($forums)).")", "IN");
$forums_obj =& $forum_handler->getAll($criteria_forum);
foreach (array_keys($forums_obj) as $id) {
$forum_handler->synchronization($forums_obj[$id]);
}
- unset($topics_obj, $forums_obj);
- echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+ unset($topics_obj, $forums_obj);
+ // irmtfan add restore to viewtopic
+ $restoretopic_id=$topic_obj->getVar("topic_id");
+ // irmtfan / missing in URL
+ echo $action[$mode]['msg'].
+ "<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id=$restoretopic_id'>"._MD_VIEWTHETOPIC."</a></p>".
+ "<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p>".
+ "<p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} elseif ('merge' == $mode) {
$post_handler =& xoops_getmodulehandler('post', 'newbb');
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -44,6 +44,8 @@
$forum_id = intval($_GET['forum']);
$type = @intval($_GET['type']);
$status = (!empty($_GET['status']) && in_array($_GET['status'], array("active", "pending", "deleted", "digest", "unreplied", "unread")))? $_GET['status'] : "";
+// irmtfan add mode
+$mode = (!empty($status) && in_array($status, array("active", "pending", "deleted"))) ? 2 : (!empty($_GET['mode']) ? intval($_GET['mode']) : 0);
$forum_handler = xoops_getmodulehandler('forum', 'newbb');
$forum_obj = $forum_handler->get($forum_id);
@@ -81,8 +83,11 @@
/* Only admin has access to admin mode */
if (!$isadmin) {
$status = (!empty($status) && in_array($status, array("active", "pending", "deleted"))) ? "" : $status;
+ // irmtfan add mode
+ $mode=0;
}
-
+// irmtfan add mode
+$xoopsTpl->assign('mode', $mode);
$xoopsTpl->assign('status', $status);
if ( $isadmin ) {
$xoopsTpl->assign('forum_index_cpanel',array("link" => "admin/index.php", "name" => _MD_ADMINCP));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-09-17 13:16:30 UTC (rev 10183)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-09-18 09:51:54 UTC (rev 10184)
@@ -312,6 +312,8 @@
$ad_merge = "";
$ad_move = "";
$ad_delete = "";
+// irmtfan add restore to viewtopic
+$ad_restore="";
$ad_lock = "";
$ad_unlock = "";
$ad_sticky = "";
@@ -319,6 +321,9 @@
$ad_digest = "";
$ad_undigest = "";
+// START irmtfan add restore to viewtopic
+// if the topic is active
+if ($topic_obj->getVar('approved') > 0 ){
$admin_actions['merge'] = array(
"link" => XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname", "n").'/topicmanager.php?mode=merge&topic_id='.$topic_id,
"name" => _MD_MERGETOPIC,
@@ -364,6 +369,15 @@
"image" => $ad_undigest,
"name" => _MD_UNDIGESTTOPIC);
}
+// if the topic is pending/deleted then restore/approve
+}else{
+$admin_actions['restore'] = array(
+ "link" => XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname", "n").'/topicmanager.php?mode=restore&topic_id='.$topic_id,
+ "name" => _MD_RESTORETOPIC,
+ "image" => $ad_restore);
+}
+// END irmtfan add restore to viewtopic
+
$xoopsTpl->assign_by_ref('admin_actions', $admin_actions);
$xoopsTpl->assign('viewer_level', intval(($isadmin) ? 2 : is_object($xoopsUser)) );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-09-17 13:16:41
|
Revision: 10183
http://xoops.svn.sourceforge.net/xoops/?rev=10183&view=rev
Author: djculex
Date: 2012-09-17 13:16:30 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
error in E_STRICT error
Modified Paths:
--------------
XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/language/danish/logger.php
Modified: XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/language/danish/logger.php
===================================================================
--- XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/language/danish/logger.php 2012-09-17 09:44:32 UTC (rev 10182)
+++ XoopsLanguages/danish/core/2.6.0 Alpha-1/htdocs/language/danish/logger.php 2012-09-17 13:16:30 UTC (rev 10183)
@@ -53,7 +53,7 @@
define("_LOGGER_E_USER_ERROR","Fejl");
define("_LOGGER_E_NOTICE","Bemærk");
define("_LOGGER_E_WARNING","Advarsel");
-define("_LOGGER_E_STRICT","Fuldstændigt");
+define("_LOGGER_E_STRICT","Strict");
define("_LOGGER_FILELINE","%s i filen %s linje %s");
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-09-17 09:44:42
|
Revision: 10182
http://xoops.svn.sourceforge.net/xoops/?rev=10182&view=rev
Author: beckmi
Date: 2012-09-17 09:44:32 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
fixing missing URL link
Modified Paths:
--------------
XoopsModules/xoopspartners/trunk/xoopspartners/templates/xoopspartners_index.html
Modified: XoopsModules/xoopspartners/trunk/xoopspartners/templates/xoopspartners_index.html
===================================================================
--- XoopsModules/xoopspartners/trunk/xoopspartners/templates/xoopspartners_index.html 2012-09-17 08:02:18 UTC (rev 10181)
+++ XoopsModules/xoopspartners/trunk/xoopspartners/templates/xoopspartners_index.html 2012-09-17 09:44:32 UTC (rev 10182)
@@ -1,33 +1,38 @@
-<{include file='db:xoopspartners_header.html'}>
-<table class="outer" cellpadding="0" cellspacing="0">
- <thead>
- <tr>
- <th colspan="4"><{$smarty.const._XO_MD_TITLE}></th>
- </tr>
- </thead>
- <tbody>
- <{foreach item=category from=$categories}>
- <tr class="even">
- <td colspan="2" class="bold">
- <a href="index.php?cat_id=<{$category.id}>">
- <{$category.name}>
- </a>
- </td>
- <td colspan="2"><{$category.desc}></td>
- </tr>
- <{foreach item=partners from=$category.partners}>
- <tr class="odd">
- <td class="width5"> </td>
- <td class="width10">
- <a onclick="addClick(<{$partners.id}>); return true;" href="<{$partners.url}>" rel="external" title="<{$partners.title}>">
- <img src="<{$partners.image}>" alt="" /><br /><{$partners.title}>
- </a>
- <br />
- </td>
- <td><{$partners.description}></td>
- <td><{$partners.hits}></td>
- </tr>
- <{/foreach}>
- <{/foreach}>
- </tbody>
-</table>
\ No newline at end of file
+<h4><{$sitename}> <{$lang_main_partner}></h4>
+
+<table style='margin: 0px; border-width: 0px; width: 95%;'>
+ <tr>
+ <td style='width: 50%; text-align: left;'><{$partner_join}></td>
+ <td style='width: 50%; text-align: left;'><{$pagenav}></td>
+ </tr>
+</table>
+
+<table class='outer' style='margin: 1px; width: 98%;'>
+ <tr>
+ <th style='width: 5%; text-align: left;' nowrap='nowrap'><{$lang_partner}></th>
+ <th style='text-align: left;'><{$lang_desc}></th>
+ <th style='width: 1%; text-align: left;' nowrap='nowrap'><{$lang_hits}></th>
+ </tr>
+
+ <{section name=partner loop=$partners}>
+ <tr>
+ <td class='even' style='width: 5%; vertical-align: middle; text-align:' center'><{$partners[partner].image}></td>
+ <td class='odd' align='left' valign='top'><b><a href="<{$partners[partner].url}>" title="<{$partners[partner].title}>" target="_blank"><{$partners[partner].title}></a></b> <br /><{$partners[partner].description}><{$partners[partner].admin_option}></td>
+ </td>
+ <td class='even' style='width: 1%; vertical-align: middle; text-align: center;'><{$partners[partner].hits}></td>
+ </tr>
+ <{sectionelse}>
+
+ <tr>
+ <td class='even' style='vertical-align: middle; text-align: center;' colspan='3'><{$lang_no_partners}></td>
+ </tr>
+ <{/section}>
+
+</table>
+
+<table style='margin: 0px; border-width: 0px; width: 98%;'>
+ <tr>
+ <td style='width: 50%; text-align: left;'><{$partner_join}></td>
+ <td style='width: 50%; text-align: left;'><{$pagenav}></td>
+ </tr>
+</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-09-17 08:02:25
|
Revision: 10181
http://xoops.svn.sourceforge.net/xoops/?rev=10181&view=rev
Author: beckmi
Date: 2012-09-17 08:02:18 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Correcting size of the Twitter block
Modified Paths:
--------------
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/xoops_version.php
Modified: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/xoops_version.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/xoops_version.php 2012-09-17 07:34:58 UTC (rev 10180)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/xoops_version.php 2012-09-17 08:02:18 UTC (rev 10181)
@@ -88,7 +88,7 @@
$modversion['config'][$i]['description'] = 'Enter the Width of Twitter Follow Block (in pixel)';
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 3;
+$modversion['config'][$i]['default'] = 800;
$i++ ;
$modversion['config'][$i]['name'] = 'twitter_follow_height';
@@ -96,7 +96,7 @@
$modversion['config'][$i]['description'] = 'Enter the Height of Twitter Follow Block (in pixel)';
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 3;
+$modversion['config'][$i]['default'] = 600;
$i++ ;
$modversion['config'][$i]['name'] = 'twitter_follow_theme';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-09-17 07:35:06
|
Revision: 10180
http://xoops.svn.sourceforge.net/xoops/?rev=10180&view=rev
Author: beckmi
Date: 2012-09-17 07:34:58 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Adding xTwitterFollow module
Added Paths:
-----------
XoopsModules/xtwitterfollow/
XoopsModules/xtwitterfollow/branches/
XoopsModules/xtwitterfollow/releases/
XoopsModules/xtwitterfollow/trunk/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/about.php
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/admin_footer.php
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/admin_header.php
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/index.php
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/menu.php
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/blocks/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/blocks/twitter_follow_block.php
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/css/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/css/followblock.css
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/changelog.txt
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/credits.txt
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/index.html
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/install.txt
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/lang_diff.txt
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/license.txt
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/readme.txt
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/index.php
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/js/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/js/jquery.followblock.js
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/help.html
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/index.html
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/modinfo.php
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/logo.png
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/templates/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/templates/blocks/
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/templates/blocks/twitter_follow_block.html
XoopsModules/xtwitterfollow/trunk/xtwitterfollow/xoops_version.php
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/about.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/about.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/about.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,30 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba, XOOPS Development Team
+ * @version $Id $
+ */
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/admin_footer.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/admin_footer.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/admin_footer.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,28 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba, XOOPS Development Team
+ * @version $Id $
+ */
+
+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>";
+
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/admin_header.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/admin_header.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/admin_header.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,42 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba, XOOPS Development Team
+ * @version $Id $
+ */
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+//if functions.php file exist
+//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/index.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/index.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/index.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,32 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba, XOOPS Development Team
+ * @version $Id $
+ */
+
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/menu.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/menu.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/admin/menu.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,51 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba, XOOPS Development Team
+ * @version $Id $
+ */
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
+$adminmenu = array();
+$i=0;
+$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME;
+$adminmenu[$i]['link'] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
+//$i++;
+//$adminmenu[$i]['title'] = _MI_TWITTERFOLLOW_CONFIGURATION;
+//$adminmenu[$i]["link"] = "admin/about.php";
+//$adminmenu[$i]["icon"] = $pathIcon32 . '/administration.png';
+$i++;
+$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/blocks/twitter_follow_block.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/blocks/twitter_follow_block.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/blocks/twitter_follow_block.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,63 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba
+ * @version $Id $
+ */
+
+function twitter_follow_show() {
+
+ $modhandler = xoops_gethandler('module');
+ $twitter_followModule = $modhandler->getByDirname('xtwitterfollow');
+ $config_handler = xoops_gethandler('config');
+ $twitter_followModuleConfig = $config_handler->getConfigsByCat(0, $twitter_followModule->getVar('mid'));
+
+ $block = array();
+
+ $ret = "\n";
+
+ $GLOBALS['xoTheme']->addStylesheet(
+ XOOPS_URL . '/modules/xtwitterfollow/css/followblock.css', array('type'=> 'text/css', 'media'=> 'all')
+ );
+
+ $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $GLOBALS['xoTheme']->addScript(XOOPS_URL . '/modules/xtwitterfollow/js/jquery.followblock.js');
+
+
+ $twitter_follow_user = $twitter_followModuleConfig['twitter_follow_user'];
+ $twitter_follow_width = $twitter_followModuleConfig['twitter_follow_width'];
+ $twitter_follow_height = $twitter_followModuleConfig['twitter_follow_height'];
+ $twitter_follow_theme = $twitter_followModuleConfig['twitter_follow_theme'];
+
+
+ $ret .= "<div id='twitterfollowblock'></div>\n";
+ $ret .= "<script type='text/javascript'>\n";
+ $ret .= "$(document).ready(function(){\n";
+ $ret .= "$('#twitterfollowblock').followbox({\n";
+ $ret .= "'user' : '" . $twitter_follow_user . "',\n";
+ $ret .= "'width' : '" . $twitter_follow_width . "',\n";
+ $ret .= "'height' : '" . $twitter_follow_height . "',\n";
+ $ret .= "'theme' : '" . $twitter_follow_theme . "',\n";
+ $ret .= "});\n";
+ $ret .= "});\n";
+ $ret .= "</script>\n";
+
+ $output = '<div id="twitterfollowblock"></div>';
+ $block['content'] = $output;
+ $block['twitter_followers'] = $ret;
+ return $block;
+
+}
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/css/followblock.css
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/css/followblock.css (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/css/followblock.css 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,27 @@
+.follow_box_widget{overflow: hidden; padding-left: 5px; padding-right: 5px; padding-top: 5px; background-color: #fff transparent; position: relative; margin: auto;}
+.follow_box{font-size: 11px; font-family: "lucida grande",tahoma,verdana,arial,sans-serif; color: #333; line-height: 1.28; text-align: left; direction: ltr;}
+.follow_box .follow_top{padding: 5px 10px 0px 5px; margin-bottom: 8px; min-width: 230px; overflow: hidden;}
+.follow_box .profileimage{float: left; width: 40px; height: 40px; padding: 0px; margin: 0 10px 4px 0;}
+.follow_box img{border: 0;}
+.follow_box a{cursor: pointer; color: #3B5998; text-decoration: none;}
+.follow_box a:hover{text-decoration: underline;}
+.follow_action{padding: 0 0 0 8px;}
+.follow_box .follow_action .name{line-height: 15px; font-size: 14px; font-weight: bold;}
+.follow_box .follow_button{margin: 5px 0 0;}
+.follow_box .total{min-width: 230px; overflow: hidden; display: block;}
+.follow_box .connections{padding: 5px 0 4px 0px; border-top: solid 1px #D8DFEA; border-bottom: 1px solid #CCC; min-height: 150px;}
+.follow_box .connections .connections_grid{padding-top: 5px; overflow: hidden;}
+.follow_box .clearfix{zoom: 1;}
+.follow_box .connections .connections_grid .grid_item{float: left; margin:0px; margin-right: 5px; margin-bottom: 8px; overflow: hidden; width: 50px;}
+.follow_box .connections .connections_grid .grid_item .name{font-size: 9px; color: gray; overflow: hidden; padding-top: 2px; text-align: center; white-space: nowrap;}
+.follow_box .connections .connections_grid .grid_item img{width: 48px; height: 48px;}
+.follow_box .follow_widget_footer{ cursor: default; width: 100%; min-width: 230px; overflow: hidden;}
+.follow_box .footer_border{ margin-top: 5px;}
+.follow_box .uiImageBlock{line-height: 14px;}
+.follow_box .follow_widget_footer .footer_text{cursor: default; color: #808080; font-size: 9px; float: left;}
+.follow_box .follow_widget_footer .footer_text a.footer_text_link{color: #808080;}
+.follow_box .titlecase{text-transform:capitalize;}
+
+.dark{background: #333;}
+.dark a,.dark .total, .dark .connections .connections_grid .grid_item .name, .dark .follow_widget_footer .footer_text a.footer_text_link{color: #808080;}
+.dark .connections{border-bottom: 1px solid #444;}
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/changelog.txt
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/changelog.txt (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/changelog.txt 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,5 @@
+---------------------------------------
+1.00 Beta 1 2012-09-17
+---------------------------------------
+
+- Converted to XOOPS (Mamba)
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/credits.txt
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/credits.txt (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/credits.txt 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,9 @@
+Credits
+===============
+
+Originally developed by Pradeep Saran from www.devsaran.com.
+Please consider a small donation for him:
+Paypal ID : don...@de...
+
+
+Converted to XOOPS by Michael Beck (Mamba)
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/index.html
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/index.html (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/index.html 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/install.txt
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/install.txt (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/install.txt 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,6 @@
+INSTALL/UNISTALL
+=================
+
+No special measures necessary, follow the standard installation process and extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+
+Detailed instructions on installing modules are available in the XOOPS Operations Manual: http://goo.gl/adT2i
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/lang_diff.txt
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/lang_diff.txt (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/lang_diff.txt 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,15 @@
+LANGUAGE DIFFERENCES
+=====================
+
+Below are language differences from a version to next version.
+
+Legend :
++ Added
+- Removed
+* Modified
+x renamed
+
+---------------------------------------
+1.00 Beta 1 2012-09-17
+---------------------------------------
+Original release
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/license.txt
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/license.txt (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/license.txt 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/readme.txt
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/readme.txt (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/docs/readme.txt 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,12 @@
+README FIRST
+-----------------------
+
+Install just like any other XOOPS Module.
+
+Preferences:
+
+Twitter Username
+Height - the height of the Twitter Follow block in pixel.
+Theme - there are two options.
+Light - displays the Twitter Follow block with Transparent background, Light color text and border
+Dark - displays the Twitter Follow block with Black background, Dark color text and border
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/index.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/index.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/index.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,24 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba
+ * @version $Id $
+ */
+
+include("../../mainfile.php");
+include(XOOPS_ROOT_PATH."/header.php");
+
+include(XOOPS_ROOT_PATH."/footer.php");
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/js/jquery.followblock.js
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/js/jquery.followblock.js (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/js/jquery.followblock.js 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,90 @@
+
+(function($) {
+ $.fn.followbox = function(options) {
+ var element=$(this);
+ var settings = $.extend( {
+ 'user' : 'twitter',
+ 'width' : 292,
+ 'height' : 252,
+ 'theme' : 'light',
+ 'border_color' : '#AAA',
+ 'bg_color' : '#fff',
+ 'bg_image' : '',
+ 'title_color' : '#3B5998',
+ 'total_count_color' : '#333',
+ 'follower_name_color' : '#BBB'
+ }, options);
+ //twitter user lookup
+ $.ajax({
+ url: 'https://api.twitter.com/1/users/lookup.json?screen_name='+settings.user+'&include_entities=true',
+ dataType: 'jsonp',
+ success: function(data) {
+ var widget_width=settings.width-2;
+ var widget_height=settings.height-2;
+ var grid_container_height=settings.height-115;
+ var number_images_row=parseInt(settings.width / 55);
+ var number_images_col=parseInt(grid_container_height / 69)+1;
+ var total_followers=number_images_row*number_images_col;
+ element.html('<div class="follow_box_main" style="border: 1px solid #bbb; width: '+widget_width+'px; height: '+widget_height+'px;"><div class="follow_box_widget"><div class="follow_box"><div><div class="follow_top clearfix"><a href="http://www.twitter.com/'+settings.user+'" target="_blank"><img class="profileimage img" src="'+data[0].profile_image_url_https+'" alt="'+data[0].name+'"></a><div class="follow_action"><div class="name_block"><a href="http://www.twitter.com/'+settings.user+'" target="_blank"><span class="name titlecase">'+data[0].name.toLowerCase()+'</span> @'+data[0].screen_name+'</a></div><div class="follow_button"><iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name='+settings.user+'&show_count=false&show_screen_name=false" style="width:100px; height:20px;"></iframe></div></div></div><div class="connections"><span class="total"><span class="follow_box_follower_count">'+data[0].followers_count+'</span> people follow <b class="titlecase">'+data[0].name.toLowerCase()+'</b></span><div class="connections_grid clearfix" style="height:'+grid_container_height+'px;"></div></div></div><div style="height: 23px"><div class="follow_widget_footer"><div class="footer_border"><div class="clearfix uiImageBlock"><div class="footer_text"><a class="footer_text_link" target="_blank" href="http://www.devsaran.com">Twitter Social Module</a></div></div></div></div></div></div></div></div>');
+ //applying dark style if theme is 'dark'
+ if(settings.theme=='dark'){
+ element.find('.follow_box_main').addClass('dark');
+ }
+ element.find('.follow_box_follower_count').text(element.find('.follow_box_follower_count').text().replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,") );
+ if($.browser.msie && !$.support.boxModel)
+ $('.follow_box .connections').css('padding-bottom','14px');
+ if(settings.theme=='custom')
+ {
+ element.find('.follow_box_main').css({
+ 'border-color':settings.border_color,
+ 'background-color':settings.bg_color,
+ 'background-image': 'url("'+settings.bg_image+'")'
+ });
+ element.find('.follow_box a').css({
+ 'color':settings.title_color
+ });
+ element.find('.follow_box .total').css({
+ 'color':settings.total_count_color
+ });
+ }
+ $.ajax({
+ url: 'https://api.twitter.com/1/followers/ids.json?cursor=-1&screen_name='+settings.user,
+ dataType: 'jsonp',
+ success: function(followers) {
+ var idlist_string=getfollowers(total_followers,followers.ids);
+ $.ajax({
+ url: 'https://api.twitter.com/1/users/lookup.json?user_id='+idlist_string+'&include_entities=true',
+ dataType: 'jsonp',
+ success: function(follower_details) {
+ for(var i=0;i<follower_details.length;i++)
+ {
+ var fullname=$.trim(follower_details[i].name);
+ var namearray=fullname.split(' ');
+ var grid_item_html='<div class="grid_item"><a href="http://twitter.com/'+follower_details[i].screen_name+'" target="_blank"><img class="img" src="'+follower_details[i].profile_image_url+'" alt=""><div class="name titlecase">'+namearray[0].toLowerCase()+'</div></a></div>';
+ element.find('.connections_grid').append(grid_item_html);
+ }
+ if(settings.theme=='custom')
+ {
+ element.find('.connections .connections_grid .grid_item .name').css({
+ 'color':settings.follower_name_color
+ });
+ }
+ }
+ });
+ }
+ });
+ }
+ });
+ function getfollowers(number,followers){
+ if(number>100)
+ number=100;
+ var idlist=new Array();
+ for(var i=0;i<number;i++)
+ {
+ idlist.push(followers[i]);
+ }
+ var idlist_string=idlist.join();
+ return idlist_string;
+ }
+ };
+})(jQuery);
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/help.html
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/help.html (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/help.html 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,40 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/xtwitterfollow/admin/index.php"
+ title="Back to the administration of xTwitterFollowers"> xTwitterFollow
+ <img src="<{xoAdminIcons home.png}>"
+ alt="Back to the Administration of xTwitterFollowers"/>
+ </a></h1>
+
+ <h4 class="odd">Description</h4>
+
+ <p class="even">Twitter Follow Block is a simple but powerful jQuery-based module to add a Facebook like-box style block for Twitter. There are plenty of options available to customize the Twitter follow block to match your site design.<br /> <br />
+ </p>
+
+ <h4 class="odd">Install/uninstall</h4>
+
+ <p class="even">No special measures necessary, follow the standard installation process –
+ extract the module folder into the ../modules directory. Install the
+ module through Admin -> System Module -> Modules.<br /> <br />
+ Detailed instructions on installing modules are available in the
+ <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a> </p>
+
+
+ <h4 class="odd">Operating instructions</h4>
+
+ <p class="even">In Preferences set the following fields:<ul>
+ <li>Twitter Username</li>
+ <li>Height - the height of the Twitter Follow block in pixel.</li>
+ <li>Theme - there are two options:</li><br />
+ Light - displays the Twitter Follow block with Transparent background, Light color text and border<br />
+ Dark - displays the Twitter Follow block with Black background, Dark color text and border.<br /> <br />
+ </ul>
+ Then activate the module's Block in the desired position.<br /> <br />
+
+ </p>
+
+ <h4 class="odd">Tutorial</h4>
+
+ <p class="even">There is no tutorial available at the moment.</p>
+
+</div>
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/index.html
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/index.html (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/help/index.html 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/modinfo.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/modinfo.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/language/english/modinfo.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,37 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba
+ * @version $Id $
+ */
+
+define("_MI_TWITTERFOLLOW_USERNAME","User Name");
+define("_MI_TWITTERFOLLOW_WIDTH","Width");
+define("_MI_TWITTERFOLLOW_HEIGHT","Height");
+define("_MI_TWITTERFOLLOW_THEME","Theme");
+
+define("_MI_TWITTERFOLLOW_THEME_LIGHT","Light");
+define("_MI_TWITTERFOLLOW_THEME_DARK","Dark");
+
+define("_MI_TWITTERFOLLOW_BNAME1","Twitter Followers");
+define("_MI_TWITTERFOLLOW_BNAME1_DESC","Shows pictures of your Twitter followers");
+
+
+define("_MI_MODULEADMIN_CONFIGURATION","Configuration");
+define("_MI_TWITTERFOLLOW_DESCRIPTION","A jQuery-based module to add Facebook like-box style block for Twitter");
+
+
+
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/logo.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/templates/blocks/twitter_follow_block.html
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/templates/blocks/twitter_follow_block.html (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/templates/blocks/twitter_follow_block.html 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,2 @@
+<{$block.content}>
+<{$block.twitter_followers}>
\ No newline at end of file
Added: XoopsModules/xtwitterfollow/trunk/xtwitterfollow/xoops_version.php
===================================================================
--- XoopsModules/xtwitterfollow/trunk/xtwitterfollow/xoops_version.php (rev 0)
+++ XoopsModules/xtwitterfollow/trunk/xtwitterfollow/xoops_version.php 2012-09-17 07:34:58 UTC (rev 10180)
@@ -0,0 +1,108 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xtwitterfollow
+ * @since 1.0
+ * @author Mamba
+ * @version $Id $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ die('XOOPS root path not defined');
+}
+
+$modversion['dirname'] = basename(dirname(__FILE__));
+$modversion['name'] = ucfirst(basename(dirname(__FILE__)));
+$modversion['version'] = '1.0';
+$modversion['description'] = _MI_TWITTERFOLLOW_DESCRIPTION;
+$modversion['author'] = "Mamba";
+$modversion['credits'] = "Pradeep Saran (www.devsaran.com)";
+$modversion['help'] = "";
+$modversion['license'] = "GPL see LICENSE";
+$modversion['official'] = 0;
+$modversion['image'] = "logo.png";
+
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU GPL 2.0 or later';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+
+
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+//about
+$modversion['release_date'] = '2012/09/17';
+$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_name"] = "XOOPS";
+$modversion["module_status"] = "Beta 1";
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = "2.5.5";
+$modversion['min_admin'] = '1.1';
+$modversion['min_db'] = array(
+ 'mysql' => '5.0.7',
+ 'mysqli' => '5.0.7'
+);
+
+// Menu
+$modversion['hasMain'] = 0;
+$modversion['hasAdmin'] = 1;
+$modversion['system_menu'] = 1;
+
+$modversion['adminindex'] = 'admin/index.php';
+$modversion['adminmenu'] = 'admin/menu.php';
+
+// Blocks
+$modversion['blocks'][1]['file'] = "twitter_follow_block.php";
+$modversion['blocks'][1]['name'] = _MI_TWITTERFOLLOW_BNAME1;
+$modversion['blocks'][1]['description'] = _MI_TWITTERFOLLOW_BNAME1_DESC;
+$modversion['blocks'][1]['show_func'] = "twitter_follow_show";
+//$modversion['blocks'][1]['edit_func'] = "twitter_follow_edit";
+$modversion['blocks'][1]['template'] = 'twitter_follow_block.html';
+$modversion['blocks'][1]['options'] = '1|5';
+
+//Config
+$i = 0;
+
+$i++ ;
+$modversion['config'][$i]['name'] = 'twitter_follow_user';
+$modversion['config'][$i]['title'] = '_MI_TWITTERFOLLOW_USERNAME';
+$modversion['config'][$i]['description'] = 'Enter the Twitter user name';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'xoopsnews';
+
+$i++ ;
+$modversion['config'][$i]['name'] = 'twitter_follow_width';
+$modversion['config'][$i]['title'] = '_MI_TWITTERFOLLOW_WIDTH';
+$modversion['config'][$i]['description'] = 'Enter the Width of Twitter Follow Block (in pixel)';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 3;
+
+$i++ ;
+$modversion['config'][$i]['name'] = 'twitter_follow_height';
+$modversion['config'][$i]['title'] = '_MI_TWITTERFOLLOW_HEIGHT';
+$modversion['config'][$i]['description'] = 'Enter the Height of Twitter Follow Block (in pixel)';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 3;
+
+$i++ ;
+$modversion['config'][$i]['name'] = 'twitter_follow_theme';
+$modversion['config'][$i]['title'] = '_MI_TWITTERFOLLOW_THEME';
+$modversion['config'][$i]['description'] = 'Select the theme for Twitter Follow Block';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'light';
+$modversion['config'][$i]['options'] = array('_MI_TWITTERFOLLOW_THEME_LIGHT' => 'light', '_MI_TWITTERFOLLOW_THEME_DARK' => 'dark' );
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
