type casting : replace intval -> (int)

fiammybe · fiammybe · commit 15faaf14485e · 2020-06-26T01:36:21.000+02:00
diff --git a/action.post.php b/action.post.php
@@ -25,9 +25,9 @@
  
 include 'header.php';
  
-$topic_id = isset($_POST['topic_id']) ? intval($_POST['topic_id']) :
+$topic_id = isset($_POST['topic_id']) ? (int)$_POST['topic_id'] :
  0;
-$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) :
+$post_id = !empty($_GET['post_id']) ? (int)$_GET['post_id'] :
  0;
 $post_id = !empty($_POST['post_id']) ? $_POST['post_id'] :
  $post_id;
@@ -37,7 +37,7 @@
  (!empty($_POST['op']) ? $_POST['op']:"");
 $op = in_array($op, array("approve", "delete", "restore", "split"))? $op :
  "";
-$mode = !empty($_GET['mode']) ? intval($_GET['mode']) :
+$mode = !empty($_GET['mode']) ? (int)$_GET['mode'] :
  1;
  
 if (empty($post_id) || empty($op))
diff --git a/admin/admin_cat_manager.php b/admin/admin_cat_manager.php
@@ -172,7 +172,7 @@ function editCategory($cat_id = 0)
 	case "del":
 	if (empty($_POST['confirm']))
 	{
-		xoops_confirm(array('op' => 'del', 'cat_id' => intval($_GET['cat_id']), 'confirm' => 1), 'admin_cat_manager.php', _AM_IFORUM_WAYSYWTDTTAL);
+		xoops_confirm(array('op' => 'del', 'cat_id' => (int)$_GET['cat_id'], 'confirm' => 1), 'admin_cat_manager.php', _AM_IFORUM_WAYSYWTDTTAL);
 		break;
 	}
 	else
diff --git a/admin/admin_forum_manager.php b/admin/admin_forum_manager.php
@@ -174,7 +174,7 @@ function editForum($ff, $parent_forum = 0) {
 	 
 	if (!empty($_POST['dest']))
 	{
-		if (!empty($_GET['forum'])) $forum_id = intval($_GET['forum']);
+		if (!empty($_GET['forum'])) $forum_id = (int)$_GET['forum'];
 			if (!empty($_POST['forum'])) $forum_id = intval($_POST['forum']);
 			 
 		$dest = $_POST['dest'];
@@ -217,14 +217,14 @@ function editForum($ff, $parent_forum = 0) {
 	{
 		//loadModuleAdminMenu(2, "");
 		 
-		if (!empty($_POST['forum'])) $forum_id = intval($_POST['forum']);
-			if (!empty($_GET['forum'])) $forum_id = intval($_GET['forum']);
+		if (!empty($_POST['forum'])) $forum_id = (int)$_POST['forum'];
+			if (!empty($_GET['forum'])) $forum_id = (int)$_GET['forum'];
 			//$forum =$forum_handler->get($forum_id);
 		 
 		$box = '<select name="dest">';
 		$box .= '<option value=0 selected>' . _AM_IFORUM_SELECT . '</option>';
 		 
-		$category_handler = icms_getmodulehandler('category', basename(dirname(dirname(__FILE__ ) ) ), 'iforum' );
+		$category_handler = icms_getmodulehandler('category', basename(dirname(__DIR__) ), 'iforum' );
 		$categories = $category_handler->getAllCats('', true);
 		$forums = $forum_handler->getForumsByCategory(array_keys($categories), '', false);
 		 
@@ -259,8 +259,8 @@ function editForum($ff, $parent_forum = 0) {
 	 
 	if (!empty($_POST['dest_forum']))
 	{
-		if (isset($_GET['forum'])) $forum_id = intval($_GET['forum']);
-			if (isset($_POST['forum'])) $forum_id = intval($_POST['forum']);
+		if (isset($_GET['forum'])) $forum_id = (int)$_GET['forum'];
+			if (isset($_POST['forum'])) $forum_id = (int)$_POST['forum'];
 			 
 		$sql = "UPDATE " . icms::$xoopsDB->prefix('bb_posts') . " SET forum_id=" . $_POST['dest_forum'] . " WHERE forum_id=$forum";
 		$result = icms::$xoopsDB->queryF($sql);
@@ -293,8 +293,8 @@ function editForum($ff, $parent_forum = 0) {
 	{
 		//loadModuleAdminMenu(2, "");
 		 
-		if (isset($_GET['forum'])) $forum_id = intval($_GET['forum']);
-			if (isset($_POST['forum'])) $forum_id = intval($_POST['forum']);
+		if (isset($_GET['forum'])) $forum_id = (int)$_GET['forum'];
+			if (isset($_POST['forum'])) $forum_id = (int)$_POST['forum'];
 			//$forum =$forum_handler->get($forum_id);
 		 
 		$box = '<select name="dest_forum">';
@@ -449,7 +449,7 @@ function editForum($ff, $parent_forum = 0) {
 	 
 	if (isset($_POST['confirm']) != 1)
 	{
-		xoops_confirm(array('op' => 'del', 'forum' => intval($_GET['forum']), 'confirm' => 1), 'admin_forum_manager.php', _AM_IFORUM_TWDAFAP);
+		xoops_confirm(array('op' => 'del', 'forum' => (int)$_GET['forum'], 'confirm' => 1), 'admin_forum_manager.php', _AM_IFORUM_TWDAFAP);
 		break;
 	}
 	else
@@ -547,7 +547,7 @@ function editForum($ff, $parent_forum = 0) {
 	loadModuleAdminMenu(2, _AM_IFORUM_CREATENEWFORUM);
 	echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_IFORUM_CREATENEWFORUM . "</legend>";
 	echo "<br />";
-	$parent_forum = isset($_GET['parent_forum']) ? intval($_GET['parent_forum']) : null;
+	$parent_forum = isset($_GET['parent_forum']) ? (int)$_GET['parent_forum'] : null;
 	 
 	newForum($parent_forum);
 	 
@@ -563,8 +563,8 @@ function editForum($ff, $parent_forum = 0) {
 		<legend style='display: inline; font-weight: bold; color: #900;'>" . _AM_IFORUM_CREATENEWFORUM . "</legend>";
 	echo "<br />";
 	 
-	//$parent_forum = isset($_GET['parent_forum']) ? intval($_GET['parent_forum']) : null;
-	newForum(@intval($_GET['parent_forum']));
+	//$parent_forum = isset($_GET['parent_forum']) ? (int)$_GET['parent_forum'] : null;
+	newForum(@(int)$_GET['parent_forum']);
 	 
 	echo "</fieldset>";
 	break;
diff --git a/admin/admin_votedata.php b/admin/admin_votedata.php
@@ -31,8 +31,8 @@
 switch ($op) {
 	case "delvotes":
 	global $_GET;
-	$rid = intval($_GET['rid']);
-	$topic_id = intval($_GET['topic_id']);
+	$rid = (int)$_GET['rid'];
+	$topic_id = (int)$_GET['topic_id'];
 	$sql = icms::$xoopsDB->queryF("DELETE FROM " . icms::$xoopsDB->prefix('bb_votedata') . " WHERE ratingid = $rid");
 	icms::$xoopsDB->query($sql);
 	iforum_updaterating($topic_id);
@@ -41,7 +41,7 @@
 	 
 	case 'main':
 	default:
-	$start = isset($_GET['start']) ? intval($_GET['start']) :
+	$start = isset($_GET['start']) ? (int)$_GET['start'] :
 	 0;
 	$useravgrating = '0';
 	$uservotes = '0';
diff --git a/archive.php b/archive.php
@@ -32,9 +32,9 @@
  
 include_once("header.php");
 include ICMS_ROOT_PATH."/header.php";
-$forum = isset($_GET['forum']) ? intval($_GET['forum']) :
+$forum = isset($_GET['forum']) ? (int)$_GET['forum'] :
  0;
-$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) :
+$topic_id = isset($_GET['topic_id']) ? (int)$_GET['topic_id'] :
  0;
  
 if ($forum == 0)
diff --git a/delete.php b/delete.php
@@ -44,7 +44,7 @@
 	)?$ {
 		$getint }
 	:
-	(isset($_GET[$getint]) ? intval($_GET[$getint]) : 0);
+	(isset($_GET[$getint]) ? (int)$_GET[$getint] : 0);
 }
 $viewmode = (isset($_GET['viewmode']) && $_GET['viewmode'] != 'flat') ? 'thread' :
  'flat';
diff --git a/dl_attachment.php b/dl_attachment.php
@@ -29,7 +29,7 @@
  
 $attach_id = isset($_GET['attachid']) ? strval($_GET['attachid']) :
  '';
-$post_id = isset($_GET['post_id']) ? intval($_GET['post_id']) :
+$post_id = isset($_GET['post_id']) ? (int)$_GET['post_id'] :
  0;
  
 if (!$post_id || !$attach_id) die(_MD_NO_SUCH_FILE.': post_id:'.$post_id.'; attachid'.$attachid);
diff --git a/edit.php b/edit.php
@@ -31,7 +31,7 @@
 {
 	$ {
 		$getint }
-	 = isset($_GET[$getint]) ? intval($_GET[$getint]) :
+	 = isset($_GET[$getint]) ? (int)$_GET[$getint] :
 	 0;
 }
 $viewmode = (isset($_GET['viewmode']) && $_GET['viewmode'] != 'flat') ? 'thread' :
diff --git a/include/forumform.inc.php b/include/forumform.inc.php
@@ -30,9 +30,9 @@
  
 if (empty($forum_obj))
 {
-	$forum_handler = icms_getmodulehandler('forum', basename(dirname(dirname(__FILE__ ) ) ), 'iforum' );
-	$forum = isset($_GET['forum']) ? intval($_GET['forum']) :
-	 (isset($forum) ? intval($forum) : 0);
+	$forum_handler = icms_getmodulehandler('forum', basename(dirname(__DIR__) ), 'iforum' );
+	$forum = isset($_GET['forum']) ? (int)$_GET['forum'] :
+	 (isset($forum) ? (int)$forum : 0);
 	$forum_obj = $forum_handler->get($forum);
 }
  
@@ -47,7 +47,7 @@
 {
 	$ {
 		$getint }
-	 = isset($_GET[$getint]) ? intval($_GET[$getint]) :
+	 = isset($_GET[$getint]) ? (int)$_GET[$getint] :
 	((!empty($ {
 		$getint }
 	))?$ {
diff --git a/index.php b/index.php
@@ -28,7 +28,7 @@
 /* deal with marks */
 if (isset($_GET['mark_read']))
 	{
-	if (1 == intval($_GET['mark_read']))
+	if (1 == (int)$_GET['mark_read'])
 	{
 		// marked as read
 		$markvalue = 1;
@@ -45,7 +45,7 @@
 	redirect_header($url, 2, _MD_ALL_FORUM_MARKED.' '.$markresult);
 }
  
-$viewcat = @intval($_GET['cat']);
+$viewcat = @(int)$_GET['cat'];
 $category_handler = icms_getmodulehandler('category', basename(__DIR__), 'iforum' );
  
 $categories = array();
@@ -186,7 +186,7 @@
  
 $isadmin = iforum_isAdmin();
 $icmsTpl->assign('viewer_level', ($isadmin)?2:(is_object(icms::$user)?1:0) );
-$mode = (!empty($_GET['mode'])) ? intval($_GET['mode']) :
+$mode = (!empty($_GET['mode'])) ? (int)$_GET['mode'] :
  0;
 $icmsTpl->assign('mode', $mode );
  
diff --git a/makepdf.php b/makepdf.php
@@ -26,11 +26,11 @@
 error_reporting(0);
 include 'header.php';
  
-$forum = isset($_GET['forum']) ? intval($_GET['forum']) :
+$forum = isset($_GET['forum']) ? (int)$_GET['forum'] :
  0;
-$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) :
+$topic_id = isset($_GET['topic_id']) ? (int)$_GET['topic_id'] :
  0;
-$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) :
+$post_id = !empty($_GET['post_id']) ? (int)$_GET['post_id'] :
  0;
  
 if (empty($post_id))
diff --git a/moderate.php b/moderate.php
@@ -25,9 +25,9 @@
  
 include 'header.php';
  
-$forum_id = isset($_POST['forum']) ? intval($_POST['forum']) :
+$forum_id = isset($_POST['forum']) ? (int)$_POST['forum'] :
  0;
-$forum_id = isset($_GET['forum']) ? intval($_GET['forum']) :
+$forum_id = isset($_GET['forum']) ? (int)$_GET['forum'] :
  $forum_id;
  
 $isadmin = iforum_isAdmin($forum_id);
@@ -111,7 +111,7 @@
 	}
 }
  
-$start = isset($_GET['start']) ? intval($_GET['start']) :
+$start = isset($_GET['start']) ? (int)$_GET['start'] :
  0;
 $sortname = isset($_GET['sort']) ? $_GET['sort'] :
  "";
diff --git a/newtopic.php b/newtopic.php
@@ -28,7 +28,7 @@
 {
 	$ {
 		$getint }
-	 = isset($_GET[$getint]) ? intval($_GET[$getint]) :
+	 = isset($_GET[$getint]) ? (int)$_GET[$getint] :
 	 0;
 }
 if (isset($_GET['op'])) $op = $_GET['op'];
diff --git a/polls.php b/polls.php
@@ -35,10 +35,10 @@
 $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($_GET['poll_id'])) $poll_id = (int)$_GET['poll_id'];
+	if (isset($_POST['poll_id'])) $poll_id = (int)$_POST['poll_id'];
+	if (isset($_GET['topic_id'])) $topic_id = (int)$_GET['topic_id'];
+	if (isset($_POST['topic_id'])) $topic_id = (int)$_POST['topic_id'];
 	 
 if (!isset($module_handler)) $module_handler = icms::handler('icms_module');
 $xoopspoll = $module_handler->getByDirname('xoopspoll');
diff --git a/print.php b/print.php
@@ -38,11 +38,11 @@
 if (empty($_POST["post_data"]))
 {
 	 
-	$forum = isset($_GET['forum']) ? intval($_GET['forum']) :
+	$forum = isset($_GET['forum']) ? (int)$_GET['forum'] :
 	 0;
-	$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) :
+	$topic_id = isset($_GET['topic_id']) ? (int)$_GET['topic_id'] :
 	 0;
-	$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) :
+	$post_id = !empty($_GET['post_id']) ? (int)$_GET['post_id'] :
 	 0;
 	 
 	if (empty($post_id) && empty($topic_id) )
diff --git a/ratethread.php b/ratethread.php
@@ -33,8 +33,8 @@
 {
 	$ {
 		$var }
-	 = isset($_POST[$var]) ? intval($_POST[$var]) :
-	 (isset($_GET[$var])?intval($_GET[$var]):0);
+	 = isset($_POST[$var]) ? (int)$_POST[$var] :
+	 (isset($_GET[$var])?(int)$_GET[$var]:0);
 }
  
 $topic_handler = icms_getmodulehandler('topic', basename(__DIR__), 'iforum' );
diff --git a/reply.php b/reply.php
@@ -28,7 +28,7 @@
 {
 	$ {
 		$getint }
-	 = isset($_GET[$getint]) ? intval($_GET[$getint]) :
+	 = isset($_GET[$getint]) ? (int)$_GET[$getint] :
 	 0;
 }
 $viewmode = (isset($_GET['viewmode']) && $_GET['viewmode'] != 'flat') ? 'thread' :
diff --git a/rss.php b/rss.php
@@ -30,7 +30,7 @@
  
 $forums = null;
 $category = empty($_GET["c"])?null:
-intval($_GET["c"]);
+(int)$_GET["c"];
 if (isset($_GET["f"]))
 {
 	$forums = array_map("intval", array_map("trim", explode("|", $_GET["f"])));
diff --git a/topicmanager.php b/topicmanager.php
@@ -41,7 +41,7 @@
 	{
 		$ {
 			$getint }
-		 = isset($_GET[$getint]) ? intval($_GET[$getint]) :
+		 = isset($_GET[$getint]) ? (int)$_GET[$getint] :
 		 0;
 	}
 }
diff --git a/viewall.php b/viewall.php
@@ -27,7 +27,7 @@
  
 $type = (!empty($_GET['type']) && in_array($_GET['type'], array("active", "pending", "deleted", "digest", "unreplied", "unread")))? $_GET['type'] :
  "";
-$mode = !empty($_GET['mode']) ? intval($_GET['mode']) :
+$mode = !empty($_GET['mode']) ? (int)$_GET['mode'] :
  0;
 $mode = (!empty($type) && in_array($type, array("active", "pending", "deleted")))?2:
 $mode;
@@ -90,7 +90,7 @@
 // assign to template
 $icmsTpl->assign_by_ref('forum_selection_order', $forum_selection_order);
  
-$since = isset($_GET['since']) ? intval($_GET['since']) :
+$since = isset($_GET['since']) ? (int)$_GET['since'] :
  icms::$module->config["since_default"];
 $forum_selection_since = iforum_sinceSelectBox($since);
  
@@ -107,7 +107,7 @@
  
 $startdate = empty($since)?0:
 (time() - iforum_getSinceTime($since));
-$start = !empty($_GET['start']) ? intval($_GET['start']) :
+$start = !empty($_GET['start']) ? (int)$_GET['start'] :
  0;
  
 $all_link = "viewall.php?start=$start&amp;sortname=$sortname&amp;sortorder=$sortorder&amp;since=$since";
diff --git a/viewforum.php b/viewforum.php
@@ -33,7 +33,7 @@
  
 if (isset($_GET['mark_read']))
 	{
-	if (1 == intval($_GET['mark_read']))
+	if (1 == (int)$_GET['mark_read'])
 	{
 		// marked as read
 		$markvalue = 1;
@@ -50,10 +50,10 @@
 	redirect_header($url, 2, $markresult);
 }
  
-$forum_id = intval($_GET['forum']);
+$forum_id = (int)$_GET['forum'];
 $type = (!empty($_GET['type']) && in_array($_GET['type'], array("active", "pending", "deleted", "digest", "unreplied", "unread")))? $_GET['type'] :
  "";
-$mode = !empty($_GET['mode']) ? intval($_GET['mode']) :
+$mode = !empty($_GET['mode']) ? (int)$_GET['mode'] :
  0;
 $mode = (!empty($type) && in_array($type, array("active", "pending", "deleted")))?2:
 $mode;
@@ -183,7 +183,7 @@
  
 $icmsTpl->assign_by_ref('forum_selection_order', $forum_selection_order);
  
-$since = isset($_GET['since']) ? intval($_GET['since']) :
+$since = isset($_GET['since']) ? (int)$_GET['since'] :
  icms::$module->config["since_default"];
 $forum_selection_since = iforum_sinceSelectBox($since);
  
@@ -199,7 +199,7 @@
  
 $startdate = empty($since)?0:
 (time() - iforum_getSinceTime($since));
-$start = !empty($_GET['start']) ? intval($_GET['start']) :
+$start = !empty($_GET['start']) ? (int)$_GET['start'] :
  0;
  
 list($allTopics, $sticky) = $forum_handler->getAllTopics($forum_obj, $startdate, $start, $sortname, $sortorder, $type, icms::$module->config['post_excerpt']);
diff --git a/viewpost.php b/viewpost.php
diff --git a/viewtopic.php b/viewtopic.php
diff --git a/votepolls.php b/votepolls.php

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ function editCategory($cat_id = 0)`
`172`	`172`	`case "del":`
`173`	`173`	`if (empty($_POST['confirm']))`
`174`	`174`	`{`
`175`		`- xoops_confirm(array('op' => 'del', 'cat_id' => intval($_GET['cat_id']), 'confirm' => 1), 'admin_cat_manager.php', _AM_IFORUM_WAYSYWTDTTAL);`
	`175`	`+ xoops_confirm(array('op' => 'del', 'cat_id' => (int)$_GET['cat_id'], 'confirm' => 1), 'admin_cat_manager.php', _AM_IFORUM_WAYSYWTDTTAL);`
`176`	`176`	`break;`
`177`	`177`	`}`
`178`	`178`	`else`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`)?$ {`
`45`	`45`	`$getint }`
`46`	`46`	`:`
`47`		`- (isset($_GET[$getint]) ? intval($_GET[$getint]) : 0);`
	`47`	`+ (isset($_GET[$getint]) ? (int)$_GET[$getint] : 0);`
`48`	`48`	`}`
`49`	`49`	`$viewmode = (isset($_GET['viewmode']) && $_GET['viewmode'] != 'flat') ? 'thread' :`
`50`	`50`	`'flat';`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`{`
`32`	`32`	`$ {`
`33`	`33`	`$getint }`
`34`		`- = isset($_GET[$getint]) ? intval($_GET[$getint]) :`
	`34`	`+ = isset($_GET[$getint]) ? (int)$_GET[$getint] :`
`35`	`35`	`0;`
`36`	`36`	`}`
`37`	`37`	`$viewmode = (isset($_GET['viewmode']) && $_GET['viewmode'] != 'flat') ? 'thread' :`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@`
`30`	`30`
`31`	`31`	`if (empty($forum_obj))`
`32`	`32`	`{`
`33`		`- $forum_handler = icms_getmodulehandler('forum', basename(dirname(dirname(__FILE__ ) ) ), 'iforum' );`
`34`		`- $forum = isset($_GET['forum']) ? intval($_GET['forum']) :`
`35`		`- (isset($forum) ? intval($forum) : 0);`
	`33`	`+ $forum_handler = icms_getmodulehandler('forum', basename(dirname(__DIR__) ), 'iforum' );`
	`34`	`+ $forum = isset($_GET['forum']) ? (int)$_GET['forum'] :`
	`35`	`+ (isset($forum) ? (int)$forum : 0);`
`36`	`36`	`$forum_obj = $forum_handler->get($forum);`
`37`	`37`	`}`
`38`	`38`
`@@ -47,7 +47,7 @@`
`47`	`47`	`{`
`48`	`48`	`$ {`
`49`	`49`	`$getint }`
`50`		`- = isset($_GET[$getint]) ? intval($_GET[$getint]) :`
	`50`	`+ = isset($_GET[$getint]) ? (int)$_GET[$getint] :`
`51`	`51`	`((!empty($ {`
`52`	`52`	`$getint }`
`53`	`53`	`))?$ {`