Commit: af45651a61ea7d395efbb81f0489787fc12b1378 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• Revision: af45651a61ea7d395efbb81f0489787fc12b1378 (tree)
• Zeit: 2011-11-03 18:52:21
• Autor: nbuy <nbuy@704c...>
• Commiter: nbuy

Log Message

replace intval() to cast (int) for speedup

git-svn-id: https://xoopscube.svn.sourceforge.net/svnroot/xoopscube/Package_Legacy/trunk@1031 704cf05f-ae62-4b0e-a484-234ee0250e75

Ändern Zusammenfassung

• modified: html/include/comment_delete.php
• modified: html/include/comment_edit.php
• modified: html/include/comment_form.php
• modified: html/include/comment_new.php
• modified: html/include/comment_post.php
• modified: html/include/comment_reply.php
• modified: html/include/comment_view.php
• modified: html/include/commentform.inc.php
• modified: html/include/notification_functions.php
• modified: html/include/old_functions.php

Diff

--- a/html/include/comment_delete.php
+++ b/html/include/comment_delete.php
@@ -36,13 +36,13 @@ include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
 $op = 'delete';
 if (!empty($_POST)) {
     $com_mode = isset($_POST['com_mode']) ? htmlspecialchars(trim($_POST['com_mode']), ENT_QUOTES) : 'flat';
-    $com_order = isset($_POST['com_order']) ? intval($_POST['com_order']) : XOOPS_COMMENT_OLD1ST;
-    $com_id = isset($_POST['com_id']) ? intval($_POST['com_id']) : 0;
+    $com_order = isset($_POST['com_order']) ? (int)$_POST['com_order'] : XOOPS_COMMENT_OLD1ST;
+    $com_id = isset($_POST['com_id']) ? (int)$_POST['com_id'] : 0;
     $op = isset($_POST['op']) ? $_POST['op'] : 'delete';
 } else {
     $com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : 'flat';
-    $com_order = isset($_GET['com_order']) ? intval($_GET['com_order']) : XOOPS_COMMENT_OLD1ST;
-    $com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
+    $com_order = isset($_GET['com_order']) ? (int)$_GET['com_order'] : XOOPS_COMMENT_OLD1ST;
+    $com_id = isset($_GET['com_id']) ? (int)$_GET['com_id'] : 0;
 
 }
 
@@ -100,7 +100,7 @@ if (false != $accesserror) {
     if ($ref != '') {
         redirect_header($ref, 2, _NOPERM);
     } else {
-        redirect_header($redirect_page.'?'.$comment_config['itemName'].'='.intval($com_itemid), 2, _NOPERM);
+        redirect_header($redirect_page.'?'.$comment_config['itemName'].'='.(int)$com_itemid, 2, _NOPERM);
     }
     exit();
 }

--- a/html/include/comment_edit.php
+++ b/html/include/comment_edit.php
@@ -54,7 +54,7 @@ if ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE ==
 
 $t_root->mLanguageManager->loadPageTypeMessageCatalog('comment');
 
-$com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
+$com_id = isset($_GET['com_id']) ? (int)$_GET['com_id'] : 0;
 $com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : '';
 if ($com_mode == '') {
 	if (is_object($xoopsUser)) {
@@ -70,7 +70,7 @@ if (!isset($_GET['com_order'])) {
 		$com_order = $xoopsConfig['com_order'];
 	}
 } else {
-	$com_order = intval($_GET['com_order']);
+	$com_order = (int)$_GET['com_order'];
 }
 $comment_handler =& xoops_gethandler('comment');
 $comment =& $comment_handler->get($com_id);

--- a/html/include/comment_form.php
+++ b/html/include/comment_form.php
@@ -93,8 +93,8 @@ $br_checkbox->addOption(1, _CM_DOAUTOWRAP);
 $option_tray->addElement($br_checkbox);
 
 $cform->addElement($option_tray);
-$cform->addElement(new XoopsFormHidden('com_pid', intval($com_pid)));
-$cform->addElement(new XoopsFormHidden('com_rootid', intval($com_rootid)));
+$cform->addElement(new XoopsFormHidden('com_pid', (int)$com_pid));
+$cform->addElement(new XoopsFormHidden('com_rootid', (int)$com_rootid));
 $cform->addElement(new XoopsFormHidden('com_id', $com_id));
 $cform->addElement(new XoopsFormHidden('com_itemid', $com_itemid));
 $cform->addElement(new XoopsFormHidden('com_order', $com_order));

--- a/html/include/comment_new.php
+++ b/html/include/comment_new.php
@@ -53,7 +53,7 @@ if ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE ==
 
 $t_root->mLanguageManager->loadPageTypeMessageCatalog('comment');	///< Is this must?
 
-$com_itemid = isset($_GET['com_itemid']) ? intval($_GET['com_itemid']) : 0;
+$com_itemid = isset($_GET['com_itemid']) ? (int)$_GET['com_itemid'] : 0;
 
 if ($com_itemid > 0) {
 	include XOOPS_ROOT_PATH.'/header.php';
@@ -85,7 +85,7 @@ if ($com_itemid > 0) {
 			$com_order = $xoopsConfig['com_order'];
 		}
 	} else {
-		$com_order = intval($_GET['com_order']);
+		$com_order = (int)$_GET['com_order'];
 	}
 	$noname = 0;
 

--- a/html/include/comment_post.php
+++ b/html/include/comment_post.php
@@ -38,7 +38,7 @@ $t_root->mLanguageManager->loadPageTypeMessageCatalog("comment");	///< @todo Is
 
 include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
 
-$com_id = isset($_POST['com_id']) ? intval($_POST['com_id']) : 0;
+$com_id = isset($_POST['com_id']) ? (int)$_POST['com_id'] : 0;
 $extra_params = '';
 if ('system' == $xoopsModule->getVar('dirname')) {
     if (empty($com_id)) {
@@ -90,18 +90,18 @@ if (!empty($_POST)) {
 //    }
 
     $com_mode = isset($_POST['com_mode']) ? htmlspecialchars(trim($_POST['com_mode']), ENT_QUOTES) : 'flat';
-    $com_order = isset($_POST['com_order']) ? intval($_POST['com_order']) : XOOPS_COMMENT_OLD1ST;
-    $com_itemid = isset($_POST['com_itemid']) ? intval($_POST['com_itemid']) : 0;
-    $com_pid = isset($_POST['com_pid']) ? intval($_POST['com_pid']) : 0;
-    $com_rootid = isset($_POST['com_rootid']) ? intval($_POST['com_rootid']) : 0;
-    $com_status = isset($_POST['com_status']) ? intval($_POST['com_status']) : 0;
-    $dosmiley = (isset($_POST['dosmiley']) && intval($_POST['dosmiley']) > 0) ? 1 : 0;
-    $doxcode = (isset($_POST['doxcode']) && intval($_POST['doxcode']) > 0) ? 1 : 0;
-    $dobr = (isset($_POST['dobr']) && intval($_POST['dobr']) > 0) ? 1 : 0;
-    $dohtml = (isset($_POST['dohtml']) && intval($_POST['dohtml']) > 0) ? 1 : 0;
-    $doimage = (isset($_POST['doimage']) && intval($_POST['doimage']) > 0) ? 1 : 0;
+    $com_order = isset($_POST['com_order']) ? (int)$_POST['com_order'] : XOOPS_COMMENT_OLD1ST;
+    $com_itemid = isset($_POST['com_itemid']) ? (int)$_POST['com_itemid'] : 0;
+    $com_pid = isset($_POST['com_pid']) ? (int)$_POST['com_pid'] : 0;
+    $com_rootid = isset($_POST['com_rootid']) ? (int)$_POST['com_rootid'] : 0;
+    $com_status = isset($_POST['com_status']) ? (int)$_POST['com_status'] : 0;
+    $dosmiley = (isset($_POST['dosmiley']) && (int)$_POST['dosmiley'] > 0) ? 1 : 0;
+    $doxcode = (isset($_POST['doxcode']) && (int)$_POST['doxcode'] > 0) ? 1 : 0;
+    $dobr = (isset($_POST['dobr']) && (int)$_POST['dobr'] > 0) ? 1 : 0;
+    $dohtml = (isset($_POST['dohtml']) && (int)$_POST['dohtml'] > 0) ? 1 : 0;
+    $doimage = (isset($_POST['doimage']) && (int)$_POST['doimage'] > 0) ? 1 : 0;
     $com_icon = isset($_POST['com_icon']) ? trim($_POST['com_icon']) : '';
-    $noname = isset($_POST['noname']) ? intval($_POST['noname']) : 0;
+    $noname = isset($_POST['noname']) ? (int)$_POST['noname'] : 0;
 } else {
     exit();
 }

--- a/html/include/comment_reply.php
+++ b/html/include/comment_reply.php
@@ -50,7 +50,7 @@ $t_root->mLanguageManager->loadModuleMessageCatalog("legacy");
 $t_root->mLanguageManager->loadPageTypeMessageCatalog("comment");	///< @todo Is this must?
 
 
-$com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
+$com_id = isset($_GET['com_id']) ? (int)$_GET['com_id'] : 0;
 $com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : '';
 if ($com_mode == '') {
 	if (is_object($xoopsUser)) {
@@ -66,7 +66,7 @@ if (!isset($_GET['com_order'])) {
 		$com_order = $xoopsConfig['com_order'];
 	}
 } else {
-	$com_order = intval($_GET['com_order']);
+	$com_order = (int)$_GET['com_order'];
 }
 $comment_handler =& xoops_gethandler('comment');
 $comment =& $comment_handler->get($com_id);

--- a/html/include/comment_view.php
+++ b/html/include/comment_view.php
@@ -47,7 +47,7 @@ if (XOOPS_COMMENT_APPROVENONE != $xoopsModuleConfig['com_rule']) {
 	$t_root =& XCube_Root::getSingleton();
 	$t_root->mLanguageManager->loadPageTypeMessageCatalog('comment');
 	$comment_config = $xoopsModule->getInfo('comments');
-	$com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
+	$com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? (int)$_GET[$comment_config['itemName']] : 0;
 
 	if ($com_itemid > 0) {
 		$com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : '';
@@ -66,7 +66,7 @@ if (XOOPS_COMMENT_APPROVENONE != $xoopsModuleConfig['com_rule']) {
 				$com_order = $xoopsConfig['com_order'];
 			}
 		} else {
-			$com_order = intval($_GET['com_order']);
+		    $com_order = (int)$_GET['com_order'];
 		}
 		if ($com_order != XOOPS_COMMENT_OLD1ST) {
 			$xoopsTpl->assign(array('comment_order' => XOOPS_COMMENT_NEW1ST, 'order_other' => XOOPS_COMMENT_OLD1ST));
@@ -82,8 +82,8 @@ if (XOOPS_COMMENT_APPROVENONE != $xoopsModuleConfig['com_rule']) {
 			$admin_view = false;
 		}
 
-		$com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
-		$com_rootid = isset($_GET['com_rootid']) ? intval($_GET['com_rootid']) : 0;
+		$com_id = isset($_GET['com_id']) ? (int)$_GET['com_id'] : 0;
+		$com_rootid = isset($_GET['com_rootid']) ? (int)$_GET['com_rootid'] : 0;
 		$comment_handler =& xoops_gethandler('comment');
 		if ($com_mode == 'flat') {
 			$comments =& $comment_handler->getByItemId($xoopsModule->getVar('mid'), $com_itemid, $com_dborder);

--- a/html/include/commentform.inc.php
+++ b/html/include/commentform.inc.php
@@ -60,10 +60,10 @@ $smiley_checkbox->addOption(1, _DISABLESMILEY);
 $option_tray->addElement($smiley_checkbox);
 
 $cform->addElement($option_tray);
-$cform->addElement(new XoopsFormHidden('pid', intval($pid)));
-$cform->addElement(new XoopsFormHidden('comment_id', intval($comment_id)));
-$cform->addElement(new XoopsFormHidden('item_id', intval($item_id)));
-$cform->addElement(new XoopsFormHidden('order', intval($order)));
+$cform->addElement(new XoopsFormHidden('pid', (int)$pid));
+$cform->addElement(new XoopsFormHidden('comment_id', (int)$comment_id));
+$cform->addElement(new XoopsFormHidden('item_id', (int)$item_id));
+$cform->addElement(new XoopsFormHidden('order', (int)$order));
 $button_tray = new XoopsFormElementTray('' ,' ');
 $button_tray->addElement(new XoopsFormButton('', 'preview', _PREVIEW, 'submit'));
 $button_tray->addElement(new XoopsFormButton('', 'post', _CM_POSTCOMMENT, 'submit'));

--- a/html/include/notification_functions.php
+++ b/html/include/notification_functions.php
@@ -373,7 +373,7 @@ function &notificationSubscribableCategoryInfo ($module_id=null)
 			$sub_categories[] = $category;
 		} else {
 			$item_name = $category['item_name'];
-			$id = ($item_name != '' && isset($_GET[$item_name])) ? intval($_GET[$item_name]) : 0;
+			$id = ($item_name != '' && isset($_GET[$item_name])) ? (int)$_GET[$item_name] : 0;
 			if ($id > 0)  {
 				$category['item_id'] = $id;
 				$sub_categories[] = $category;

--- a/html/include/old_functions.php
+++ b/html/include/old_functions.php
@@ -36,7 +36,7 @@ function make_sidebar($side)
 	}
 	$xoopsLogger =& XoopsLogger::instance();
 	for ($i = 0; $i < $block_count; $i++) {
-		$bcachetime = intval($block_arr[$i]->getVar('bcachetime'));
+		$bcachetime = (int)$block_arr[$i]->getVar('bcachetime');
 		if (empty($bcachetime)) {
 			$xoopsTpl->xoops_setCaching(0);
 		} else {
@@ -114,7 +114,7 @@ function make_cblock()
 		$block_count = count($block_arr);
 		$xoopsLogger =& XoopsLogger::instance();
 		for ($i = 0; $i < $block_count; $i++) {
-			$bcachetime = intval($block_arr[$i]->getVar('bcachetime'));
+		    $bcachetime = (int)$block_arr[$i]->getVar('bcachetime');
 			if (empty($bcachetime)) {
 				$xoopsTpl->xoops_setCaching(0);
 			} else {