BUG: refs #198 Added reports

Author: Charles Ma

core/AppController.php

@@ -45,8 +45,6 @@ public function preDispatch()
     $this->view->metaDescription = Zend_Registry::get('configGlobal')->application->description;
     $this->view->metaKeywords = Zend_Registry::get('configGlobal')->application->keywords;
 
-    // init notifier
-    Zend_Registry::set('notifier', new MIDAS_Notifier()); 
 
     // Set the version
     $this->view->version = '3.0.0';
@@ -199,6 +197,8 @@ public function preDispatch()
       Zend_Registry::set('userSession', null);
       }
 
+    // init notifier
+    Zend_Registry::set('notifier', new MIDAS_Notifier($this->logged, $this->userSession)); 
     $this->view->lang = Zend_Registry::get('configGlobal')->application->lang;
     //create a global javascript json array
     $jsonGlobal = array(

core/Bootstrap.php

@@ -192,7 +192,7 @@ protected function _initRouter()
     $listeModule = array();
     foreach($modules as $key => $module)
       {      
-      if($module == 1 &&  file_exists(BASE_PATH.'/modules/'.$key))
+      if($module == 1 &&  file_exists(BASE_PATH.'/modules/'.$key) && file_exists(BASE_PATH . "/modules/".$key."/AppController.php"))
         {
         $listeModule[] = $key;
         }

core/controllers/components/DemoComponent.php

@@ -78,7 +78,7 @@ public function reset()
     $applicationConfig['global']['application.description'] = '';    
     $applicationConfig['global']['application.keywords'] = '';      
 
-    $enabledModules = array('visualize', 'oai', 'metadataextractor', 'api', 'scheduler', 'thumbnailcreator');
+    $enabledModules = array('visualize', 'oai', 'metadataextractor', 'api', 'scheduler', 'thumbnailcreator', 'statistics');
 
     foreach($enabledModules as $module)
       {
@@ -103,6 +103,7 @@ public function reset()
     require_once BASE_PATH.'/core/controllers/components/UploadComponent.php';
     $uploadCompoenent = new UploadComponent();
     $item = $uploadCompoenent->createUploadedItem($admin, 'midasLogo.gif', BASE_PATH.'/core/public/images/midasLogo.gif', $communityDao->getPublicFolder());
+    $item = $uploadCompoenent->createUploadedItem($admin, 'cow.vtp', BASE_PATH.'/core/public/demo/cow.vtp', $communityDao->getPublicFolder());
     }
 
   /** recursively delete a folder*/

core/layouts/layout.phtml

@@ -103,6 +103,20 @@ echo $this->doctype()
                   echo '
                       <li onclick="location.replace(\''.$this->webroot.'/admin\');"><a>'.$this->t('Administration').'</a></li>';
                   }
+                  
+                                  
+              $linksModules = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_GET_USER_MENU", array());
+              if(!empty($linksModules))
+                {
+                foreach($linksModules as $links)
+                  {
+                  foreach($links as $name => $link)
+                    {
+                    echo '
+                        <li onclick="location.replace(\''.$link.'\');"><a>'.$name.'</a></li>';
+                    }
+                  }
+                }
                 echo '
                     </ul>
                    ';
@@ -227,6 +241,26 @@ echo $this->doctype()
                <li <?php if($this->activemenu=='uploaded') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse/uploaded');" ><a href="<?php echo $this->webroot?>/browse/uploaded"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/addfile.png" /><span> <?php echo $this->t('My uploads');?></span></a></li>
               <?php
                 }
+                
+              $linksModules = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_GET_LEFT_LINKS", array());
+              if(!empty($linksModules))
+                {
+                foreach($linksModules as $links)
+                  {
+                  foreach($links as $name => $array)
+                    {
+                    if(count($array) != 2)
+                      {
+                      throw new Zend_Exception('Key = 0 should be the link, Key = 1 should be the image');
+                      }
+                    $link = $array[0];
+                    $image = $array[1];
+                    ?>
+                    <li  onclick="location.replace('<?php echo $link?>');" ><a href="<?php echo $link?>"><img alt="" src="<?php echo $image?>" /><span> <?php echo $name;?></span></a></li>
+                    <?php
+                    }
+                  }
+                }
               ?>
              </ul>
             <hr/>
@@ -293,4 +327,15 @@ echo $this->doctype()
       <?php echo $this->json?>
     </div>
   </body>
+  
+  <?php
+  $footers = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_GET_FOOTER_LAYOUT", array());
+  if(!empty($footers))
+    {
+    foreach($footers as $footer)
+      {
+      echo $footer;
+      }
+    }
+  ?>
 </html>

core/models/base/ItemModelBase.php

@@ -173,6 +173,7 @@ function incrementDownloadCount($itemdao)
       }
     $itemdao->download++;
     parent::save($itemdao);
+    Zend_Registry::get('notifier')->callback("CALLBACK_CORE_PLUS_ONE_DOWNLOAD", array('item' => $itemdao));
     }//end incrementDownloadCount
 
   /** Add a revision to an item

core/models/pdo/UserModel.php

@@ -117,6 +117,21 @@ function getAll($onlyPublic = false, $limit = 20, $order = 'lastname', $offset =
     return $return;
     } // end getAll()
 
+  /** Get admins */
+  function getAdmins()
+    {
+    $sql = $this->database->select();
+    $sql ->where('admin = ?', 1);
+
+    $rowset = $this->database->fetchAll($sql); 
+    $return = array();
+    foreach($rowset as $row)
+      {      
+      $return[] = $this->initDao('User', $row);
+      }
+    return $return;
+    } // end getAll()
+    
 
 
   /** Returns a user given its folder (either public,private or base folder) */

core/public/demo/cow.vtp

@@ -251,7 +251,8 @@ Add in group;Ajouter au groupe
 Set as moderator;Promouvoir en tant que mod�rateur
 Remove from community;Retirer de la communaut�
 Remove from group;Retirer du groupe
-Add Metadata;Ajouter M�tadonn�eThis name is already used;Ce nom est d�ja utilis�
+Add Metadata;Ajouter M�tadonn�e
+This name is already used;Ce nom est d�ja utilis�
 Name of the folder;Nom du r�pertoire
 Optional;Optionel
 Teaser;Courte descriptionMy Language;Ma Langue

core/translation/fr-main.csv

@@ -211,12 +211,21 @@ if($this->preview) // module visualize
         }
       if($this->isAdmin)
         {
+        $modules = Zend_Registry::get('modulesEnable');
+         if(in_array('statistics', $modules))
+          {
+          echo 
+         "<li>
+            <a href='".$this->webroot."/statistics/item?id=".$this->itemDao->getKey()."'><img alt='' src='{$this->coreWebroot}/public/images/icons/metadata.png'/> {$this->t('Statistics')}</a>
+          </li>        
+            ";
+          }
         echo 
        "
         <li>
           <a  href='javascript:;' id='itemDeleteLink'><img alt='' src='{$this->coreWebroot}/public/images/icons/close.png'/> {$this->t('Delete')}</a>
         </li>   
-          ";
+          ";         
         }
       ?>
     </ul>

core/views/item/view.phtml

@@ -13,7 +13,28 @@
 /** job model */
 class Scheduler_JobModel extends Scheduler_JobModelBase
 {
-
+  /** get by tasks */
+  public function getJobsByTask($task)
+    {
+    if(!is_string($task))
+      {
+      throw new Zend_Exception('Error Params');
+      }
+    $sql = $this->database->select()
+          ->setIntegrityCheck(false)
+          ->where('task = ?', $task)
+          ->where('status = ?', SCHEDULER_JOB_STATUS_TORUN);
+    
+    $rowset = $this->database->fetchAll($sql);
+    $return = array();
+    foreach($rowset as $row)
+      {
+      $tmpDao = $this->initDao('Job', $row, 'scheduler');
+      $return[] = $tmpDao;
+      unset($tmpDao);
+      }
+    return $return;
+    }
   /** get jobs*/
   public function getJobsToRun()
     {