Changeset 2648 for cpc/trunk/project

Timestamp:

Apr 2, 2012, 2:14:14 PM (9 years ago)

Author:

goya

Message:

kicke les desinscrits avec is_active négatif

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/citoyen/actions/actions.class.php (modified) (1 diff)
• apps/frontend/templates/layout.php (modified) (3 diffs)
• batch/amendements/compute_latest_loi.sh (modified) (1 diff)
• batch/amendements/cut_amdmt.pl (modified) (2 diffs)
• lib/model/solr/SolrCommands.class.php (modified) (1 diff)
• lib/task/reindexSolrObjectTask.class.php (modified) (1 diff)
• lib/task/setVacancesTask.class.php (modified) (1 diff)
• lib/vendor/SolrServer/etc/jetty.xml (modified) (2 diffs)
• lib/vendor/SolrServer/solr/conf/solrconfig.xml (modified) (2 diffs)
• web/.htaccess (modified) (3 diffs)
• web/backend_dev.php (modified) (1 diff)
• web/frontend_dev.php (modified) (1 diff)
• web/robots.txt (modified) (1 diff)

cpc/trunk/project/apps/frontend/modules/citoyen/actions/actions.class.php

@@ -366 +366 @@
     $this->slug = $request->getParameter('slug');
     $this->activation_id = $request->getParameter('activation_id');
-    
+    if (Doctrine::getTable('Citoyen')->findOneBySlug($this->slug)->is_active < 0) {
+      $this->getUser()->setFlash('error', 'Ce compte a été désactivé');
+      return;
+    }
     if ($this->getUser()->isAuthenticated())
     {

cpc/trunk/project/apps/frontend/templates/layout.php

@@ -38 +38 @@
     <link rel="search" href="<?php echo $sf_request->getRelativeUrlRoot(); ?>/nosdeputesfr.xml" title="Rechercher sur NosDéputés.fr" type="application/opensearchdescription+xml" />
     <?php echo stylesheet_tag($style.'/jquery-ui-1.8.5.custom.css'); ?>
-    <?php echo stylesheet_tag($style.'/style.css'); ?>
+    <?php echo stylesheet_tag($style.'/style.v.2584.css'); ?>
     <?php echo stylesheet_tag($style.'/print', array('media' => 'print')); ?>
     <!--[if lte IE 6]>
@@ -122 +122 @@
         </div>
         </div>
-             <div style="text-align: center; margin-top: 27px;"><h2><a href="/simplifions-la-loi">Participez aux débats « Simplifions la loi 2.0 » !</a></h2></div>
+             <div style="text-align: center; margin-top: 27px;"><h2><a href="/confiseurs/2011/">Consultez notre étude 2010 &mdash; 2011 sur les sanctions relatives à la présence des députés !</a></h2></div>
       </div>
       <div id="corps_page">
@@ -144 +144 @@
       </div>
     </div>
+<script type="text/javascript"> 
+// Google 
+  var _gaq = _gaq || []; 
+  _gaq.push(['_setAccount', 'UA-10423931-2']); 
+  _gaq.push(['_trackPageview']); 
+  (function() { 
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; 
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; 
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); 
+  })(); 
+</script>
   </body>
 </html>

cpc/trunk/project/batch/amendements/compute_latest_loi.sh

@@ -7 +7 @@
 perl download_amendements_loi.pl $loi > /tmp/download_amendements.log
 
-for file in html/*; do 
+
+for file in html/*; do
+
+        if grep "$(md5sum $file | sed 's/ .*//')" disabled.list > /dev/null 2>&1;
+        then
+                rm $file;
+                continue;
+        fi
+
         fileout=$(echo $file | sed 's/html/json/' | sed 's/\.asp/\.xml/')
         perl cut_amdmt.pl $file > $fileout

cpc/trunk/project/batch/amendements/cut_amdmt.pl

@@ -39 +39 @@
 $string =~ s/(\<p class="presente".*)\s*\<br[\/]?\>\s*[\n]?\s*(.*)/\1, \2/g;
 $string =~ s/\<br\>.*\n//g;
-$string =~ s/&#8217;/'/g;
+$string =~ s/(&#8217;|’)/'/g;
 $string =~ s/&#339;/oe/g;
 $string =~ s/&#8211;/-/g;
@@ -107 +107 @@
            $output = 'expose';
         }
+        $line2 =~ s/"\s*([^"]*)\s*"/« \1 »/g;
         if (!$amdmt{$output}) { $amdmt{$output} = "<p>".$line2."</p>"; }
         else { $amdmt{$output} = $amdmt{$output}."<p>".$line2."</p>"; }

cpc/trunk/project/lib/model/solr/SolrCommands.class.php

@@ -46 +46 @@
 
   private function protect() {
-    if (! $this->semaphore) {
-      $this->semaphore = sem_get(self::getSemId());
-    }
-    sem_acquire($this->semaphore, 1);
+#    if (! $this->semaphore) {
+      $this->semaphore = sem_get(self::getSemId(), 1, 0666, -1);
+#    }
+    sem_acquire($this->semaphore);
   }
 

cpc/trunk/project/lib/task/reindexSolrObjectTask.class.php

@@ -30 +30 @@
         $this->index($i);
     } else {
-      $obj = Doctrine::getTable($class)->find($id);
-      $this->index($obj);
+      $this->index($class, $id);
     }
   }
 
-  protected static function index($obj) {
+  protected static function index($class, $id) {
+    $obj = Doctrine::getTable($class)->find($id);
     if (!$obj) {
       $json = new stdClass();

cpc/trunk/project/lib/task/setVacancesTask.class.php

@@ -44 +44 @@
       else $sem++;
     }
-
     $option = Doctrine::getTable('VariableGlobale')->findOneByChamp('vacances');
     if (!$option) {

cpc/trunk/project/lib/vendor/SolrServer/etc/jetty.xml

@@ -53 +53 @@
       <Arg>
           <New class="org.mortbay.jetty.nio.SelectChannelConnector">
-            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
+            <Set name="port"><SystemProperty name="jetty.port" default="8383"/></Set>
             <Set name="maxIdleTime">30000</Set>
             <Set name="Acceptors">2</Set>
@@ -72 +72 @@
           <New class="org.mortbay.jetty.bio.SocketConnector">
             <Set name="host"><SystemProperty name="jetty.host" default="localhost"/></Set>
-            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
+            <Set name="port"><SystemProperty name="jetty.port" default="8383"/></Set>
             <Set name="maxIdleTime">50000</Set>
             <Set name="lowResourceMaxIdleTime">1500</Set>

cpc/trunk/project/lib/vendor/SolrServer/solr/conf/solrconfig.xml

@@ -69 +69 @@
        other than the default ./data under the Solr home.
        If replication is in use, this should match the replication configuration. -->
-  <dataDir>${solr.data.dir:./solr/data}</dataDir>
+  <dataDir>/home/nosdeputes/prod/lib/vendor/SolrServer/solr/data/</dataDir>
 
 
@@ -429 +429 @@
       concurrently.  An error is returned if this limit is exceeded. Recommend
       1-2 for read-only slaves, higher for masters w/o cache warming. -->
-    <maxWarmingSearchers>2</maxWarmingSearchers>
+    <maxWarmingSearchers>4</maxWarmingSearchers>
 
   </query>

cpc/trunk/project/web/.htaccess

@@ -6 +6 @@
   # uncomment the following line, if you are having trouble
   # getting no_script_name to work
-  #RewriteBase /
+  RewriteBase /
+  RewriteRule ^(.*)\.v\.[0-9]+(\..*)$ $1$2 [QSA,L,E=VERSIONED_FILE:1]
 
   # we skip all files with .something
@@ -12 +13 @@
   #RewriteCond %{REQUEST_URI} !\.html$
   #RewriteRule .* - [L]
+  RewriteRule ^simplifions-la-loi /dossiers/date [R,L]
+  RewriteRule ^Simplifions-la-loi-2.0 /dossiers/date [R,L]
+  RewriteRule ^simplifions-LOPPSI /loi/2271 [R,L]
+  RewriteRule ^Simplifions-LOPPSI /loi/2271 [R,L]
+  RewriteRule ^simplifions-loppsi /loi/2271 [R,L]
+  RewriteRule ^loppsi /loi/2271 [R,L]
+  RewriteRule ^lopsi /loi/2271 [R,L]
+  RewriteRule ^LOPPSI /loi/2271 [R,L]
+  RewriteRule ^LOPSI /loi/2271 [R,L]
+  RewriteRule ^Grenelle2.0 /loi/2449 [R,L]
+  RewriteRule ^Grenelle2 /loi/2449 [R,L]
+  RewriteRule ^Grenelle /loi/2449 [R,L]
+  RewriteRule ^grenelle2.0 /loi/2449 [R,L]
+  RewriteRule ^grenelle2 /loi/2449 [R,L]
+  RewriteRule ^grenelle /loi/2449 [R,L]
+  RewriteRule ^GrenelleII /loi/2449 [R,L]
+  RewriteRule ^grenelleII /loi/2449 [R,L]
+  RewriteRule ^amnesty /loi/951 [R,L]
+  RewriteRule ^cpi /loi/951 [R,L]
+  RewriteRule ^retraite /loi/2760 [R,L]
+  RewriteRule ^Retraite /loi/2760 [R,L]
+  RewriteRule ^retraites /loi/2760 [R,L]
+#  RewriteRule ^dossier/ / [R,L]
 
   # we check if the .html version is here (caching)
   RewriteRule ^$ index.html [QSA]
   RewriteRule ^([^.]+)$ $1.html [QSA]
-  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-f 
 
   # no, so we redirect to our front web controller
@@ -22 +46 @@
 </IfModule>
 
+Redirect /confiseurs_1001 /confiseurs/2009
+Redirect /confiseurs_1007 /confiseurs/2010
+Redirect /confiseurs_temp_1107 /confiseurs/2011

cpc/trunk/project/web/backend_dev.php

@@ -3 +3 @@
 // this check prevents access to debug front controllers that are deployed by accident to production servers.
 // feel free to remove this, extend it or make something more sophisticated.
-if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1')))
+if (!in_array(@$_SERVER['HTTP_CF_CONNECTING_IP'], array('127.0.0.1',
+                '82.225.240.116', //Tangui (Paris)
+                '88.168.238.200', //Benjamin (Paris))) || !in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1','173.245.49.172', 
+                '82.225.240.116', //Tangui (Paris)
+                '88.168.238.200', //Benjamin (Paris)
+                '129.199.114.20', //Benjamin (Paris, ENS)
+                '77.205.50.174', //Brice 
+                                              '::1', )))
 {
-  die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+  die('You ('.@$_SERVER['REMOTE_ADDR'].')are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
 }
 

cpc/trunk/project/web/frontend_dev.php

@@ -1 +1 @@
 <?php
-
 // this check prevents access to debug front controllers that are deployed by accident to production servers.
 // feel free to remove this, extend it or make something more sophisticated.
-if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1')))
+if ( !in_array(@$_SERVER['HTTP_CF_CONNECTING_IP'], array('127.0.0.1',
+                '82.225.240.116', //Tangui (Paris)
+                '88.168.238.200', //Benjamin (Paris))) || !in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1',
+                '82.225.240.116', //Tangui (Paris)
+                '88.168.238.200', //Benjamin (Paris)
+                '129.199.114.20', //Benjamin (Paris, ENS)
+                '145.238.180.6' , // Benjamin Meudon
+                '88.181.216.59', //Tangui (Nantes)
+                '80.13.217.126', //Tangui (April)
+                '88.191.92.80', //Serveur dédié
+                '78.232.200.105', //Tangui Rennes
+                '78.29.235.101', //Tangui Bx
+                '::1')))
 {
-  die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+//  die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
 }
 

cpc/trunk/project/web/robots.txt

@@ -5 +5 @@
 User-agent: *
 Disallow: /recherche/
-
+Disallow: /citoyen/photo/samia-lakhal