Changeset 48

Timestamp:

05/24/08 13:34:40

Author:

nperriault

Message:

Upgraded scripts to use symfony 1.1, everything is broken, use with caution.

Files:

• trunk/apps/main/config/factories.yml (modified) (3 diffs)
• trunk/apps/main/config/filters.yml (modified) (2 diffs)
• trunk/apps/main/config/i18n.yml (deleted)
• trunk/apps/main/config/logging.yml (deleted)
• trunk/apps/main/config/mainConfiguration.class.php (added)
• trunk/apps/main/config/settings.yml (modified) (6 diffs)
• trunk/apps/main/lib/i18nSubdomainFilter.class.php (modified) (1 diff)
• trunk/apps/main/lib/myActions.class.php (modified) (1 diff)
• trunk/apps/main/modules/applications/actions/actions.class.php (modified) (15 diffs)
• trunk/apps/main/modules/blog_admin/actions/actions.class.php (modified) (1 diff)
• trunk/apps/main/modules/companies/actions/actions.class.php (modified) (12 diffs)
• trunk/apps/main/modules/events/actions/actions.class.php (modified) (1 diff)
• trunk/apps/main/modules/jobs/actions/actions.class.php (modified) (7 diffs)
• trunk/apps/main/modules/people/actions/actions.class.php (modified) (8 diffs)
• trunk/apps/main/modules/sfGuardAuth/actions/actions.class.php (modified) (11 diffs)
• trunk/apps/main/modules/sfGuardAuth/lib/BasesfGuardAuthActions.class.php (modified) (2 diffs)
• trunk/apps/main/modules/utils/actions/actions.class.php (modified) (3 diffs)
• trunk/apps/main/templates/_menu.php (modified) (1 diff)
• trunk/apps/main/templates/_messages.php (modified) (2 diffs)
• trunk/apps/main/templates/layout.php (modified) (1 diff)
• trunk/apps/main/templates/maps_layout.php (modified) (1 diff)
• trunk/batch/post_load.php (modified) (1 diff)
• trunk/batch/reinit.sh (modified) (1 diff)
• trunk/batch/update_geolocalizations.php (modified) (1 diff)
• trunk/config/ProjectConfiguration.class.php (moved) (moved from trunk/config/config.php) (1 diff)
• trunk/data/environment.migrated (added)
• trunk/lib/form (added)
• trunk/lib/form/ActivationForm.class.php (added)
• trunk/lib/form/ApplicationCompanyForm.class.php (added)
• trunk/lib/form/ApplicationDeveloperForm.class.php (added)
• trunk/lib/form/ApplicationForm.class.php (added)
• trunk/lib/form/BaseFormPropel.class.php (added)
• trunk/lib/form/BlogPostForm.class.php (added)
• trunk/lib/form/CompanyForm.class.php (added)
• trunk/lib/form/CompanyPersonForm.class.php (added)
• trunk/lib/form/EventForm.class.php (added)
• trunk/lib/form/JobForm.class.php (added)
• trunk/lib/form/LocalEventForm.class.php (added)
• trunk/lib/form/RecommendationForm.class.php (added)
• trunk/lib/form/base (added)
• trunk/lib/form/base/BaseActivationForm.class.php (added)
• trunk/lib/form/base/BaseApplicationCompanyForm.class.php (added)
• trunk/lib/form/base/BaseApplicationDeveloperForm.class.php (added)
• trunk/lib/form/base/BaseApplicationForm.class.php (added)
• trunk/lib/form/base/BaseBlogPostForm.class.php (added)
• trunk/lib/form/base/BaseCompanyForm.class.php (added)
• trunk/lib/form/base/BaseCompanyPersonForm.class.php (added)
• trunk/lib/form/base/BaseEventForm.class.php (added)
• trunk/lib/form/base/BaseJobForm.class.php (added)
• trunk/lib/form/base/BaseLocalEventForm.class.php (added)
• trunk/lib/form/base/BaseRecommendationForm.class.php (added)
• trunk/lib/model/Application.php (modified) (1 diff)
• trunk/lib/model/BlogPost.php (modified) (1 diff)
• trunk/lib/model/Company.php (modified) (1 diff)
• trunk/lib/model/Event.php (modified) (1 diff)
• trunk/lib/model/Job.php (modified) (2 diffs)
• trunk/lib/model/LocalEvent.php (modified) (1 diff)
• trunk/lib/model/PluginsfGuardUser.php (modified) (2 diffs)
• trunk/lib/symfonians/ImagesTools.class.php (modified) (3 diffs)
• trunk/plugins (modified) (1 prop)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/form (added)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/form/base (added)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/form/base/BasesfLocalizationForm.class.php (added)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/form/sfLocalizationForm.class.php (added)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/model/map/sfLocalizationMapBuilder.php (modified) (previous)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/model/om/BasesfLocalization.php (modified) (3 diffs)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/model/om/BasesfLocalizationPeer.php (modified) (4 diffs)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/form (added)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/form/TagForm.class.php (added)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/form/TaggingForm.class.php (added)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/form/base (added)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/form/base/BaseTagForm.class.php (added)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/form/base/BaseTaggingForm.class.php (added)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/model/map/TagMapBuilder.php (modified) (previous)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/model/map/TaggingMapBuilder.php (modified) (previous)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/model/om/BaseTag.php (modified) (2 diffs)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/model/om/BaseTagPeer.php (modified) (4 diffs)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/model/om/BaseTagging.php (modified) (4 diffs)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/model/om/BaseTaggingPeer.php (modified) (4 diffs)
• trunk/plugins/sfPropelActAsTaggableBehaviorPlugin/lib/sfPropelActAsTaggableBehavior.class.php (modified) (1 diff)
• trunk/symfony (modified) (1 diff)
• trunk/test/bootstrap/functional.php (modified) (2 diffs)
• trunk/test/bootstrap/unit.php (modified) (1 diff)
• trunk/web/index.php (modified) (1 diff)
• trunk/web/main_dev.php (modified) (1 diff)
• trunk/web/main_staging.php (modified) (1 diff)

trunk/apps/main/config/factories.yml

@@ +1 @@
+prod:
+  logger:
+    class:        sfAggregateLogger
+    param:
+      level:      err
+      loggers:
+        sf_file_debug:
+          class:  sfFileLogger
+          param:
+            file: %SF_LOG_DIR%/%SF_APP%_%SF_ENVIRONMENT%.log
+
-cli:
-  controller:
@@ -12 +23 @@
-
-all:
+  i18n:
+    class: sfI18N
+    param:
+      source:              XLIFF
+      debug:               off
+      untranslated_prefix: "[T]"
+      untranslated_suffix: "[/T]"
+      cache:
+        class: sfFileCache
+        param:
+          automatic_cleaning_factor: 0
+          cache_dir:                 %SF_I18N_CACHE_DIR%
+          lifetime:                  86400
+          prefix:                    %SF_APP_DIR%
-  storage:
-    class:                     sfSessionStorage
@@ -18 +43 @@
-      session_cookie_domain:   .<?php echo SYMFONIANS_MAIN_DOMAIN."\n" ?>
-      session_cookie_lifetime: <?php echo (30 * 86400)."\n" ?> 
-
-#  view_cache:
-#    class:                     sfSQLiteCache
-#    param:
-#      automaticCleaningFactor: 0
-#      database:                %SF_ROOT_DIR%/cache/cache.db
-
-#  controller:
-#    class: sfFrontWebController
-#
-#  request:
-#    class: sfWebRequest
-#
-#  response:
-#    class: sfWebResponse
-#
-#  user:
-#    class: myUser
-#
-#  storage:
-#    class: sfSessionStorage
-#    param:
-#      session_name: symfony
-#
-#  view_cache:
-#    class: sfFileCache
-#    param:
-#      automaticCleaningFactor: 0
-#      cacheDir:                %SF_TEMPLATE_CACHE_DIR%

trunk/apps/main/config/filters.yml

@@ -4 +4 @@
-rendering: ~
-
-web_debug: ~
-
-security:  ~
-
-rememberFilter:
-  class:    myRememberFilter
-
-csrf:
-  class:    sfCSRFFilter
-  param:
-    secret: 5ymf0n14n5
-
-conditionalCache:
@@ -26 +19 @@
-common:    ~
-
-flash:     ~
-
-execution: ~

trunk/apps/main/config/settings.yml

@@ -1 +1 @@
-prod:
-  .settings:
+    logging_enabled:        on
-    no_script_name:         on
-    cache:                  on
@@ -7 +8 @@
-dev:
-  .settings:
-
-
+
-    web_debug:              on
-    cache:                  off
@@ -17 +17 @@
-search:
-  .settings:
-
-
+
-    web_debug:              off
-    cache:                  off
@@ -27 +26 @@
-staging:
-  .settings:
-
-
+
-    web_debug:              on
-    cache:                  on
@@ -37 +35 @@
-test:
-  .settings:
-
-
+
-    cache:                  on
-    web_debug:              off
@@ -65 +62 @@
-
-  .settings:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    standard_helpers:       [Partial, Cache, Form, MoreForm, I18N, Button, ObjectUrl, Breadcrumb, Image, Event, MoreDate]
-#
-#    # Activated modules from plugins or from the symfony core
-    enabled_modules:        [cryptographp, sfGuardAuth, sfLucene]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

trunk/apps/main/lib/i18nSubdomainFilter.class.php

@@ -9 +9 @@
-   * @param int     $level
-   */
-SF_LOG_
+sfLogger::
-  {
-Logger::getInstance
+Context::getInstance()->getLogger
-  }
-

trunk/apps/main/lib/myActions.class.php

@@ -241 +241 @@
-    catch (sfException $e)
-    {
-
+getUser()->
-      $this->forward404(sprintf('User "%s" is flooding by mail', $this->getUser()->getGuardUser()->getUsername()));
-    }

trunk/apps/main/modules/applications/actions/actions.class.php

@@ -16 +16 @@
-      $this->updateFromRequest();
-      parent::purgeObjectRelatedCache($this->application);
-
+getUser()->
-      $this->getUser()->setAttribute('from_app_creation', true, 'symfonians');
-      $this->redirect('@application_connect_as_developer?slug='.$this->application->getSlug());
@@ -33 +33 @@
-    if (!$this->getUser()->isAdmin() && $this->application->getSubmitterId() != $this->getUser()->getId())
-    {
-
+getUser()->
-      $this->redirect('@application_page?slug='.$this->application->getSlug());
-    }
@@ -41 +41 @@
-      $this->updateFromRequest();
-      parent::purgeObjectRelatedCache($this->application);
-
+getUser()->
-      $this->getUser()->setAttribute('from_app_creation', true, 'symfonians');
-      $this->redirect('@application_page?slug='.$this->application->getSlug());
@@ -57 +57 @@
-      $this->updateCompanyConnectionFromRequest();
-      parent::purgeObjectRelatedCache($this->connection);
-
+getUser()->
-      $this->redirect('@application_page?slug='.$this->application->getSlug());
-    }
@@ -77 +77 @@
-      $this->updateDeveloperConnectionFromRequest();
-      parent::purgeObjectRelatedCache($this->connection);
-
+getUser()->
-      $this->redirect('@application_page?slug='.$this->application->getSlug());
-    }
@@ -96 +96 @@
-    if ($connection_data && $this->application->hasCompanyConnected($connection_data['company_id']))
-    {
-
+getUser()->
-      $this->redirect('@application_page?slug='.$this->application->getSlug());
-    }
@@ -106 +106 @@
-      parent::purgeObjectRelatedCache($this->connection);
-
-
+getUser()->
-      $this->redirect('@application_page?slug='.$this->application->getSlug());
-    }
@@ -121 +121 @@
-    if ($this->application->hasDeveloper($this->getUser()->getId()))
-    {
-
+getUser()->
-      $this->redirect('@application_page?slug='.$this->application->getSlug());
-    }
@@ -135 +135 @@
-      parent::purgeObjectRelatedCache($this->connection);
-
-
+getUser()->
-      $this->redirect('@application_page?slug='.$this->application->getSlug());
-    }
@@ -147 +147 @@
-    if (!$this->getUser()->isAdmin() && $this->getUser()->getId() != $this->application->getSubmitterId())
-    {
-
+getUser()->
-    }
-    else
@@ -153 +153 @@
-      parent::purgeObjectRelatedCache($this->application);
-      $this->application->delete();
-
+getUser()->
-    }
-    $this->redirect('@application_home');
@@ -257 +257 @@
-    $this->application->save();
-    parent::purgeHomepage();
-
+getUser()->
-    $this->redirect('@application_page?slug='.$this->application->getSlug());
-  }
@@ -367 +367 @@
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to save this record'));
-Logger::getInstance
+Context::getInstance()->getLogger
-      return false;
-    }
@@ -395 +395 @@
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to save this relation'));
-Logger::getInstance
+Context::getInstance()->getLogger
-    }
-  }
@@ -422 +422 @@
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to save this relation'));
-Logger::getInstance
+Context::getInstance()->getLogger
-    }
-  }

trunk/apps/main/modules/blog_admin/actions/actions.class.php

@@ -16 +16 @@
-      $this->updateBlogPostFromRequest();
-      $this->saveBlogPost($this->blog_post);
-
+getUser()->
-      
-      $cacheManager = $this->getContext()->getViewCacheManager();

trunk/apps/main/modules/companies/actions/actions.class.php

@@ -16 +16 @@
-      $this->updateFromRequest();
-      parent::purgeObjectRelatedCache($this->company);
-
+getUser()->
-      $this->getUser()->setAttribute('from_company_creation', true, 'symfonians');
-      $this->redirect('@company_connect_as_member?slug='.$this->company->getSlug());
@@ -28 +28 @@
-    if (!$this->getUser()->isAdmin() && $this->company->getSubmitterId() != $this->getUser()->getId())
-    {
-
+getUser()->
-      $this->redirect('@company_page?slug='.$this->company->getSlug());
-    }
@@ -36 +36 @@
-      $this->updateFromRequest();
-      parent::purgeObjectRelatedCache($this->company);
-
+getUser()->
-      $this->redirect('@company_page?slug='.$this->company->getSlug());
-    }
@@ -49 +49 @@
-    if ($this->getUser()->getId() != $this->connection->getUserId())
-    {
-
+getUser()->
-      $this->redirect('@company_page?slug='.$this->company->getSlug());
-    }
@@ -57 +57 @@
-      $this->updateConnectionFromRequest();
-      parent::purgeObjectRelatedCache($this->company);
-
+getUser()->
-      $this->redirect('@company_page?slug='.$this->company->getSlug());
-    }
@@ -84 +84 @@
-      $this->updateConnectionFromRequest();
-      parent::purgeObjectRelatedCache($this->connection);
-
+getUser()->
-      $this->redirect('@company_page?slug='.$this->company->getSlug());
-    }
@@ -98 +98 @@
-    if (!$this->company->getAllowContact())
-    {
-
+getUser()->
-      $this->redirect('@company_page?slug='.$this->company->getSlug());
-    }
@@ -117 +117 @@
-        return sfView::SUCCESS;
-      }
-
+getUser()->
-                                          array('%company%' => $this->company->getName())));
-      $this->redirect('@company_page?slug='.$this->company->getSlug());
@@ -128 +128 @@
-    if (!$this->getUser()->isAdmin() && $this->getUser()->getId() != $this->company->getSubmitterId())
-    {
-
+getUser()->
-    }
-    else
@@ -134 +134 @@
-      parent::purgeObjectRelatedCache($this->company);
-      $this->company->delete();
-
+getUser()->
-    }
-    $this->redirect('@companies_home');
@@ -301 +301 @@
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to save this record'));
-Logger::getInstance
+Context::getInstance()->getLogger
-      return false;
-    }
@@ -327 +327 @@
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to save this relation'));
-Logger::getInstance
+Context::getInstance()->getLogger
-      return false;
-    }

trunk/apps/main/modules/events/actions/actions.class.php

@@ -14 +14 @@
-    $this->forward404Unless($event, 'event not found');
-    $event->delete();
-
+getUser()->
-    $redirect = $this->getRequest()->getReferer();
-    $this->redirect($redirect ? $redirect : '@event_home');

trunk/apps/main/modules/jobs/actions/actions.class.php

@@ -16 +16 @@
-      $this->updateFromRequest();
-      parent::purgeObjectRelatedCache($this->job);
-
+getUser()->
-      $this->redirect('@job_page?slug='.$this->job->getSlug());
-    }
@@ -27 +27 @@
-    if (!$this->getUser()->isAdmin() && $this->job->getContactId() != $this->getUser()->getId())
-    {
-
+getUser()->
-      $this->redirect('@job_page?slug='.$this->job->getSlug());
-    }
@@ -35 +35 @@
-      $this->updateFromRequest();
-      parent::purgeObjectRelatedCache($this->job);
-
+getUser()->
-      $this->redirect('@job_page?slug='.$this->job->getSlug());
-    }
@@ -48 +48 @@
-    if (!is_null($this->job->getExpiresAt()) && $this->job->getExpiresAt(null) < time())
-    {
-
+getUser()->
-    }
-  }
@@ -57 +57 @@
-    if (!$this->getUser()->isAdmin() && $this->getUser()->getId() != $this->job->getContactId())
-    {
-
+getUser()->
-    }
-    else
@@ -63 +63 @@
-      parent::purgeObjectRelatedCache($this->job);
-      $this->job->delete();
-
+getUser()->
-    }
-    $this->redirect('@jobs_home');
@@ -245 +245 @@
-    {
-      $this->getRequest()->setError('errors', $this->getI18N()->__('Unable to save this record'));
-Logger::getInstance
+Context::getInstance()->getLogger
-      return sfView::SUCCESS;
-    }

trunk/apps/main/modules/people/actions/actions.class.php

@@ -15 +15 @@
-    if (!$this->recipient->getAllowContact(true))
-    {
-
+getUser()->
-      $this->redirect('@person_page?username='.$this->recipient->getUsername());
-    }
@@ -31 +31 @@
-                                          'reply-to'  => array('address' => $user->getEmail(),
-                                                               'name'    => $user->getDisplayName())));
-
+getUser()->
-                                          array('%person%' => $this->recipient->getDisplayName())));
-      $this->redirect('@person_page?username='.$this->recipient->getUsername());
@@ -68 +68 @@
-    if (!$this->getUser()->isAdmin())
-    {
-
+getUser()->
-    }
-    else
@@ -75 +75 @@
-      parent::purgeObjectRelatedCache($this->user);
-      $this->user->delete();
-
+getUser()->
-    }
-    $this->redirect('@people_home');
@@ -151 +151 @@
-    {
-      $recommendation->delete();
-
+getUser()->
-    }
-    else
-    {
-
+getUser()->
-    }
-    $this->redirect('@person_page?username='.$this->getRequestParameter('to_username'));
@@ -166 +166 @@
-    if ($this->user->getId() == $this->getUser()->getId())
-    {
-
+getUser()->
-      $this->redirect('@person_page?username='.$this->user->getUsername());
-    }
@@ -207 +207 @@
-        }
-
-
+getUser()->
-        $this->redirect('@person_page?username='.$this->user->getUsername());
-      }
@@ -217 +217 @@
-      {
-        $this->getRequest()->setError('errors',$this->__('Unable to save this record'));
-Logger::getInstance
+Context::getInstance()->getLogger
-        return sfView::SUCCESS;
-      }

trunk/apps/main/modules/sfGuardAuth/actions/actions.class.php

@@ -21 +21 @@
-    try
-    {
-
+getUser()->
-      $this->getUser()->setAttribute('redirect_after_login', '@user_profile');
-      $this->redirect('@sf_guard_signin');
@@ -32 +32 @@
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to activate your account'));
-Logger::getInstance
+Context::getInstance()->getLogger
-      return sfView::SUCCESS;
-    }
@@ -45 +45 @@
-      $user->setPassword($password);
-      $user->save();
-
+getUser()->
-      $this->redirect('@user_profile');
-    }
@@ -67 +67 @@
-    else
-    {
-Logger::getInstance
+Context::getInstance()->getLogger
-      return $this->renderText($this->__('Picture deletion failed'));
-    }
@@ -93 +93 @@
-        return sfView::SUCCESS;
-      }
-
+getUser()->
-                                          array('%email%' => $email)));
-      $this->redirect('@sf_guard_signin');
@@ -168 +168 @@
-      $this->user->save();
-      $this->purgePersonRelatedCache($this->user);
-
+getUser()->
-      $this->redirect('@user_profile');
-    }
@@ -178 +178 @@
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to save your profile'));
-Logger::getInstance
+Context::getInstance()->getLogger
-      return sfView::SUCCESS;
-    }
@@ -205 +205 @@
-      }
-      $this->user->save();
-
+getUser()->
-      $this->redirect('@user_profile_skills');
-    }
@@ -262 +262 @@
-        return sfView::SUCCESS;
-      }
-
+getUser()->
-                      ->__('A confirmation mail has been sent to %mail%',
-                           array('%mail%' => $user->getEmail())));
@@ -274 +274 @@
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to register your account'));
-Logger::getInstance
+Context::getInstance()->getLogger
-      return sfView::SUCCESS;
-    }
@@ -305 +305 @@
-        return sfView::SUCCESS;
-      }
-
+getUser()->
-      $this->redirect('@homepage');
-    }

trunk/apps/main/modules/sfGuardAuth/lib/BasesfGuardAuthActions.class.php

@@ -66 +66 @@
-      }
-      
-Routing::getInstance
+Context::getInstance()->getRouting
-      try
-      {
-        $controller = sfContext::getInstance()->getController();
-Routing::getInstance
+Context::getInstance()->getRouting
-        $redirect = $controller->genUrl($uri, true);
-        $user->setAttribute('redirect_after_login', $redirect);
@@ -95 +95 @@
-  {
-    $this->getUser()->setAttribute('redirect_after_login', 
-Routing::getInstance
+Context::getInstance()->getRouting
-    $this->getResponse()->setStatusCode(403);
-  }

trunk/apps/main/modules/utils/actions/actions.class.php

@@ -25 +25 @@
-      }
-
-
+getUser()->
-      $this->forward('utils', 'contactSent');