BUG: Fixed helloworld plugin

Author: Charles Marion

core/controllers/AdminController.php

@@ -276,7 +276,7 @@ function upgradeAction()
         }
       else
         {
-        echo JsonComponent::encode(array(true, 'Nothing to upgrade'));
+        echo JsonComponent::encode(array(false, 'Nothing to upgrade'));
         }
       return;
       }

core/public/js/admin/admin.index.js

@@ -1,5 +1,7 @@
   $(document).ready(function() {
 
+
+    
     tabs=$( "#tabsGeneric" ).tabs({
       });
     $("#tabsGeneric").show();

core/public/js/admin/admin.upgrade.js

@@ -21,8 +21,8 @@ function successUpgrade(responseText, statusText, xhr, form)
     }
   if(jsonResponse[0])
     {
-      tabs.tabs( "load" , 1); 
       createNotive(jsonResponse[1],4000);
+      window.location.reload()
     }
   else
     {

modules/helloworld/layouts/layout.phtml

@@ -67,14 +67,14 @@
           <ul>
             <li class="first">
               <?php
-              if($this->logged)
+              if($this->logged&&isset($this->userDao))
                 {
                 echo '
                    <b><a id="topUserName" href="'.$this->webroot.'/user/'.$this->userDao->getUserId().'" >'.$this->userDao->getFullName().' <img class="arrowUser" src="'.$this->coreWebroot.'/public/images/icons/arrow-user.gif" alt ="" /> </a> </b>
                     <ul>
                       <li onclick="location.replace(\''.$this->webroot.'/user/userpage\');"><a>'.$this->t('My Page').'</a></li>
                       <li class="myAccountLink"><a>'.$this->t('My Account').'</a></li>
-                      <li class="modulesLink"><a>'.$this->t('Modules').'</a></li>';
+                      ';
                 if($this->userDao->isAdmin())
                   {
                   echo '
@@ -123,15 +123,13 @@
     </div>
     <div class="Header">
       <div class="HeaderContent">
-
+        Hello Plugin !!!
         <div class="HeaderLogo" onclick="window.location='<?php echo $this->webroot?>';">
-          Hello Plugin !!!
         </div>
         <div class="HeaderSearch">
           <input type="text" id="live_search" value="<?= $this->t('Jump to a data, folder...') ?>" autocomplete="off" autocorrect="off" autocapitalize="off" />
           <input type="hidden" id="live_search_value" value="init"  />
           <div id="searchloading" style="display:none"></div>
-          <a id="advancedSearchLink"><?php echo $this->t('Advanced search')?></a>
        </div>
         <div class="HeaderAction">
           <ul>
@@ -145,16 +143,23 @@
         </div>
       </div>
     </div>
+    
     <div class="Wrapper">
+      <?php
+      if($this->needUpgrade)
+        {
+        echo '<span style="color:red;">MIDAS need to be upgraded. <a href="'.$this->webroot.'/admin/#ui-tabs-1">Upgrade</a></span><br/><br/>';
+        }
+      ?>
       <div class=SubWrapper">
+
         <div class="MainContent">
           <div class="SideBar">
             <ul>
               <li <?php if($this->activemenu=='feed') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/feed');" ><a href="<?php echo $this->webroot?>/feed"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/feed.png" /><span> <?php echo $this->t('Feed');?></span></a></li>
               <li <?php if($this->activemenu=='browse') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse');" ><a href="<?php echo $this->webroot?>/browse"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/data.png" /><span> <?php echo $this->t('Data');?></span></a></li>
               <li <?php if($this->activemenu=='community') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/community');" ><a href="<?php echo $this->webroot?>/community"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/community.png" /><span> <?php echo $this->t('Communities');?></span></a></li>
               <li id="menuUserInfo" <?php if($this->activemenu=='user') {echo 'class="active"';} ?>  ><a href="javascript:;"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/upload.png" /><span> <?php echo $this->t('My Uploads');?></span></a></li>
-              <li <?php if($this->activemenu=='plugin') {echo 'class="active"';} ?> class="last"><a href="#"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/plugin.png" /><span> <?php echo $this->t('Plugins');?></span></a></li>
             </ul>
             <hr/>
             <?php
@@ -165,7 +170,10 @@
               echo '<ul>';
               foreach ($recentReverse as $item)
                 {
-                echo "<li onclick=\"location.replace('{$this->webroot}/item/{$item->getKey()}');\" class='recentItem' title='".  str_replace("'", '"', $item->getName())." | todo'><a  href='{$this->webroot}/item/{$item->getKey()}'>".sliceRecentItem($item->getName())."</a></li>";
+                if(is_array($item))
+                  {
+                  echo "<li onclick=\"location.replace('{$this->webroot}/item/{$item['item_id']}');\" class='recentItem' title='".  str_replace("'", '"', $item['name'])." | todo'><a  href='{$this->webroot}/item/{$item['item_id']}'>".$this->slicename($item['name'],20)."</a></li>";
+                  }                  
                 }
               echo '</ul>';
               }
@@ -216,15 +224,4 @@
       <?php echo $this->json?>
     </div>
   </body>
-</html>
-
-<?php
-function sliceRecentItem($name)
-  {
-    if(strlen($name)>20)
-    {
-    $name=substr($name,0, 6).'...'.substr($name,strlen($name)-11);
-    }
-  return $name;
-  }
-  ?>
+</html>

modules/ldap/Notification.php

@@ -41,11 +41,7 @@ private function ldapLogin($params)
     $proxyPassword = $config['ldap']->ldap->proxyPassword;
     $passwordPrefix=Zend_Registry::get('configGlobal')->password->prefix;
 
-    $ldapsearch = 'uid='.substr($email,0,strpos($email,'@'));
-    if($searchTerm == 'mail')
-      {
-      $ldapsearch = 'mail='.$email;
-      }
+    $ldapsearch = $searchTerm.'='.$email;
 
     $ldap = ldap_connect($hostname);
     ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, $protocolVersion);

modules/ldap/controllers/ConfigController.php

@@ -42,11 +42,11 @@ function indexAction()
         {
         if(file_exists(BASE_PATH."/core/configs/ldap.local.ini.old"))
           {
-          unlink(BASE_PATH.'/modules/ldap/configs/module.local.ini.old');
+          unlink(BASE_PATH."/core/configs/ldap.local.ini.old");
           }
         if(file_exists(BASE_PATH."/core/configs/ldap.local.ini"))
           {
-          rename(BASE_PATH."/core/configs/ldap.local.ini", BASE_PATH.'/modules/ldap/configs/module.local.ini.old');
+          rename(BASE_PATH."/core/configs/ldap.local.ini",BASE_PATH."/core/configs/ldap.local.ini.old");
           }
         $applicationConfig['global']['ldap.hostname'] = $this->_getParam('hostname');
         $applicationConfig['global']['ldap.basedn'] = '"'.$this->_getParam('basedn').'"';