[xoops-svn] SF.net SVN: xoops:[10104] XoopsModules/newbb/branches/alfred/newbb

[<dh...@us...>]

Revision: 10104
          http://xoops.svn.sourceforge.net/xoops/?rev=10104&view=rev
Author:   dhcst
Date:     2012-08-25 15:50:49 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
Update set usertimzone and check pollmodules

Modified Paths:
--------------
    XoopsModules/newbb/branches/alfred/newbb/header.php
    XoopsModules/newbb/branches/alfred/newbb/polls.php
    XoopsModules/newbb/branches/alfred/newbb/votepolls.php

Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php	2012-08-25 13:24:45 UTC (rev 10103)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php	2012-08-25 15:50:49 UTC (rev 10104)
@@ -6,7 +6,7 @@
  * @license		http://www.fsf.org/copyleft/gpl.html GNU public license
  * @author		Taiwen Jiang (phppp or D.J.) <ph...@us...>
  * @since		4.00
- * @version		$Id: header.php 62 2012-08-17 10:15:26Z alfred $
+ * @version		$Id$
  * @package		module::newbb
  */
 include_once '../../mainfile.php';
@@ -61,15 +61,6 @@
 require_once XOOPS_ROOT_PATH."/class/module.textsanitizer.php";
 $myts = MyTextSanitizer::getInstance();
 
-$menumode = 0;
-$menumode_other = array();
-$menu_url = htmlSpecialChars(preg_replace("/&menumode=[^&]/", "", $_SERVER[ 'REQUEST_URI' ]));
-$menu_url .= ( false === strpos($menu_url, "?") ) ? "?menumode=" : "&amp;menumode=";
-foreach ($xoopsModuleConfig["valid_menumodes"] as $key => $val) {
-	if ($key != $menumode) $menumode_other[] = array("title"=>$val, "link"=>$menu_url.$key);
-}
-
-
 $newbb_module_header = '';
 $newbb_module_header .= '<link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar("name").'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', "n").'/rss.php" />';
 if (!empty($xoopsModuleConfig['pngforie_enabled'])) {
@@ -77,9 +68,9 @@
 }
 
 $dirname 		= $xoopsModule->getVar('dirname');
-$theme_path 	= $xoopsConfig['theme_set'] . "/modules/" . $dirname;
-$lang_path 		= "images/language/" . $xoopsConfig['language'];
-$default_path 	= "modules/" . $dirname . "/templates";
+$theme_path 	= "/" . $xoopsConfig['theme_set'] . "/modules/" . $dirname;
+$lang_path 		= "/images/language/" . $xoopsConfig['language'];
+$default_path 	= "/modules/" . $dirname . "/templates";
 
 //Themepfad
 if (file_exists( $GLOBALS['xoops']->path( $theme_path . '/style.css'))) {
@@ -96,40 +87,14 @@
 
 $newbb_module_header .= '
 	<script type="text/javascript">var toggle_cookie="'.$forumCookie['prefix'].'G'.'";</script>
-	<script src="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'/include/js/newbb_toggle.js" type="text/javascript"></script>
+	<script src="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'/include/newbb_toggle.js" type="text/javascript"></script>
 	';
 
-	
-if ($menumode == 2) {
-	$newbb_module_header .= '
-	<link rel="stylesheet" type="text/css" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'templates/newbb_menu_hover.css" />
-	<style type="text/css">body {behavior:url("include/newbb.htc");}</style>
-	';
-}
-
-if ($menumode == 1) {
-	$newbb_module_header .= '
-	<link rel="stylesheet" type="text/css" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'templates/newbb_menu_click.css" />
-	<script src="include/js/newbb_menu_click.js" type="text/javascript"></script>
-	';
-}
-
 $xoops_module_header = $newbb_module_header; // for cache hack
 
 if (!empty($xoopsModuleConfig["welcome_forum"]) && is_object($xoopsUser) && !$xoopsUser->getVar('posts')) {
 	mod_loadFunctions("welcome", "newbb");
 }
 
-$pollmodules = NULL;
-//$module_handler = &xoops_gethandler('module');
-$xoopspoll = &$module_handler->getByDirname('xoopspoll');
-if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) {
-        $pollmodules = 'xoopspoll';
-} else {
-    //Umfrage
-    $xoopspoll = &$module_handler->getByDirname('umfrage');
-    if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) 
-        $pollmodules = 'umfrage';
-}
 $xoopsLogger->stopTime('newBB_Header');
 ?>
\ No newline at end of file

Modified: XoopsModules/newbb/branches/alfred/newbb/polls.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/polls.php	2012-08-25 13:24:45 UTC (rev 10103)
+++ XoopsModules/newbb/branches/alfred/newbb/polls.php	2012-08-25 15:50:49 UTC (rev 10104)
@@ -14,7 +14,7 @@
  * @package         newbb
  * @since           4.0
  * @author          Taiwen Jiang <ph...@us...>
- * @version         $Id: polls.php 62 2012-08-17 10:15:26Z alfred $
+ * @version         $Id: polls.php 2175 2008-09-23 14:07:03Z phppp $
  */
 
 
@@ -24,6 +24,17 @@
 include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
 include_once XOOPS_ROOT_PATH . "/class/xoopsblock.php";
 
+$pollmodules = NULL;
+$xoopspoll = &$module_handler->getByDirname('xoopspoll');
+if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) {
+        $pollmodules = 'xoopspoll';
+} else {
+    //Umfrage
+    $xoopspoll = &$module_handler->getByDirname('umfrage');
+    if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) 
+        $pollmodules = 'umfrage';
+}
+
 if ( $pollmodules == 'xoopspoll')
 {
     include XOOPS_ROOT_PATH . "/modules/xoopspoll/include/constants.php";
@@ -46,13 +57,12 @@
     exit();
 }
 
-$op = "add";
-if (isset($_GET['op'])) $op = $_GET['op'];
-if (isset($_POST['op'])) $op = $_POST['op'];
-if (isset($_GET['poll_id'])) $poll_id = intval($_GET['poll_id']);
-if (isset($_POST['poll_id'])) $poll_id = intval($_POST['poll_id']);
-if (isset($_GET['topic_id'])) $topic_id = intval($_GET['topic_id']);
-if (isset($_POST['topic_id'])) $topic_id = intval($_POST['topic_id']);
+if (isset($_REQUEST['op'])) ? $_REQUEST['op'] : "add";
+if ( !in_array( $op,array('add','save','edit','update','addmor','savemore','delete','delete_ok','restart','restart_ok','log')) ) $op = "add";
+if (isset($_GET['poll_id'])) 	$poll_id = intval($_GET['poll_id']);
+if (isset($_POST['poll_id'])) 	$poll_id = intval($_POST['poll_id']);
+if (isset($_GET['topic_id'])) 	$topic_id = intval($_GET['topic_id']);
+if (isset($_POST['topic_id'])) 	$topic_id = intval($_POST['topic_id']);
 
 if (!isset($module_handler)) $module_handler =& xoops_gethandler('module');
 $xoopspoll =& $module_handler->getByDirname($pollmodules);
@@ -95,6 +105,7 @@
 }
 if (!$perm) {
     redirect_header("viewtopic.php?topic_id=" . $topic_id, 2, _NOPERM);
+	exit();
 }
 
 if ( $op == "add" ) {
@@ -179,7 +190,9 @@
     $poll->setVar("description", @$_POST['description']);
     if ( !empty($_POST['end_time']) ) {
         $timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null;
-        $poll->setVar("end_time", userTimeToServerTime(strtotime($_POST['end_time']), $timezone));
+        //$poll->setVar("end_time", userTimeToServerTime(strtotime($_POST['end_time']), $timezone));
+		//Hack by irmtfan
+		$poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($_POST['end_time']) : strtotime($_POST['end_time']), $timezone));
     } else {
         // if expiration date is not set, set it to 10 days from now
         $poll->setVar("end_time", time() + (86400 * 10));
@@ -322,7 +335,9 @@
     $end_time = (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
     if ( !empty($end_time) ) {
         $timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null;
-        $poll->setVar("end_time", userTimeToServerTime(strtotime($end_time), $timezone));
+        //$poll->setVar("end_time", userTimeToServerTime(strtotime($end_time), $timezone));
+		//Hack by Irmtfan
+		$poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
     }
     $poll->setVar("display", 0);
     $poll->setVar("weight", intval(@$_POST['weight']));
@@ -526,7 +541,9 @@
     $end_time = (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
     if ( !empty($end_time) ) {
         $timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null;
-        $poll->setVar("end_time", userTimeToServerTime(strtotime($end_time), $timezone));
+        //$poll->setVar("end_time", userTimeToServerTime(strtotime($end_time), $timezone));
+		//Hack by irmtfan
+		$poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
     } else {
         $poll->setVar("end_time", time() + (86400 * 10));
     }

Modified: XoopsModules/newbb/branches/alfred/newbb/votepolls.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/votepolls.php	2012-08-25 13:24:45 UTC (rev 10103)
+++ XoopsModules/newbb/branches/alfred/newbb/votepolls.php	2012-08-25 15:50:49 UTC (rev 10104)
@@ -1,5 +1,5 @@
 <?php
-// $Id: votepolls.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: votepolls.php,v 1.3 2005/10/19 17:20:28 phppp Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -41,6 +41,18 @@
     include_once XOOPS_ROOT_PATH."/modules/umfrage/class/umfragerenderer.php";
 }
 
+$pollmodules = NULL;
+//$module_handler = &xoops_gethandler('module');
+$xoopspoll = &$module_handler->getByDirname('xoopspoll');
+if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) {
+        $pollmodules = 'xoopspoll';
+} else {
+    //Umfrage
+    $xoopspoll = &$module_handler->getByDirname('umfrage');
+    if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) 
+        $pollmodules = 'umfrage';
+}
+
 if ( !empty($_POST['poll_id']) ) {
 	$poll_id = intval($_POST['poll_id']);
 } elseif (!empty($_GET['poll_id'])) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.