Development

Changeset 7485

You must first sign up to be able to contribute.

Changeset 7485

Show
Ignore:
Timestamp:
02/14/08 13:57:07 (9 months ago)
Author:
bascht
Message:
  • Changed sfDoctrine:: to Doctrine::
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfDoctrineSimpleCMSPlugin/branches/symfony-1.0/modules/sfSimpleCMS/lib/BasesfSimpleCMSActions.class.php

    r4950 r7485  
    6464    { 
    6565      $this->checkEditorCredential(); 
    66       $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
     66      $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
    6767      if ($page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
    6868      { 
    …… 
    7474    else 
    7575    { 
    76       $page = sfDoctrine::getTable('sfSimpleCMSPage')->findPublicBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
     76      $page = Doctrine::getTable('sfSimpleCMSPage')->findPublicBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
    7777    } 
    7878 
    …… 
    9999  { 
    100100    $this->checkEditorCredential(); 
    101     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     101    $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    102102    $this->forward404Unless($page); 
    103103     
    …… 
    150150     
    151151    $slug = $this->getRequestParameter('slug'); 
    152     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($slug); 
     152    $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($slug); 
    153153    $this->forward404Unless($page); 
    154154     
    …… 
    184184    $page_id = $this->getRequestParameter('page_id'); 
    185185    $culture = $this->getCulture(); 
    186     $relative_page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('position')); 
     186    $relative_page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('position')); 
    187187    $positionType = $this->getRequestParameter('position_type'); 
    188188    if($relative_page && $relative_page->getNode()->isRoot() && $positionType != 'under') 
    …… 
    195195    { 
    196196      // update 
    197       $page = sfDoctrine::getTable('sfSimpleCMSPage')->find($page_id); 
     197      $page = Doctrine::getTable('sfSimpleCMSPage')->find($page_id); 
    198198      $this->forward404Unless($page); 
    199199       
    …… 
    247247 
    248248    $culture = $this->getCulture(); 
    249     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     249    $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    250250    $this->forward404Unless($page); 
    251251     
    …… 
    265265 
    266266    $culture = $this->getCulture(); 
    267     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     267    $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    268268    $this->forward404Unless($page); 
    269269     
    …… 
    280280 
    281281    $culture = $this->getCulture(); 
    282     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     282    $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    283283    $this->forward404Unless($page); 
    284284 
    …… 
    291291   
    292292    $culture = $this->getCulture(); 
    293     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     293    $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    294294    $this->forward404Unless($page); 
    295295   
    …… 
    312312   
    313313    $culture = $this->getCulture(); 
    314     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     314    $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    315315    $this->forward404Unless($page); 
    316316   

  • plugins/sfDoctrineSimpleCMSPlugin/branches/symfony-1.0/modules/sfSimpleCMS/lib/BasesfSimpleCMSComponents.class.php

    r5206 r7485  
    2121  public function executeEditorTools() 
    2222  { 
    23     $this->page_names = sfDoctrine::getTable('sfSimpleCMSPage')->getAllPagesWithLevel(); 
     23    $this->page_names = Doctrine::getTable('sfSimpleCMSPage')->getAllPagesWithLevel(); 
    2424    $this->slug = $this->getRequestParameter('slug'); 
    2525    $this->culture = $this->getRequestParameter('sf_culture', sfConfig::get('app_sfSimpleCMS_default_culture', 'en')); 
    …… 
    3232    $include_unpublished_pages = $this->getRequestParameter('edit') == 'true'; 
    3333    $this->culture = $this->getCulture(); 
    34     $this->level1_nodes = sfDoctrine::getTable('sfSimpleCMSPage')->getlevel1($include_unpublished_pages, $this->culture); 
     34    $this->level1_nodes = Doctrine::getTable('sfSimpleCMSPage')->getlevel1($include_unpublished_pages, $this->culture); 
    3535  } 
    3636 
    …… 
    4343  { 
    4444    $include_unpublished_pages = $this->getRequestParameter('edit') == 'true'; 
    45     $this->pages = sfDoctrine::getTable('sfSimpleCMSPage')->getLatest(sfConfig::get('app_sfSimpleCMS_max_pages_in_list', 5), $include_unpublished_pages); 
     45    $this->pages = Doctrine::getTable('sfSimpleCMSPage')->getLatest(sfConfig::get('app_sfSimpleCMS_max_pages_in_list', 5), $include_unpublished_pages); 
    4646    $this->culture = $this->getCulture(); 
    4747  } 
    …… 
    7676        return; 
    7777      } 
    78       $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->slug, $culture); 
     78      $page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->slug, $culture); 
    7979    } 
    8080    else 
    8181    { 
    82       $page = sfDoctrine::getTable('sfSimpleCMSPage')->findPublicBySlug($this->slug, $culture); 
     82      $page = Doctrine::getTable('sfSimpleCMSPage')->findPublicBySlug($this->slug, $culture); 
    8383    } 
    8484 

  • plugins/sfDoctrineSimpleCMSPlugin/branches/symfony-1.0/modules/sfSimpleCMSAdmin/actions/actions.class.php

    r4950 r7485  
    3030  public function executeEditPage() 
    3131  { 
    32     $page = sfDoctrine::getTable('sfSimpleCMSPage')->find($this->getRequestParameter('id')); 
     32    $page = Doctrine::getTable('sfSimpleCMSPage')->find($this->getRequestParameter('id')); 
    3333    $this->redirect(sfSimpleCMSTools::urlForPage($page->getSlug(), 'edit=true', $this->getUser()->getCulture())); 
    3434  } 
    …… 
    3636  public function executeTogglePublish() 
    3737  { 
    38     $page = sfDoctrine::getTable('sfSimpleCMSPage')->find($this->getRequestParameter('id')); 
     38    $page = Doctrine::getTable('sfSimpleCMSPage')->find($this->getRequestParameter('id')); 
    3939    $this->forward404Unless($page); 
    4040     
    …… 
    5353      throw new Exception('Attempting to create a page with no slug. Please make sure you enter a slug in the form before submitting it.'); 
    5454    } 
    55     $relative_page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('position')); 
     55    $relative_page = Doctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('position')); 
    5656    $positionType = $this->getRequestParameter('position_type'); 
    5757    if($relative_page && $relative_page->getNode()->isRoot() && $positionType != 'under') 
    …… 
    8686    $page->setSlug($this->getRequestParameter('slug')); 
    8787    $page->setTemplate($this->getRequestParameter('template')); 
    88     sfDoctrine::getTable('sfSimpleCMSPage')->getTree()->createRoot($page); 
     88    Doctrine::getTable('sfSimpleCMSPage')->getTree()->createRoot($page); 
    8989 
    9090 
    …… 
    9595  { 
    9696    parent::executeList(); 
    97     $this->getRequest()->setAttribute('page_names', sfDoctrine::getTable('sfSimpleCMSPage')->getAllPagesWithLevel()); 
     97    $this->getRequest()->setAttribute('page_names', Doctrine::getTable('sfSimpleCMSPage')->getAllPagesWithLevel()); 
    9898  } 
    9999}