Re: [Mantisbt-dev] I have screwed up the web site

[Kenzaburo I. <ke...@ma...>]

Thanks for pointing it out Ryan.  I've fixed things on the server and in 
the respository.  The repository and server should mirror each other.

I removed the phpAds material as that package has a security issue.

-Ken

> I have screwed up the web site. I made a minor change to the  
> adsense_vertical_inc.php and now it shows up online as a conflict:
> 
> http://mantisbt.org/adsense_vertical_inc.php
> 
> <<<<<<< adsense_vertical_inc.php
> =======
> </td>
> <td style="padding: 4px;">
> <script type="text/javascript">
> <!--
>     if (!document.phpAds_used) document.phpAds_used = ',';
>     phpAds_random = new String (Math.random());
>     phpAds_random = phpAds_random.substring(2,11);
> 
>     document.write ('<' + 'script type="text/javascript" src="');
>     document.write ('http://www.mantisbt.org/ads/adjs.php?n=' +  
> phpAds_random);
>     document.write ('&amp;what=zone:3');
>     document.write ('&amp;exclude=' + document.phpAds_used);
>     if (document.referer)
>         document.write ('&amp;referer=' + escape(document.referer));
>     document.write ('"><\/script>');
> //-->
> </script><noscript><a href="http://www.mantisbt.org/ads/adclick.php? 
> n=a54dfa62" target="_blank"><img src="http://www.mantisbt.org/ads/ 
> adview.php?what=zone:3&amp;n=a54dfa62" border="0" alt=""></a></noscript>
>  >>>>>>> 1.5
> 
> Of course that's a PHP include on every page, so that's making a  lovely 
> mess of things.
> 
> I don't see those conflicts in my working copy so I can't figure how  I 
> could get rid of them now.
> 
> I assume that, when I check something in, my diff gets applied to the  
> production server. Well, it looks like the production server's  
> adsense_vertical_inc.php was not the same as what was in the  
> repository, hence now some conflicts.
> 
> I was gonna ask about the adsense_vertical anyway, because as far as  I 
> can tell, the /ads/ path on the mantisbt.org server it references  
> doesn't exist. I guess someone manually truncated the file on the  
> production server? That would seem to have been a really bad idea.
> 
> So I'm gonna have to ask the administrators to set things right,  
> however that's done. And I would encourage the files on the  production 
> server to be identical with the repository so as to  prevent any further 
> mishaps.
> 
> I'd point out that the side_menu.php is also different, in that on  the 
> production server the FAQ link is commented out but in the  repository 
> it's not.