From: Sylvie G. <sgr...@gm...> - 2009-07-06 14:47:43
|
Is everybody ok for a roolback to the commits that was not tab: 19941, 19940, 19939, 19915, 19920 19917 seems to be ok Does somebody know a better code indenter than php_beautifier... This one seems to miss a lot of cases. Thx sylvie On Mon, 2009-07-06 at 12:55 +0000, Jean-francois BILGER wrote: > I'm using php_beautifier. :) > > But when you forgot to put "-t" option at the end of your script it > does not indent at all :( > Sorry for that > About the array presentation, i don't see any advice on the tikiwiki > dev site so i try this one. > > Is that OK for you/all of you ? > > Jean-François B. > > --- En date de : Lun 6.7.09, Sylvie Greverend <sgr...@gm...> a > écrit : > > De: Sylvie Greverend <sgr...@gm...> > Objet: Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[19915] > trunk > À: "CVS/SVN commits information" > <tik...@li...>, "Jean-francois BILGER" > <ou...@fr...> > Date: Lundi 6 Juillet 2009, 14h29 > > Strange also tiki-directories_rss.php is still not correctly > idented > line 19 for instance has still space and tab. > > On Thu, 2009-07-02 at 18:40 +0000, > cha...@us... wrote: > > Revision: 19915 > > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=19915&view=rev > > Author: changi67 > > Date: 2009-07-02 18:40:38 +0000 (Thu, 02 Jul 2009) > > > > Log Message: > > ----------- > > [FIX] Indentation > > > > Modified Paths: > > -------------- > > trunk/tiki-directories_rss.php > > trunk/tiki-directory_add_site.php > > trunk/tiki-directory_add_tiki_site.php > > trunk/tiki-directory_admin.php > > trunk/tiki-directory_admin_categories.php > > trunk/tiki-directory_admin_related.php > > trunk/tiki-directory_admin_sites.php > > trunk/tiki-directory_browse.php > > trunk/tiki-directory_ranking.php > > trunk/tiki-directory_redirect.php > > trunk/tiki-directory_rss.php > > trunk/tiki-directory_search.php > > trunk/tiki-directory_validate_sites.php > > > > Modified: trunk/tiki-directories_rss.php > > > =================================================================== > > (Binary files differ) > > > > Modified: trunk/tiki-directory_add_site.php > > > =================================================================== > > --- trunk/tiki-directory_add_site.php 2009-07-02 18:16:41 > UTC (rev 19914) > > +++ trunk/tiki-directory_add_site.php 2009-07-02 18:40:38 > UTC (rev 19915) > > @@ -41,11 +41,9 @@ > > > > if ($_REQUEST["parent"] == 0) { > > $parent_name = 'Top'; > > - > > $all = 1; > > } else { > > $parent_info = > $dirlib->dir_get_category($_REQUEST['parent']); > > - > > $parent_name = $parent_info['name']; > > } > > > > @@ -54,7 +52,6 @@ > > if (isset($parent_info) && $user) { > > if (in_array($parent_info['editorGroup'], > $userlib->get_user_groups($user))) { > > $tiki_p_autosubmit_link = 'y'; > > - > > $smarty->assign('tiki_p_autosubmit_link', 'y'); > > } > > } > > @@ -73,7 +70,6 @@ > > $info = $dirlib->dir_get_site($_REQUEST["siteId"]); > > } else { > > $info = array(); > > - > > $info["name"] = ''; > > $info["description"] = ''; > > $info["url"] = ''; > > @@ -82,7 +78,6 @@ > > } > > > > $smarty->assign_by_ref('info', $info); > > - > > $smarty->assign('save', 'n'); > > > > // Replace (add or edit) a site > > @@ -91,7 +86,7 @@ > > $msg = ""; > > > > if (empty($user) && $prefs['feature_antibot'] == 'y' && > (!isset($_SESSION['random_number']) || > $_SESSION['random_number'] != $_REQUEST['antibotcode'])) { > > - $msg .= tra("You have mistyped the anti-bot verification > code; please try again."); > > + $msg .= tra("You have mistyped the anti-bot > verification code; please try again."); > > } > > > > if (empty($_REQUEST["name"])) { > > @@ -133,7 +128,7 @@ > > } > > if ($msg == "") { // no error > > $siteId = > $dirlib->dir_replace_site($_REQUEST["siteId"], > $_REQUEST["name"], $_REQUEST["description"], $_REQUEST["url"], > > - $_REQUEST["country"], $_REQUEST["isValid"]); > > + $_REQUEST["country"], $_REQUEST["isValid"]); > > $dirlib->remove_site_from_categories($siteId); > > > > foreach ($_REQUEST["siteCats"] as $acat) { > > @@ -207,11 +202,12 @@ > > $categs = $dirlib->dir_get_all_categories_accept_sites(0, > -1, 'name asc', $find, $_REQUEST["siteId"]); > > if (isset($_REQUEST["save"]) && $msg != "" && > isset($_REQUEST["siteCats"])) { // an error occured, the > chosen categs have to be set again > > $temp_max = sizeof($categs); > > - foreach ($_REQUEST["siteCats"] as $acat) > > + foreach ($_REQUEST["siteCats"] as $acat){ > > for ($ix = 0; $ix < $temp_max ; ++$ix) { > > if ($categs[$ix]["categId"] == $acat) > > $categs[$ix]["belongs"] = 'y'; > > } > > + } > > } > > $smarty->assign('categs', $categs); > > > > @@ -228,11 +224,11 @@ > > $smarty->display("tiki.tpl"); > > > > function country_sort($a, $b) { > > - if ($a == 'None' || $b == 'Other') { > > - return -1; > > - } elseif ($b == 'None' || $a == 'Other') { > > - return 1; > > - } else { > > - return strcmp($a, $b); > > - } > > + if ($a == 'None' || $b == 'Other') { > > + return -1; > > + } elseif ($b == 'None' || $a == 'Other') { > > + return 1; > > + } else { > > + return strcmp($a, $b); > > + } > > } > > > > Modified: trunk/tiki-directory_add_tiki_site.php > > > =================================================================== > > --- trunk/tiki-directory_add_tiki_site.php 2009-07-02 > 18:16:41 UTC (rev 19914) > > +++ trunk/tiki-directory_add_tiki_site.php 2009-07-02 > 18:40:38 UTC (rev 19915) > > @@ -5,9 +5,9 @@ > > include_once('lib/directory/dirlib.php'); > > > > if($prefs['feature_directory'] != 'y') { > > - $smarty->assign('msg',tra("This feature is disabled")); > > - $smarty->display("error.tpl"); > > - die; > > + $smarty->assign('msg',tra("This feature is disabled")); > > + $smarty->display("error.tpl"); > > + die; > > } > > > > // Set parent category to 2 ("tiki sites") > > @@ -27,33 +27,33 @@ > > $smarty->assign('siteId',$_REQUEST["siteId"]); > > > > if (empty($_REQUEST["name"])) { > > - $smarty->assign('msg',tra("Must enter a name to add a > site")); > > - $smarty->display("error.tpl"); > > - die; > > + $smarty->assign('msg',tra("Must enter a name to add a > site")); > > + $smarty->display("error.tpl"); > > + die; > > } > > > > if (empty($_REQUEST["url"])) { > > - $smarty->assign('msg',tra("Must enter a url to add a > site")); > > - $smarty->display("error.tpl"); > > - die; > > + $smarty->assign('msg',tra("Must enter a url to add a > site")); > > + $smarty->display("error.tpl"); > > + die; > > } > > > > if ((substr($_REQUEST["url"],0,7)<>'http://') && > (substr($_REQUEST["url"],0,8)<>'https://')) { > > - $_REQUEST["url"]='http://'.$_REQUEST["url"]; > > + $_REQUEST["url"]='http://'.$_REQUEST["url"]; > > } > > > > if($dirlib->dir_url_exists($_REQUEST['url'])) { > > - $smarty->assign('msg',tra("URL already added to the > directory. Duplicate site?")); > > - $smarty->display("error.tpl"); > > - die; > > + $smarty->assign('msg',tra("URL already added to the > directory. Duplicate site?")); > > + $smarty->display("error.tpl"); > > + die; > > } > > > > if($prefs['directory_validate_urls'] == 'y') { > > - @$fsh = fopen($_REQUEST['url'],'r'); > > - if(!$fsh) { > > - $smarty->assign('msg',tra("URL cannot be accessed: > wrong URL or site is offline and cannot be added to the > directory")); > > - $smarty->display("error.tpl"); > > - die; > > + @$fsh = fopen($_REQUEST['url'],'r'); > > + if(!$fsh) { > > + $smarty->assign('msg',tra("URL cannot be accessed: > wrong URL or site is offline and cannot be added to the > directory")); > > + $smarty->display("error.tpl"); > > + die; > > } > > } > > > > > > Modified: trunk/tiki-directory_admin.php > > > =================================================================== > > --- trunk/tiki-directory_admin.php 2009-07-02 18:16:41 > UTC (rev 19914) > > +++ trunk/tiki-directory_admin.php 2009-07-02 18:40:38 > UTC (rev 19915) > > @@ -13,16 +13,13 @@ > > > > if ($prefs['feature_directory'] != 'y') { > > $smarty->assign('msg', tra("This feature is > disabled").": feature_directory"); > > - > > $smarty->display("error.tpl"); > > die; > > } > > > > -if ($tiki_p_admin_directory > > - != 'y' && $tiki_p_admin_directory_sites != 'y' && > $tiki_p_admin_directory_cats != 'y' && > $tiki_p_validate_links != 'y') { > > +if ($tiki_p_admin_directory != 'y' && > $tiki_p_admin_directory_sites != 'y' && > $tiki_p_admin_directory_cats != 'y' && > $tiki_p_validate_links != 'y') { > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra("Permission denied")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > > > Modified: trunk/tiki-directory_admin_categories.php > > > =================================================================== > > --- trunk/tiki-directory_admin_categories.php 2009-07-02 > 18:16:41 UTC (rev 19914) > > +++ trunk/tiki-directory_admin_categories.php 2009-07-02 > 18:40:38 UTC (rev 19915) > > @@ -34,7 +34,6 @@ > > $parent_name = 'Top'; > > } else { > > $parent_info = > $dirlib->dir_get_category($_REQUEST['parent']); > > - > > $parent_name = $parent_info['name']; > > } > > > > @@ -56,7 +55,6 @@ > > $info = > $dirlib->dir_get_category($_REQUEST["categId"]); > > } else { > > $info = array(); > > - > > $info["name"] = ''; > > $info["childrenType"] = 'c'; > > $info["viewableChildren"] = 3; > > @@ -69,13 +67,13 @@ > > > > // Remove a category > > if (isset($_REQUEST["remove"])) { > > - $area = 'deldircateg'; > > - if ($prefs['feature_ticketlib2'] != 'y' or > (isset($_POST['daconfirm']) and isset($_SESSION["ticket_ > $area"]))) { > > - key_check($area); > > + $area = 'deldircateg'; > > + if ($prefs['feature_ticketlib2'] != 'y' or > (isset($_POST['daconfirm']) and isset($_SESSION["ticket_ > $area"]))) { > > + key_check($area); > > $dirlib->dir_remove_category($_REQUEST["remove"]); > > - } else { > > - key_get($area); > > - } > > + } else { > > + key_get($area); > > + } > > } > > > > // Replace (add or edit) a category > > > > Modified: trunk/tiki-directory_admin_related.php > > > =================================================================== > > --- trunk/tiki-directory_admin_related.php 2009-07-02 > 18:16:41 UTC (rev 19914) > > +++ trunk/tiki-directory_admin_related.php 2009-07-02 > 18:40:38 UTC (rev 19915) > > @@ -13,7 +13,6 @@ > > > > if ($prefs['feature_directory'] != 'y') { > > $smarty->assign('msg', tra("This feature is > disabled").": feature_directory"); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -21,7 +20,6 @@ > > if ($tiki_p_admin_directory_cats != 'y') { > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra("Permission denied")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -36,7 +34,6 @@ > > $parent_name = 'Top'; > > } else { > > $parent_info = > $dirlib->dir_get_category($_REQUEST['parent']); > > - > > $parent_name = $parent_info['name']; > > } > > > > @@ -48,9 +45,9 @@ > > > > // Remove a relationship > > if (isset($_REQUEST["remove"])) { > > - $area = 'deldirrelated'; > > - if ($prefs['feature_ticketlib2'] != 'y' or > (isset($_POST['daconfirm']) and isset($_SESSION["ticket_ > $area"]))) { > > - key_check($area); > > + $area = 'deldirrelated'; > > + if ($prefs['feature_ticketlib2'] != 'y' or > (isset($_POST['daconfirm']) and isset($_SESSION["ticket_ > $area"]))) { > > + key_check($area); > > $dirlib->dir_remove_related($_REQUEST["parent"], > $_REQUEST["categId"]); > > } else { > > key_get($area); > > @@ -61,7 +58,6 @@ > > if (isset($_REQUEST["update"])) { > > check_ticket('dir-admin-related'); > > $dirlib->dir_remove_related($_REQUEST["parent"], > $_REQUEST["oldcategId"]); > > - > > $dirlib->dir_add_categ_rel($_REQUEST["parent"], > $_REQUEST["categId"]); > > } > > > > @@ -69,7 +65,6 @@ > > if (isset($_REQUEST["add"])) { > > check_ticket('dir-admin-related'); > > $dirlib->dir_add_categ_rel($_REQUEST["parent"], > $_REQUEST["categId"]); > > - > > if (isset($_REQUEST["mutual"]) && $_REQUEST["mutual"] > == 'on') { > > $dirlib->dir_add_categ_rel($_REQUEST["categId"], > $_REQUEST["parent"]); > > } > > > > Modified: trunk/tiki-directory_admin_sites.php > > > =================================================================== > > --- trunk/tiki-directory_admin_sites.php 2009-07-02 > 18:16:41 UTC (rev 19914) > > +++ trunk/tiki-directory_admin_sites.php 2009-07-02 > 18:40:38 UTC (rev 19915) > > @@ -13,7 +13,6 @@ > > > > if ($prefs['feature_directory'] != 'y') { > > $smarty->assign('msg', tra("This feature is > disabled").": feature_directory"); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -27,11 +26,9 @@ > > > > if ($_REQUEST["parent"] == 0) { > > $parent_name = 'Top'; > > - > > $all = 1; > > } else { > > $parent_info = > $dirlib->dir_get_category($_REQUEST['parent']); > > - > > $parent_name = $parent_info['name']; > > } > > > > @@ -40,7 +37,6 @@ > > if (isset($parent_info) && $user) { > > if (in_array($parent_info['editorGroup'], > $userlib->get_user_groups($user))) { > > $tiki_p_admin_directory_sites = 'y'; > > - > > $smarty->assign('tiki_p_admin_directory_sites', > 'y'); > > } > > } > > @@ -48,7 +44,6 @@ > > if ($tiki_p_admin_directory_sites != 'y') { > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra("Permission denied")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -69,7 +64,6 @@ > > $info = $dirlib->dir_get_site($_REQUEST["siteId"]); > > } else { > > $info = array(); > > - > > $info["name"] = ''; > > $info["description"] = ''; > > $info["url"] = ''; > > @@ -102,14 +96,12 @@ > > check_ticket('dir-admin-sites'); > > if (empty($_REQUEST["name"])) { > > $smarty->assign('msg', tra("Must enter a name to > add a site")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > > > if (empty($_REQUEST["url"])) { > > $smarty->assign('msg', tra("Must enter a url to add > a site")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -123,7 +115,6 @@ > > > > if (!isset($_REQUEST["siteCats"]) || > count($_REQUEST["siteCats"]) == 0) { > > $smarty->assign('msg', tra("Must select a > category")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -182,7 +173,6 @@ > > } > > > > $smarty->assign_by_ref('cant_pages', $items["cant"]); > > - > > $smarty->assign_by_ref('items', $items["data"]); > > > > $categs = $dirlib->dir_get_all_categories_accept_sites(0, > -1, 'name asc', $find, $_REQUEST["siteId"]); > > > > Modified: trunk/tiki-directory_browse.php > > > =================================================================== > > --- trunk/tiki-directory_browse.php 2009-07-02 18:16:41 > UTC (rev 19914) > > +++ trunk/tiki-directory_browse.php 2009-07-02 18:40:38 > UTC (rev 19915) > > @@ -14,7 +14,6 @@ > > > > if ($prefs['feature_directory'] != 'y') { > > $smarty->assign('msg', tra("This feature is > disabled").": feature_directory"); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -22,7 +21,6 @@ > > if ($tiki_p_view_directory != 'y') { > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra("Permission denied")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -36,7 +34,6 @@ > > > > if ($_REQUEST["parent"] == 0) { > > $parent_name = 'Top'; > > - > > $all = 1; > > } else { > > $parent_info = > $dirlib->dir_get_category($_REQUEST['parent']); > > @@ -74,10 +71,7 @@ > > > > if ($categs['data'][$i]['childrenType'] == 'c' && > $categs['data'][$i]['viewableChildren'] > 0) { > > // Generate the subcategories with most hist as the > subcategories to show. > > - $subcats > > - = > $dirlib->dir_list_categories($categs['data'][$i]['categId'], > 0, $categs['data'][$i]['viewableChildren'], 'hits_desc', > > - ''); > > - > > + $subcats = > $dirlib->dir_list_categories($categs['data'][$i]['categId'], > 0, $categs['data'][$i]['viewableChildren'], 'hits_desc', > ''); > > $categs['data'][$i]['subcats'] = $subcats['data']; > > } > > > > @@ -87,8 +81,7 @@ > > } > > > > if ($categs['data'][$i]['childrenType'] == 'r' && > $categs['data'][$i]['viewableChildren'] > 0) { > > - $categs['data'][$i]['subcats'] > > - = > $dirlib->get_random_subcats($categs['data'][$i]['categId'], > $categs['data'][$i]['viewableChildren']); > > + $categs['data'][$i]['subcats'] = > $dirlib->get_random_subcats($categs['data'][$i]['categId'], > $categs['data'][$i]['viewableChildren']); > > } > > } > > > > @@ -102,7 +95,6 @@ > > if ($user) { > > if (in_array($categ_info['editorGroup'], > $userlib->get_user_groups($user))) { > > $tiki_p_admin_directory_sites = 'y'; > > - > > $smarty->assign('tiki_p_admin_directory_sites', > 'y'); > > } > > } > > @@ -131,9 +123,7 @@ > > $smarty->assign('find', $find); > > > > $items = $dirlib->dir_list_sites($_REQUEST['parent'], > $offset, $prefs['directory_links_per_page'], $sort_mode, '', > 'y'); > > - > > $smarty->assign_by_ref('cant_pages', $items["cant"]); > > - > > $smarty->assign_by_ref('items', $items["data"]); > > } > > > > > > Modified: trunk/tiki-directory_ranking.php > > > =================================================================== > > --- trunk/tiki-directory_ranking.php 2009-07-02 18:16:41 > UTC (rev 19914) > > +++ trunk/tiki-directory_ranking.php 2009-07-02 18:40:38 > UTC (rev 19915) > > @@ -14,7 +14,6 @@ > > > > if ($prefs['feature_directory'] != 'y') { > > $smarty->assign('msg', tra("This feature is > disabled").": feature_directory"); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -22,7 +21,6 @@ > > if ($tiki_p_view_directory != 'y') { > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra("Permission denied")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > > > Modified: trunk/tiki-directory_redirect.php > > > =================================================================== > > --- trunk/tiki-directory_redirect.php 2009-07-02 18:16:41 > UTC (rev 19914) > > +++ trunk/tiki-directory_redirect.php 2009-07-02 18:40:38 > UTC (rev 19915) > > @@ -13,7 +13,6 @@ > > > > if ($prefs['feature_directory'] != 'y') { > > $smarty->assign('msg', tra("This feature is > disabled").": feature_directory"); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -21,14 +20,12 @@ > > if ($tiki_p_view_directory != 'y') { > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra("Permission denied")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > > > if (!isset($_REQUEST['siteId'])) { > > $smarty->assign('msg', tra("No site indicated")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > > > Modified: trunk/tiki-directory_rss.php > > > =================================================================== > > (Binary files differ) > > > > Modified: trunk/tiki-directory_search.php > > > =================================================================== > > --- trunk/tiki-directory_search.php 2009-07-02 18:16:41 > UTC (rev 19914) > > +++ trunk/tiki-directory_search.php 2009-07-02 18:40:38 > UTC (rev 19915) > > @@ -14,7 +14,6 @@ > > > > if ($prefs['feature_directory'] != 'y') { > > $smarty->assign('msg', tra("This feature is > disabled").": feature_directory"); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -22,7 +21,6 @@ > > if ($tiki_p_view_directory != 'y') { > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra("Permission denied")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -60,7 +58,6 @@ > > } > > > > $smarty->assign_by_ref('cant_pages', $items["cant"]); > > - > > $smarty->assign_by_ref('items', $items["data"]); > > > > include_once ('tiki-section_options.php'); > > > > Modified: trunk/tiki-directory_validate_sites.php > > > =================================================================== > > --- trunk/tiki-directory_validate_sites.php 2009-07-02 > 18:16:41 UTC (rev 19914) > > +++ trunk/tiki-directory_validate_sites.php 2009-07-02 > 18:40:38 UTC (rev 19915) > > @@ -13,7 +13,6 @@ > > > > if ($prefs['feature_directory'] != 'y') { > > $smarty->assign('msg', tra("This feature is > disabled").": feature_directory"); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -21,7 +20,6 @@ > > if ($tiki_p_validate_links != 'y') { > > $smarty->assign('errortype', 401); > > $smarty->assign('msg', tra("Permission denied")); > > - > > $smarty->display("error.tpl"); > > die; > > } > > @@ -34,9 +32,9 @@ > > } > > > > if (isset($_REQUEST["remove"])) { > > - $area = 'deldirvalidate'; > > - if ($prefs['feature_ticketlib2'] != 'y' or > ($prefs['feature_ticketlib2'] != 'y' or > (isset($_POST['daconfirm']) and isset($_SESSION["ticket_ > $area"])))) { > > - key_check($area); > > + $area = 'deldirvalidate'; > > + if ($prefs['feature_ticketlib2'] != 'y' or > ($prefs['feature_ticketlib2'] != 'y' or > (isset($_POST['daconfirm']) and isset($_SESSION["ticket_ > $area"])))) { > > + key_check($area); > > $dirlib->dir_remove_site($_REQUEST["remove"]); > > } else { > > key_get($area); > > > > > > This was sent by the SourceForge.net collaborative > development platform, the world's largest Open Source > development site. > > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > > Tikiwiki-cvs mailing list > > Tik...@li... > > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > > > ------------------------------------------------------------------------------ > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |