From: <se...@us...> - 2009-10-30 13:18:53
|
Revision: 22756 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22756&view=rev Author: sept_7 Date: 2009-10-30 13:18:41 +0000 (Fri, 30 Oct 2009) Log Message: ----------- [FIX] coding style no function in for loop statements, PHPCS errors Modified Paths: -------------- trunk/setup_smarty.php trunk/tiki-admin_actionlog.php trunk/tiki-approve_staging_page.php trunk/tiki-browse_gallery.php trunk/tiki-browse_image.php trunk/tiki-calendar_export_ical.php Modified: trunk/setup_smarty.php =================================================================== --- trunk/setup_smarty.php 2009-10-30 13:15:51 UTC (rev 22755) +++ trunk/setup_smarty.php 2009-10-30 13:18:41 UTC (rev 22756) @@ -15,8 +15,8 @@ require_once 'lib/setup/third_party.php'; require_once (defined('SMARTY_DIR') ? SMARTY_DIR : 'lib/smarty/libs/') . 'Smarty.class.php'; -class Smarty_Tikiwiki extends Smarty { - +class Smarty_Tikiwiki extends Smarty +{ function Smarty_Tikiwiki($tikidomain = '') { parent::Smarty(); if ($tikidomain) { $tikidomain.= '/'; } Modified: trunk/tiki-admin_actionlog.php =================================================================== --- trunk/tiki-admin_actionlog.php 2009-10-30 13:15:51 UTC (rev 22755) +++ trunk/tiki-admin_actionlog.php 2009-10-30 13:18:41 UTC (rev 22756) @@ -44,30 +44,30 @@ $nbViewedConfs = 0; if ($tiki_p_admin == 'y') { if (isset($_REQUEST['save'])) { - for ($i = 0; $i < sizeof($confs); ++$i) { - if (isset($_REQUEST['v_' . $confs[$i]['code']]) && $_REQUEST['v_' . $confs[$i]['code']] == 'on') { //viewed and reported - $logslib->set_actionlog_conf($confs[$i]['action'], $confs[$i]['objectType'], 'v'); - $confs[$i]['status'] = 'v'; - } elseif (isset($_REQUEST[$confs[$i]['code']]) && $_REQUEST[$confs[$i]['code']] == 'on') { - $logslib->set_actionlog_conf($confs[$i]['action'], $confs[$i]['objectType'], 'y'); - $confs[$i]['status'] = 'y'; + foreach($confs as $index => $conf) { + if (isset($_REQUEST['v_' . $conf['code']]) && $_REQUEST['v_' . $conf['code']] == 'on') { //viewed and reported + $logslib->set_actionlog_conf($conf['action'], $conf['objectType'], 'v'); + $confs[$index]['status'] = 'v'; + } elseif (isset($_REQUEST[$conf['code']]) && $_REQUEST[$conf['code']] == 'on') { + $logslib->set_actionlog_conf($conf['action'], $conf['objectType'], 'y'); + $confs[$index]['status'] = 'y'; } else { - $logslib->set_actionlog_conf($confs[$i]['action'], $confs[$i]['objectType'], 'n'); - $confs[$i]['status'] = 'n'; + $logslib->set_actionlog_conf($conf['action'], $conf['objectType'], 'n'); + $confs[$index]['status'] = 'n'; } } } } else { if (isset($_REQUEST['save'])) { $_prefs = 'v'; - for ($i = 0; $i < sizeof($confs); ++$i) { - if ($confs[$i]['status'] == 'v' || $confs[$i]['status'] == 'y') { // can only change what is recorded - if (isset($_REQUEST['v_' . $confs[$i]['code']]) && $_REQUEST['v_' . $confs[$i]['code']] == 'on') { //viewed - $_prefs.= $confs[$i]['id'] . 'v'; - $confs[$i]['status'] = 'v'; + foreach($confs as $index => $conf) { + if ($conf['status'] == 'v' || $conf['status'] == 'y') { // can only change what is recorded + if (isset($_REQUEST['v_' . $conf['code']]) && $_REQUEST['v_' . $conf['code']] == 'on') { //viewed + $_prefs.= $conf['id'] . 'v'; + $confs[$index]['status'] = 'v'; } else { - $_prefs.= $confs[$i]['id'] . 'y'; - $confs[$i]['status'] = 'y'; + $_prefs.= $conf['id'] . 'y'; + $confs[$index]['status'] = 'y'; } } } Modified: trunk/tiki-approve_staging_page.php =================================================================== --- trunk/tiki-approve_staging_page.php 2009-10-30 13:15:51 UTC (rev 22755) +++ trunk/tiki-approve_staging_page.php 2009-10-30 13:18:41 UTC (rev 22756) @@ -193,8 +193,8 @@ $tags = $freetaglib->get_tags_on_object($staging_page, 'wiki page'); $taglist = ''; - for ($i=0; $i<sizeof($tags['data']); $i++) { - $taglist .= $tags['data'][$i]['tag'] . ' '; + foreach( $tags['data'] as $t) { + $taglist .= $t['tag'] . ' '; } $freetaglib->update_tags($user, $page, 'wiki page', $taglist); Modified: trunk/tiki-browse_gallery.php =================================================================== --- trunk/tiki-browse_gallery.php 2009-10-30 13:15:51 UTC (rev 22755) +++ trunk/tiki-browse_gallery.php 2009-10-30 13:18:41 UTC (rev 22756) @@ -246,12 +246,12 @@ if ($prefs['feature_categories'] == 'y') { $type = 'image'; $arr = array(); - for ($i = 0; $i <= count($images['data']) - 1; $i++) { - $img_id = $images['data'][$i]['imageId']; + foreach( $images['data'] as $index => $imgd ) { + $img_id = $imgd['imageId']; $arr = $categlib->get_object_categories($type, $img_id); //adding categories to the object - for ($k = 0; $k <= count($arr) - 1; $k++) { - $images['data'][$i]['categories'][$k] = $categlib->get_category_name($arr[$k]); + foreach( $arr as $cat_name ) { + $images['data'][$index]['categories'][] = $categlib->get_category_name($cat_name); } } } Modified: trunk/tiki-browse_image.php =================================================================== --- trunk/tiki-browse_image.php 2009-10-30 13:15:51 UTC (rev 22755) +++ trunk/tiki-browse_image.php 2009-10-30 13:18:41 UTC (rev 22756) @@ -56,9 +56,9 @@ // adjust scale size to existing ones if ($scalesize && !$prefs['preset_galleries_info'] == 'y') { $testscale = 0; - for ($iscale = 0; $iscale < count($arrscales); $iscale++) { - if ($scalesize <= $arrscales[$iscale]['scale']) { - $testscale = $arrscales[$iscale]['scale']; + foreach( $arrscales as $arrscale ) { + if ($scalesize <= $arrscale['scale']) { + $testscale = $arrscale['scale']; break; } } @@ -165,16 +165,16 @@ $scaleinfo['nextscale'] = 0; $scaleinfo['prevscale'] = 0; $testscale = $resultscale ? $resultscale : $maxsize; -for ($iscale = 0; $iscale < count($arrscales); $iscale++) { - if ($testscale == $arrscales[$iscale]['scale']) { +foreach($arrscales as $arrscale) { + if ($testscale == $arrscale['scale']) { continue; } - if ($testscale > $arrscales[$iscale]['scale']) { - $scaleinfo['prevscale'] = $arrscales[$iscale]['scale']; + if ($testscale > $arrscale['scale']) { + $scaleinfo['prevscale'] = $arrscale['scale']; continue; } - if ($maxsize > $arrscales[$iscale]['scale']) { - $scaleinfo['nextscale'] = $arrscales[$iscale]['scale']; + if ($maxsize > $arrscale['scale']) { + $scaleinfo['nextscale'] = $arrscale['scale']; } break; } Modified: trunk/tiki-calendar_export_ical.php =================================================================== --- trunk/tiki-calendar_export_ical.php 2009-10-30 13:15:51 UTC (rev 22755) +++ trunk/tiki-calendar_export_ical.php 2009-10-30 13:18:41 UTC (rev 22756) @@ -69,24 +69,24 @@ $cal = $iCal->getSkeletonCalendar(); foreach ($events as $day=>$day_data) { - for ($i=0; $i < count($day_data); $i++) { + foreach( $day_data as $dd) { $ea=array(); - $ea["Summary"]=$day_data[$i]["result"]["name"]; - $ea["dateStart"]=$day_data[$i]["result"]["start"]; - $ea["dateEnd"]=$day_data[$i]["result"]["end"]; - $ea["Description"]=preg_replace("/\n/","\\n",$day_data[$i]["result"]["description"]); - if ($day_data[$i]["result"]["participants"]) { - $ea["Attendees"]=$day_data[$i]["result"]["participants"]; + $ea["Summary"]=$dd["result"]["name"]; + $ea["dateStart"]=$dd["result"]["start"]; + $ea["dateEnd"]=$dd["result"]["end"]; + $ea["Description"]=preg_replace("/\n/","\\n",$dd["result"]["description"]); + if ($dd["result"]["participants"]) { + $ea["Attendees"]=$dd["result"]["participants"]; } - $ea["LastModified"]=$day_data[$i]["result"]["lastModif"]; + $ea["LastModified"]=$dd["result"]["lastModif"]; // Second character of duration value must be a 'P' ?? - $ea["Duration"]=($day_data[$i]["result"]["end"] - $day_data[$i]["result"]["start"]); - $ea["Contact"]=array($day_data[$i]["result"]["user"]); - $ea["organizer"]=array($day_data[$i]["result"]["organizers"]); - $ea["URL"]=$day_data[$i]["result"]["url"]; - $ea["DateStamp"]=$day_data[$i]["result"]["created"]; - //$ea["RequestStatus"]=$day_data[$i]["result"]["status"]; - $ea["UID"]="tiki-".$day_data[$i]["result"]["calendarId"]."-".$day_data[$i]["result"]["calitemId"]; + $ea["Duration"]=($dd["result"]["end"] - $dd["result"]["start"]); + $ea["Contact"]=array($dd["result"]["user"]); + $ea["organizer"]=array($dd["result"]["organizers"]); + $ea["URL"]=$dd["result"]["url"]; + $ea["DateStamp"]=$dd["result"]["created"]; + //$ea["RequestStatus"]=$dd["result"]["status"]; + $ea["UID"]="tiki-".$dd["result"]["calendarId"]."-".$dd["result"]["calitemId"]; $c = $iCal->factory("Event",$ea); $cal->addEvent($c); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |