Changeset 2216:91f485a16187 for inc

Timestamp:

10/02/13 17:47:15 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Message:

Rename dcRepository to dcStore because of dotAddict used this name

Location:

inc

Files:

• admin/lib.moduleslist.php (modified) (12 diffs)
• core/class.dc.store.parser.php (moved) (moved from inc/core/class.dc.repository.parser.php) (2 diffs)
• core/class.dc.store.php (moved) (moved from inc/core/class.dc.repository.php) (5 diffs)
• core/class.dc.store.reader.php (moved) (moved from inc/core/class.dc.repository.reader.php) (5 diffs)
• prepend.php (modified) (1 diff)

inc/admin/lib.moduleslist.php

@@ -16 +16 @@
      public $core;
      public $modules;
-     public $repository;
+     public $store;
 
      public static $allow_multi_install = false;
@@ -47 +47 @@
           $this->core = $modules->core;
           $this->modules = $modules;
-          $this->repository = new dcRepository($modules, $xml_url);
+          $this->store = new dcStore($modules, $xml_url);
 
           $this->setPathInfo($modules_root);
@@ -231 +231 @@
      }
 
+     /** @todo Use new mesasge system **/
      public function displayMessage($action)
      {
@@ -487 +488 @@
                     } break;
 
-                    # Install (from repository)
+                    # Install (from store)
                     case 'install': if ($this->path_writable) {
                          $submits[] = 
@@ -493 +494 @@
                     } break;
 
-                    # Update (from repository)
+                    # Update (from store)
                     case 'update': if ($this->path_writable) {
                          $submits[] = 
@@ -591 +592 @@
                elseif (!empty($_POST['install'])) {
 
-                    $updated = $this->repository->get();
+                    $updated = $this->store->get();
                     if (!isset($updated[$id])) {
                          throw new Exception(__('No such module.'));
@@ -604 +605 @@
                     $this->core->callBehavior($prefix.'BeforeAdd', $module);
 
-                    $ret_code = $this->repository->process($module['file'], $dest);
+                    $ret_code = $this->store->process($module['file'], $dest);
 
                     # --BEHAVIOR-- moduleAfterAdd
@@ -614 +615 @@
                elseif (!empty($_POST['update'])) {
 
-                    $updated = $repository->get();
+                    $updated = $store->get();
                     if (!isset($updated[$id])) {
                          throw new Exception(__('No such module.'));
@@ -639 +640 @@
                     $this->core->callBehavior($prefix.'BeforeUpdate', $module);
 
-                    $this->repository->process($module['file'], $dest);
+                    $this->store->process($module['file'], $dest);
 
                     # --BEHAVIOR-- moduleAfterUpdate
@@ -666 +667 @@
                     $url = urldecode($_POST['pkg_url']);
                     $dest = $this->getPath().'/'.basename($url);
-                    $this->repository->download($url, $dest);
+                    $this->store->download($url, $dest);
                }
 
@@ -672 +673 @@
                $this->core->callBehavior($prefix.'BeforeAdd', null);
 
-               $ret_code = $this->repository->install($dest);
+               $ret_code = $this->store->install($dest);
 
                # --BEHAVIOR-- moduleAfterAdd
@@ -861 +862 @@
                $has_parent = !empty($module['parent']);
                if ($has_parent) {
-                    $is_parent_present = $this->core->themes->moduleExists($parent);
+                    $is_parent_present = $this->modules->moduleExists($parent);
                }
 

inc/core/class.dc.store.parser.php

@@ -18 +18 @@
 Provides an object to parse XML feed of modules from a repository.
 */
-class dcRepositoryParser
+class dcStoreParser
 {
      /** @var  object    XML object of feed contents */
@@ -30 +30 @@
       * Constructor.
       *
-      * @param string         Feed content
+      * @param string    $data          Feed content
       */
      public function __construct($data)

inc/core/class.dc.store.php

@@ -18 +18 @@
 Provides an object to parse XML feed of modules from repository.
 */
-class dcRepository
+class dcStore
 {
      /** @var  object    dcCore instance */
@@ -59 +59 @@
                return false;
           }
-          if (($parser = dcRepositoryReader::quickParse($this->xml_url, DC_TPL_CACHE, $force)) === false) {
+          if (($parser = dcStoreReader::quickParse($this->xml_url, DC_TPL_CACHE, $force)) === false) {
                return false;
           }
@@ -116 +116 @@
       *
       * Every time a part of query is find on module,
-      * result accuracy grow. Result is sorted by acuracy.
+      * result accuracy grow. Result is sorted by accuracy.
       *
       * @param string    $pattern  String to search
@@ -127 +127 @@
           # Split query into small clean words
           $patterns = explode(' ', $pattern);
-          array_walk($patterns, array('dcRepository','sanitize'));
+          array_walk($patterns, array('dcStore','sanitize'));
 
           # For each modules
@@ -134 +134 @@
                # Split modules infos into small clean word
                $subjects = explode(' ', $id.' '.$module['name'].' '.$module['desc']);
-               array_walk($subjects, array('dcRepository','sanitize'));
+               array_walk($subjects, array('dcStore','sanitize'));
 
                # Check contents

inc/core/class.dc.store.reader.php

@@ -19 +19 @@
 This class extends clearbricks netHttp class.
 */
-class dcRepositoryReader extends netHttp
+class dcStoreReader extends netHttp
 {
      /** @var  string    User agent used to query repository */
@@ -53 +53 @@
       *
       * @param string    $url      XML feed URL
-      * @return     object    dcRepository instance
+      * @return     object    dcStore instance
       */
      public function parse($url)
@@ -66 +66 @@
           }
 
-          return new dcRepositoryParser($this->getContent());
+          return new dcStoreParser($this->getContent());
      }
 
@@ -123 +123 @@
 
      /**
-      * Set force query reposiory.
+      * Set force query repository.
       *
       * @param boolean   $force    True to force query
@@ -202 +202 @@
                # Ok, parse feed
                case '200':
-                    if ($modules = new dcRepositoryParser($this->getContent())) {
+                    if ($modules = new dcStoreParser($this->getContent())) {
                          try {
                               files::makeDir(dirname($cached_file), true);

inc/prepend.php

@@ -46 +46 @@
 $__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php';
 $__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php';
-$__autoload['dcRepository']             = dirname(__FILE__).'/core/class.dc.repository.php';
-$__autoload['dcRepositoryReader']       = dirname(__FILE__).'/core/class.dc.repository.reader.php';
-$__autoload['dcRepositoryParser']       = dirname(__FILE__).'/core/class.dc.repository.parser.php';
+$__autoload['dcStore']             = dirname(__FILE__).'/core/class.dc.store.php';
+$__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php';
+$__autoload['dcStoreParser']       = dirname(__FILE__).'/core/class.dc.store.parser.php';
 
 $__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';