diff --git a/VERSIONS b/VERSIONS
index f184459dd916e9c824cf2b8ec5e79cbf62547c64..02156f01c34b3ef3dd7c14c27d5905de86cbaca3 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,14 @@
+12/01/2017 - v7.7.25 - v7.7.26
+
+ - ticket #53371 : Fiche bibliothèque : affichage du lien 'voir le plan' lorsque le lieu est renseigné.
+
+ - ticket #36347 : Compte lecteur : ajout de la colonne 'Support' dans la liste des prêts et des réservations. Amélioration du formatage de la liste des prêts PNB.
+
+ - ticket #52819 : Administration : ajout d'une variable pour gérer l'affichage de la disponibilité dans le résultat de recherche calculé avec la facette "En rayon".
+
+ - ticket #53372 : Administration : configuration de la boite calendrier : l'option du choix du mode d'affichage des titres n'apparaît que pour l'affichage "liste simple".
+
+
10/01/2017 - v7.7.24
- ticket #51334 : SIGB CDScript : Ajout du courriel et du numéro de carte dans le lien SSO
diff --git a/VERSIONS_HOTLINE/53371 b/VERSIONS_HOTLINE/53371
deleted file mode 100644
index 2dd39fe16c852f0f30c0a35a7267657c690f934f..0000000000000000000000000000000000000000
--- a/VERSIONS_HOTLINE/53371
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #53371 : Fiche bibliothèque : affichage du lien 'voir le plan' lorsque le lieu est renseigné
\ No newline at end of file
diff --git a/VERSIONS_HOTLINE/53372 b/VERSIONS_HOTLINE/53372
deleted file mode 100644
index cfc4ad5efa782f64858db8b59bee870102686be1..0000000000000000000000000000000000000000
--- a/VERSIONS_HOTLINE/53372
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #53372 : Boite calendrier : l'option du choix du mode d'affichage des titres n'apparaît que pour l'affichage "liste simple"
\ No newline at end of file
diff --git a/VERSIONS_WIP/41303 b/VERSIONS_WIP/41303
new file mode 100644
index 0000000000000000000000000000000000000000..620581633f3c54993694b66dff44612d125a641d
--- /dev/null
+++ b/VERSIONS_WIP/41303
@@ -0,0 +1 @@
+- #41303 : ajout d'une option pour activer / désactiver globalement la gestion des favoris bibliothèques
\ No newline at end of file
diff --git a/VERSIONS_WIP/52281 b/VERSIONS_WIP/52281
new file mode 100644
index 0000000000000000000000000000000000000000..820f0ef8f7c14b346a8e65de2623e69fabb2ea0d
--- /dev/null
+++ b/VERSIONS_WIP/52281
@@ -0,0 +1 @@
+ - ticket #52281 : publication du rapport d'état du système au début et à la fin des intégrations de données Cosmogramme
\ No newline at end of file
diff --git a/application/modules/opac/views/scripts/abonne/prets.phtml b/application/modules/opac/views/scripts/abonne/prets.phtml
index 332b242b68f9a507c566c90fd9791ff4b4d26568..32340c23b3c32c119d3a3a0a25d844b66500d253 100644
--- a/application/modules/opac/views/scripts/abonne/prets.phtml
+++ b/application/modules/opac/views/scripts/abonne/prets.phtml
@@ -35,7 +35,7 @@ echo $extend_all;
if($this->user->hasPNB()) {
echo $this->tag('h2', $this->_('Prêts numériques en cours'));
- echo $this->abonne_Loans($this->user->getPNBLoans());
+ echo $this->abonne_LoansPNB($this->user->getPNBLoans());
}
$this->closeBoite();
diff --git a/cosmogramme/php/integre_traite_main.php b/cosmogramme/php/integre_traite_main.php
index af80b939a9fec51e04c84bc8faf0a6dece51ae9f..d7b182124faa4ce8ad5ebab826c5051b26272c1a 100644
--- a/cosmogramme/php/integre_traite_main.php
+++ b/cosmogramme/php/integre_traite_main.php
@@ -601,8 +601,11 @@ if ($phase == 21)
// ----------------------------------------------------------------
setVariable("clef_traitements", "0");
setVariable("traitement_phase", "Traitement terminé");
+
+startIntegrationPhase('EndProcess');
+
$chrono->timeStart = $timeStart;
-$log->ecrire("<h4>Fin des traitements</h4>");
+
$log->ecrire("Déblocage de la base<br>");
$log->ecrire("Heure : " . date("G:i:s") . BR);
$log->ecrire('Temps de traitement : ' . $chrono->end() . BR);
diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index b80f6f48b4b5a7d7f22ed32492e5a4d4b3bb1b5c..5f2c656d79197496e2f8b314e7c9a3b18fdfba0e 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -84,9 +84,9 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
? self::filterByUserRole(array_map(
function($clef) {
return ($var = Class_AdminVar::find($clef)) ?
- $var : Class_AdminVar::set($clef, '');
+ $var : Class_AdminVar::set($clef, Class_AdminVar::getValueOrDefault($clef));
},
- array_keys($this->knownVars()[$controller])))
+ array_keys($this->knownVars()[$controller])))
: [];
}
@@ -168,7 +168,10 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
'TEXT_REPLACEMENTS' => Class_AdminVar_Meta::newRawText($this->_('Remplacement de textes à la volée. <br/>Ex:<br/>Panier;Sélection<br/>Vous avez %%d paniers;Vous avez %%d sélections')),
'URL_COSMOGRAMME' => Class_AdminVar_Meta::newDefault('')->bePrivate(),
'PACK_MOBILE' => Class_AdminVar_Meta::newOnOff($this->_('Activation des fonctions avancées du téléphone'))->bePrivate(),
- 'CNIL_CONSENT_ENABLE' => Class_AdminVar_Meta::newOnOff('Affiche la demande de consentement avant l\'insertion de cookies ou autres traceurs')],
+ 'CNIL_CONSENT_ENABLE' => Class_AdminVar_Meta::newOnOff('Affiche la demande de consentement avant l\'insertion de cookies ou autres traceurs'),
+ 'BUID' => Class_AdminVar_Meta::newRawText($this->_('Identifiant unique (attention: la modification de cette variable impactera les outils de suivi de cette installation)'))->bePrivate(),
+ 'STATUS_REPORT_PUSH_URL' => Class_AdminVar_Meta::newRawText($this->_('URL destinataire du rapport d\'état du système (0 pour désactiver)'), ['value' => 'http://pola.afi-sa.net/smile.php'])->bePrivate(),
+ 'STATUS_REPORT_TAGS' => Class_AdminVar_Meta::newMultiInput($this->_('Liste des tags à ajouter au rapport d\'état du système'))->bePrivate()],
'cosmogramme' => [
'DATE_LAST_FULL_INTEGRATION_USERS' => Class_AdminVar_Meta::newDefault($this->_('Date du dernier import total des abonnés (modifié par cosmogramme)')),
@@ -209,7 +212,8 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
],
'album' => $this->_getAlbumVars(),
'users' => ['NDAYS_EXPIRY_NOTICE' => Class_AdminVar_Meta::newDefault($this->_('Prévenir l\'utilisateur xx jour(s) avant l\'expiration de son abonnement (par défaut 30 jours).'), ['value' => 30]),
- 'DISABLE_SUGGESTIONS' => Class_AdminVar_Meta::newOnOff($this->_('Désactivation des suggestions d\'achats'))->bePrivate()],
+ 'DISABLE_SUGGESTIONS' => Class_AdminVar_Meta::newOnOff($this->_('Désactivation des suggestions d\'achats'))->bePrivate(),
+ 'ENABLE_BOOKMARKABLE_LIBRARIES' => Class_AdminVar_Meta::newOnOff($this->_('Les utilisateurs peuvent sélectionner des bibliothèques favorites pour leurs recherche'), ['value' => 1])],
'redmine' => ['REDMINE_SERVER_URL' => Class_Adminvar_Meta::newDefault($this->_('Url du serveur redmine'))->bePrivate(),
'REDMINE_PROXY_URL' => Class_Adminvar_Meta::newDefault($this->_('Url du proxy Redmine'))->bePrivate(),
'REDMINE_PROJECT_ID' => Class_Adminvar_Meta::newDefault($this->_('Identifiant du project Redmine'))->bePrivate()],
@@ -453,7 +457,7 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
* @return bool
*/
public function isModuleEnabled($name) {
- if (!$value = Class_AdminVar::get($name)) {
+ if (!$value = Class_AdminVar::getValueOrDefault($name)) {
return false;
}
diff --git a/library/Class/AdminVar/BUID.php b/library/Class/AdminVar/BUID.php
new file mode 100644
index 0000000000000000000000000000000000000000..8d3f1d50444eb52e8fb33bc70e6949070e3e2a8a
--- /dev/null
+++ b/library/Class/AdminVar/BUID.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_AdminVar_BUID {
+ public function getValue() {
+ if ($buid = Class_AdminVar::get('BUID'))
+ return $buid;
+
+ $buid = hash('crc32b',
+ uniqid(array_at('dbname',
+ Zend_Db_Table::getDefaultAdapter()->getConfig())));
+ Class_AdminVar::set('BUID', $buid);
+ return $buid;
+ }
+}
\ No newline at end of file
diff --git a/library/Class/Cosmogramme/Integration/PhaseEndProcess.php b/library/Class/Cosmogramme/Integration/PhaseEndProcess.php
new file mode 100644
index 0000000000000000000000000000000000000000..13514aeaa442dcefc473ad3da807de3360c9fdcc
--- /dev/null
+++ b/library/Class/Cosmogramme/Integration/PhaseEndProcess.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_Cosmogramme_Integration_PhaseEndProcess extends Class_Cosmogramme_Integration_PhaseAbstract {
+ const MY_ID = 22;
+
+ protected $_label = 'Fin des traitements';
+
+ protected function _init($phase) {}
+
+ protected function _execute() {
+ (new Class_Systeme_Report_Publication())->push($this->_log);
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/Class/Cosmogramme/Integration/PhasePrepareIntegrations.php b/library/Class/Cosmogramme/Integration/PhasePrepareIntegrations.php
index 05a460aadf5dea2b3013bfe76d624b42d9140ad6..71ebad6015ddc59c8f014d3647a149e67c258599 100644
--- a/library/Class/Cosmogramme/Integration/PhasePrepareIntegrations.php
+++ b/library/Class/Cosmogramme/Integration/PhasePrepareIntegrations.php
@@ -27,7 +27,7 @@ class Class_Cosmogramme_Integration_PhasePrepareIntegrations extends Class_Cosmo
protected
$_ftp_path,
$_integration_path,
- $_label = 'Déplacement des intégrations en file d\'attente';
+ $_label = 'Préparation des intégrations';
@@ -46,7 +46,10 @@ class Class_Cosmogramme_Integration_PhasePrepareIntegrations extends Class_Cosmo
public function _execute() {
- $this->_log->ecrire('<table class="blank" cellspacing="0" cellpadding="5px">');
+ (new Class_Systeme_Report_Publication())->push($this->_log);
+
+ $this->_log->ecrire('<h4>' . $this->_('Déplacement des intégrations en file d\'attente') . '</h4>');
+ $this->_log->ecrire('<br><table class="blank" cellspacing="0" cellpadding="5px">');
foreach (Class_IntMajAuto::findAllBy(['order' => 'rang']) as $majauto)
$this->_runOne($majauto);
diff --git a/library/Class/Loan/Pnb.php b/library/Class/Loan/Pnb.php
index 7c02c98249fb1f115e058b83dc01ae3e1d4b9ffb..40cff9304f43e496041a23c534221c7d28bb6710 100644
--- a/library/Class/Loan/Pnb.php
+++ b/library/Class/Loan/Pnb.php
@@ -125,5 +125,10 @@ class Class_Loan_Pnb extends Storm_Model_Abstract {
public function getType() {
return '';
}
+
+
+ public function getIssueDate() {
+ return $this->getLoanDate();
+ }
}
?>
\ No newline at end of file
diff --git a/library/Class/Systeme/Report.php b/library/Class/Systeme/Report.php
index adb13dd86acc502e5f024292103d0891c556f8c0..2a7ed1b54788beb98b4206fd713797f93655525a 100644
--- a/library/Class/Systeme/Report.php
+++ b/library/Class/Systeme/Report.php
@@ -67,6 +67,15 @@ class Class_Systeme_Report_Headers extends Class_Systeme_Report_Abstract {
public function acceptVisitor($visitor) {
$visitor->visitDatetime('creation_datetime', $this->_('Généré le'), $this->getCurrentTime());
$visitor->visitData('version', $this->_('Version'), BOKEH_RELEASE_NUMBER);
+
+ $visitor->visitData('buid',
+ $this->_('Identifiant unique'),
+ (new Class_AdminVar_BUID())->getValue());
+
+ $visitor->visitData('database',
+ $this->_('Base de données'),
+ array_at('dbname',
+ Zend_Db_Table::getDefaultAdapter()->getConfig()));
}
}
@@ -78,6 +87,7 @@ class Class_Systeme_Report_Portal extends Class_Systeme_Report_Abstract {
$visitor->visitData('url', $this->_('URL principale'), Class_Url::siteUrl());
$visitor->visitData('label', $this->_('Libellé principal'), Class_Profil::getPortail()->getLibelle());
$visitor->visitDataArray('skins', $this->_('Thèmes utilisés'), $this->_profilSkins());
+ $visitor->visitDataArray('tags', $this->_('Tags'), $this->_fetchTags());
}
@@ -89,6 +99,19 @@ class Class_Systeme_Report_Portal extends Class_Systeme_Report_Abstract {
->getArrayCopy()));
}
+
+ protected function _fetchTags() {
+ $tags = (string)Class_AdminVar::get('STATUS_REPORT_TAGS');
+ if (defined('STATUS_REPORT_TAGS'))
+ $tags = (string)constant('STATUS_REPORT_TAGS') . ',' . $tags;
+
+ return
+ array_values(
+ array_filter(
+ array_map('trim',
+ preg_split(
+ '/[^0-9a-zA-Z_]+/', $tags))));
+ }
}
diff --git a/library/Class/Systeme/Report/Cosmogramme.php b/library/Class/Systeme/Report/Cosmogramme.php
index 227a2ae0e13784b5be1f55d9bfae9c3c28f960c7..3280ada049abc67a9b9449dd741276334cb0e75f 100644
--- a/library/Class/Systeme/Report/Cosmogramme.php
+++ b/library/Class/Systeme/Report/Cosmogramme.php
@@ -37,7 +37,7 @@ class Class_Systeme_Report_Cosmogramme extends Class_Systeme_Report_Abstract {
$visitor->visitDatetime('last_run',
$this->_('Dernier traitement d\'intégration effectué le'),
- $this->_date_integration);
+ strtotime($this->_date_integration));
return $this;
}
diff --git a/library/Class/Systeme/Report/Publication.php b/library/Class/Systeme/Report/Publication.php
new file mode 100644
index 0000000000000000000000000000000000000000..942f95f6ba4b1b1ffb55de5d24f0e8324442cf1a
--- /dev/null
+++ b/library/Class/Systeme/Report/Publication.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_Systeme_Report_Publication extends Class_WebService_Abstract {
+ use Trait_Translator;
+
+ public function push($log) {
+ if (!$url = Class_AdminVar::getValueOrDefault('STATUS_REPORT_PUSH_URL'))
+ return $this;
+
+ if (!(new ZendAfi_Validate_Url())->isValid($url))
+ return $this;
+
+ $log->addInfo($this->_('Publication du rapport système'));
+
+ $json = (new ZendAfi_View_Helper_Status_Json())->status_Json();
+
+ try {
+ $this->getHttpClient()->postData($url,
+ ['report' => $json]);
+ } catch (Exception $e) {
+ $log->addError($this->_('Echec de la publication du rapport sur %s (%s)',
+ $url,
+ $e->getMessage()));
+ }
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/Class/User/Settings.php b/library/Class/User/Settings.php
index 48a0cf94b1ae49c72a54740e6f140123658d5d56..8368d29a7e1935d4cc30411ffd08e9aa54ff88f0 100644
--- a/library/Class/User/Settings.php
+++ b/library/Class/User/Settings.php
@@ -40,9 +40,12 @@ class Class_User_Settings {
public static function isBookmarkLibraryReady() {
- return Class_Profil::getCurrentProfil()->isItemAnnexDisplay()
- ? 1 < Class_CodifAnnexe::countBy([])
- : 1 < Class_Bib::countBy([]);
+ return
+ Class_AdminVar::isModuleEnabled('ENABLE_BOOKMARKABLE_LIBRARIES')
+ &&
+ (Class_Profil::getCurrentProfil()->isItemAnnexDisplay()
+ ? 1 < Class_CodifAnnexe::countBy([])
+ : 1 < Class_Bib::countBy([]));
}
diff --git a/library/Class/WebService/Abstract.php b/library/Class/WebService/Abstract.php
index 738f17f8f55a301db776622019a16fb111b60d65..3ee8d4a09056e36e4661b5342bb1f015dab6a80b 100644
--- a/library/Class/WebService/Abstract.php
+++ b/library/Class/WebService/Abstract.php
@@ -22,7 +22,6 @@
class Class_WebService_Abstract {
use Trait_Timesource;
- protected $_message;
protected static $_http_client;
public static function setDefaultHttpClient($http_client) {
@@ -44,17 +43,6 @@ class Class_WebService_Abstract {
}
-
- public function setMessage($message) {
- $this->_message=$message;
- }
-
-
- public function getMessage() {
- return $this->_message;
- }
-
-
public function httpGet($url) {
return $this->getHttpClient()->open_url($url);
}
diff --git a/library/ZendAfi/View/Helper/Abonne/Loans.php b/library/ZendAfi/View/Helper/Abonne/Loans.php
index d417afdaa9496a8e961c3532e1bb279119ae1cf8..ed8c27771ecfb265e4dd38cea835c18e633405bf 100644
--- a/library/ZendAfi/View/Helper/Abonne/Loans.php
+++ b/library/ZendAfi/View/Helper/Abonne/Loans.php
@@ -42,7 +42,6 @@ class ZendAfi_View_Helper_Abonne_Loans extends ZendAfi_View_Helper_BaseHelper {
function($title) {
return $this->_tag('th', $title);
},
-
[$this->_('Emprunté par'),
$this->_('Titre'),
$this->_('Auteur'),
@@ -56,6 +55,17 @@ class ZendAfi_View_Helper_Abonne_Loans extends ZendAfi_View_Helper_BaseHelper {
}
+ protected function _tableColumns() {
+ return [$this->_('n°'),
+ $this->_('Support'),
+ $this->_('Titre'),
+ $this->_('Auteur'),
+ $this->_in_progress ? $this->_('Bibliothèque') : $this->_('Date d\'emprunt'),
+ $this->_in_progress ? $this->_('Retour prévu') : $this->_('Date de retour'),
+ $this->_('Informations')];
+ }
+
+
protected function renderLoans($loans) {
$this->_line_no = 1;
$html = '';
@@ -71,22 +81,24 @@ class ZendAfi_View_Helper_Abonne_Loans extends ZendAfi_View_Helper_BaseHelper {
protected function renderLoan($loan) {
- $notice_url = $loan->getTitre();
-
- if ($loan->getNoticeOPACId())
- $notice_url = $this->view->tagAnchor($this->view->url(
- ['controller' => 'recherche',
- 'action' => 'viewnotice',
- 'id' => $loan->getNoticeOPACId(),
- 'retour_abonne' => 'prets'],
- null, true),
- $loan->getTitre());
+ $record_title = $loan->getTitre();
+
+ if ($record = $loan->getNoticeOPAC())
+ $record_title = $this->view->tagAnchor($this->view->url(
+ ['controller' => 'recherche',
+ 'action' => 'viewnotice',
+ 'id' => $record->getId(),
+ 'retour_abonne' => 'prets'],
+ null, true),
+ $loan->getTitre());
return
$this->_tag('tr',
$this->_tag('td',
$loan->getUserFullName())
. $this->_tag('td',
- $notice_url)
+ $record ? $record->getTypeDocLabel() : '')
+ . $this->_tag('td',
+ $record_title)
. $this->_tag('td',
$loan->getAuteur())
. $this->_tag('td',
diff --git a/library/ZendAfi/View/Helper/Abonne/LoansPNB.php b/library/ZendAfi/View/Helper/Abonne/LoansPNB.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc5c9c0d35bb4f9a5ea6ee660768a8769b1c1d3f
--- /dev/null
+++ b/library/ZendAfi/View/Helper/Abonne/LoansPNB.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class ZendAfi_View_Helper_Abonne_LoansPNB extends ZendAfi_View_Helper_Abonne_Loans {
+ public function abonne_LoansPNB($loans, $in_progress = true) {
+ return parent::abonne_Loans($loans, $in_progress);
+ }
+
+
+ protected function _tableColumns() {
+ return [$this->_('n°'),
+ $this->_('Titre'),
+ $this->_('Auteur'),
+ $this->_('Date d\'emprunt'),
+ $this->_in_progress ? $this->_('Retour prévu') : $this->_('Date de retour')];
+ }
+
+
+ protected function renderLoan($loan) {
+ $record_title = $loan->getTitre();
+
+ if ($record_id = $loan->getNoticeOPACId())
+ $record_title = $this->view->tagAnchor($this->view->url(
+ ['controller' => 'recherche',
+ 'action' => 'viewnotice',
+ 'id' => $record_id,
+ 'retour_abonne' => 'prets'],
+ null, true),
+ $loan->getTitre());
+ return
+ $this->_tag('tr',
+ $this->_tag('td',
+ $this->_line_no++)
+ . $this->_tag('td',
+ $record_title)
+ . $this->_tag('td',
+ $loan->getAuteur())
+ . $this->_tag('td',
+ date('d/m/Y', strtotime($loan->getIssueDate())))
+ . $this->_tag('td',
+ date('d/m/Y', strtotime($loan->getDateRetour())),
+ ['class' => 'date_retour']));
+ }
+}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Abonne/ReservationsTable.php b/library/ZendAfi/View/Helper/Abonne/ReservationsTable.php
index b1f6f27e05aaff8c436e1afbc5dc059f5b9c60a1..c80e1756fe30545fc958aedac1a2849fd65bc052 100644
--- a/library/ZendAfi/View/Helper/Abonne/ReservationsTable.php
+++ b/library/ZendAfi/View/Helper/Abonne/ReservationsTable.php
@@ -37,7 +37,9 @@ class ZendAfi_View_Helper_Abonne_ReservationsTable extends ZendAfi_View_Helper_B
return $this->_tag('th', $title);
},
+
[$this->_('Réservé par'),
+ $this->_('Support'),
$this->_('Titre'),
$this->_('Auteur'),
$this->_('Bibliothèque'),
@@ -65,9 +67,12 @@ class ZendAfi_View_Helper_Abonne_ReservationsTable extends ZendAfi_View_Helper_B
protected function _renderReservation($reservation) {
+ $record = $reservation->getNoticeOPAC();
+
return
$this->_tag('tr',
$this->_tag('td', $reservation->getUserFullName())
+ . $this->_tag('td', $record ? $record->getTypeDocLabel() : '')
. $this->_tag('td',
$this->_getRecordLink($reservation->getTitre(), $reservation->getNoticeOPACId()))
. $this->_tag('td',
diff --git a/library/ZendAfi/View/Helper/Bookmarks.php b/library/ZendAfi/View/Helper/Bookmarks.php
index 8d07da3285f25ec361a87fc4ca965e7cb857bc1d..f4f4cbb3d8bba3d76dd855c4270f2656420ab0fc 100644
--- a/library/ZendAfi/View/Helper/Bookmarks.php
+++ b/library/ZendAfi/View/Helper/Bookmarks.php
@@ -28,7 +28,7 @@ class ZendAfi_View_Helper_Bookmarks extends ZendAfi_View_Helper_BaseHelper {
$bookmarks = $search_result->fetchFacetsAndTags($preferences)['bookmarks'];
$criteres = $search_result->getCriteresRecherche();
- if(!$preferences['bookmarks_enabled'])
+ if (!$preferences['bookmarks_enabled'] || !Class_User_Settings::isBookmarkReady())
return '';
$this->_bookmarks = $bookmarks ? $bookmarks : [];
@@ -82,10 +82,10 @@ class ZendAfi_View_Helper_Bookmarks extends ZendAfi_View_Helper_BaseHelper {
$this->view->url(['module' => 'opac',
'controller' => 'abonne' ,
'action' => 'settings'], null, true),
- $this->_('Modifier mes favoris (bibliothèques, domaines, ...)'),
+ $this->_('Modifier mes favoris'),
['class' => 'bookmarks_edit',
'data-popup' => 'true',
- 'title' => $this->_('Modifier mes favoris (bibliothèques, domaines, ...) dans une boîte de dialogue')]);
+ 'title' => $this->_('Modifier mes favoris dans une boîte de dialogue')]);
diff --git a/library/startup.php b/library/startup.php
index 5d1d102eb49b5f7d7f6f92ce4976e23a21ad8509..5ecb041c0366304a37a1350a31faf7556958ec9d 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -83,7 +83,7 @@ class Bokeh_Engine {
function setupConstants() {
defineConstant('BOKEH_MAJOR_VERSION','7.7');
- defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.24');
+ defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.26');
defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
diff --git a/scripts/emacs/geben-0.26/ChangeLog b/scripts/emacs/geben-0.26/ChangeLog
deleted file mode 100644
index a89a469e1cad098d4a67aaa5c858d9a4f676ff53..0000000000000000000000000000000000000000
--- a/scripts/emacs/geben-0.26/ChangeLog
+++ /dev/null
@@ -1,244 +0,0 @@
-2010-03-29 reedom <fujinaka.tohru@gmail.com>
-
- * [ADD] New command `geben-find-file', bound to 'C-c f' in geben-mode.
- * [ADD] New custom variable `geben-get-tramp-spec-for'.
- * [CHG] If there only single session alive, `geben-end' ends the session
- without port inquiry.
-
-2009-11-19 reedom <fujinaka.tohru@gmail.com>
-
- * [ADD] An additional parameter `session-port' to `geben-proxy', to tell the
- proxy to use that port for for incoming debugging session.
- * [ADD] The 5th element to `geben-dbgp-default-proxy', for the same purpose
- of above.
-
-2009-05-09 reedom <fujinaka.tohru@gmail.com>
-
- * [ADD] New command `geben-run-to-cursor', bound to 'c' in geben-mode.
- * [FIX] With Komodo's Perl Debugging Extension, GEBEN possibly caused
- an internal error when user attempted to set a lineno breakpoint
- at a blank line.
-
-2009-05-08 reedom <fujinaka.tohru@gmail.com>
-
- * [ADD] New variable `geben-version'.
- * [ADD] New command `geben-clear-breakpoints', bound to 'U' in geben-mode.
- * [ADD] New custom variable `geben-query-on-clear-breakpoints'.
- * [ADD] New custom variable `geben-pause-at-entry-line'.
- * [ADD] New command `geben-toggle-pause-at-entry-line-flag'.
- * [CHG] Key bindings of `geben-set-redirect' is assigned to `>'.
- * [CHG] Key bindings of `geben-show-backtrace is also assigned to `t'.
- * [FIX] Even if you unset a breakpoint successfully in the current
- session, it was not removed from the persist storage.
-
-2009-04-30 reedom <fujinaka.tohru@gmail.com>
-
- * [ADD] Add a new command `geben-eval-current-word'.
-
-2009-02-25 reedom <fujinaka.tohru@gmail.com>
-
- * [FIX] With HTTP server running on Windows GEBEN failed to
- create script file copies.
- * [FIX] Now `eval' command works against PHP(Xdebug) same as
- before.
-
-2009-02-07 reedom <fujinaka.tohru@gmail.com>
-
- * [FIX] Suppressed unwanted focus changing: when the context
- variable buffer was visible in any window, the focus was
- moved from the debugging buffer to the context variable
- buffer after proceeding any continuous command.
-
-2009-01-22 reedom <fujinaka.tohru@gmail.com>
-
- * [FIX] Bug in Makefile: cannot byte-compile geben.el if the
- working directory is not one of the Emacs' default
- directories.
-
-2009-01-10 reedom <fujinaka.tohru@gmail.com>
-
- * [FIX] Implemented `geben-quit-window'
- * [FIX] Type mismatch error was occurred in breakpoint list mode
- when any breakpoint deletion was executed.
-
-2009-01-08 reedom <fujinaka.tohru@gmail.com>
-
- * [CHG] Redesigned.
- * [CHG] Make not to require an external DBGp client program.
-
-2008-11-06 reedom <fujinaka.tohru@gmail.com>
-
- * [FIX] When setting breakpoint which needed fileuri against
- remote script file interactively, GEBEN asked with
- invalid fileuri as a default.
- * [FIX] Once debugger engine passed invalid fileuri, which
- have http:// scheme instead of file://, GEBEN made
- Emacs raise exceptions at exitting Emacs.
-
-2008-11-04 reedom <fujinaka.tohru@gmail.com>
-
- * [ADD] Added Makefile.
- * [ADD] New commands `geben-mode-help' and similar to display
- description and key bindings of GEBEN's each mode.
- * [CHG] Face definition: `geben-backtrace-fileuri'
- * [CHG] Face definition: `geben-breakpoint-face'
-
-2008-11-01 reedom <fujinaka.tohru@gmail.com>
-
- * [CHG] Dropped Emacs 21.4 due to use tree-widget.el for the
- context buffer.
- * [ADD] New command `geben-display-context and related commands.
-
-2008-10-29 reedom <fujinaka.tohru@gmail.com>
-
- * [CHG] Renamed `ogeben-debug-target-remotep'
- to `geben-always-use-mirror-file-p'.
- * [CHG] Renamed `geben-close-remote-file-after-finish'
- to `geben-close-mirror-file-after-finish'.
-
-2008-10-27 reedom <fujinaka.tohru@gmail.com>
-
- * [FIX] Location path for remotely fetched source files.
-
-2008-10-25 reedom <fujinaka.tohru@gmail.com>
-
- * [CHG] Rearranged function/variable appearance order
- * [FIX] hit-value of breakpoints were ignored.
- * [FIX] In the breakpoint list buffer it was not able for
- breakpoints except line type to went to setting
- line.
- * [FIX] Breakpoint marker handling was not enough for
- breakpoints except line type.
-
-2008-10-24 reedom <fujinaka.tohru@gmail.com>
-
- * [FIX] Improved session finishing handling.
- * [FIX] When reopen a debuggee script file which has
- any line breakpoints, GEBEN had failed to restore
- overlays.
- * [CHG] Wrote some breakpoints related code to overcome
- the difference between DBGp server implementation.
-
-2008-10-23 reedom <fujinaka.tohru@gmail.com>
-
- * [ADD] Support for Komodo Debugger Extentions are added.
-
-2008-10-22 reedom <reedom_@users.sourceforge.net>
-
- * [ADD] Supports a kind of breakpoint features found in
- DBGp specification.
- * [ADD] New command `geben-breakpoint-menu' and related
- commands to set a kind of breakpoint.
- Assigned to `B' key in geben-mode.
- * [ADD] New command `geben-breakpoint-list' and related
- commands to display defined breakpoint list.
- Assigned to `C-c b' key in geben-mode.
- * [ADD] New face `geben-breakpoint-fileuri'.
- * [ADD] New face `geben-breakpoint-lineno'.
- * [ADD] New face `geben-breakpoint-function'.
- * [ADD] Custom variable `geben-dbgp-feature-list'.
- * [DEL] Custom variable `geben-dbgp-feature-alist' is
- now obsolete.
-
-2008-10-15 reedom <reedom_@users.sourceforge.net>
-
- * [FIX] Runtime errors on Emacs 21.4.
-
-2008-10-13 reedom <reedom_@users.sourceforge.net>
-
- * [CHG] Improved redirection buffer scrolling behavior.
-
-
-2008-10-13 reedom <reedom_@users.sourceforge.net>
-
- * [ADD] New command 'geben-where'.
- Assigned to `w' key in geben-mode.
- * [ADD] New face `geben-backtrace-fileuri'.
- * [ADD] New face `geben-backtrace-lineno'.
- * [CHG] Renamed DBGp client's buffer name to `*GEBEN process*.
- * [FIX] Macro version of `geben-dbgp-redirect-buffer-visiblep'
- causes runtime error on Emacs 22.1.1.
-
-2008-10-11 reedom <reedom_@users.sourceforge.net>
-
- * [ADD] STDOUT and STDERR redirection features.
- * [ADD] New command `geben-set-redirect'.
- Assigned to `t' key in geben-mode.
- * [ADD] Custom variable `geben-dbgp-redirect-stdout'.
- * [ADD] Custom variable `geben-dbgp-redirect-stderr'.
- * [ADD] Custom variable `geben-dbgp-redirect-combine'.
- * [ADD] Custom variable `geben-dbgp-redirect-coding-system'.
- * [ADD] Custom variable `geben-dbgp-redirect-buffer-init-hook'.
-
-2008-10-10 reedom <reedom_@users.sourceforge.net>
-
- * [ADD] Backtrace display feature.
- * [ADD] New command `geben-backtrace'.
- Assigned to `d' key in geben-mode.
- * [ADD] Custom variable `geben-display-window-function'.
- * [FIX] `defface' caused an error on Emacs 21.4 because of using
- the newly added attribute `min-color'.
-
-2008-10-09 reedom <reedom_@users.sourceforge.net>
-
- * [ADD] Variable `geben-dbgp-current-stack'.
-
-2008-10-08 reedom <reedom_@users.sourceforge.net>
-
- * [FIX] Fixed increasing breakpoints as often as entering
- debugging session.
- * [UPD] Now GEBEN sets/unsets breakpoint in off session state.
- * [FIX] Make GEBEN do not send commands while off session state.
- * [ADD] New argument QUIT to `geben' command. It can be specified
- by the prefix arg, as typing like `M-x C-u geben'.
- It asks executed GEBEN to quit.
-
-2008-10-08 reedom <reedom_@users.sourceforge.net>
-
- * [FIX] Macro version of `geben-what-line' didn't run on Meadow 3.00.
- * [FIX] Byte compiled geben.el could raise undefined symbol error.
-
-2008-10-07 reedom <reedom_@users.sourceforge.net>
-
- * [ADD] Custom face `geben-breakpoint-face'.
- * [ADD] Suppress inquiry of DBGp client termination at exiting emacs.
-
-2008-10-06 reedom <reedom_@users.sourceforge.net>
-
- * [UPD] Now GEBEN manages buffer modification around where line-no
- breakpoint set. If there was line insertion before
- breakpoint, GEBEN moves the following line-no breakpoints
- downwards. Highlight effect(overlay) will be managed as it
- should be.
- * [ADD] Custom variable `geben-temporary-file-directory'.
- * [ADD] Custom variable `geben-close-remote-file-after-finish'.
- * [ADD] Custom variable `geben-show-breakpoints-debugging-only'.
-
-2008-10-05 reedom <reedom_@users.sourceforge.net>
-
- * [FIX] Make GEBEN to call `step_into' at the end of the
- initial state to place debugger's cursor at the
- entry point of the debuggee script.
- * [FIX] Make GEBEN to call `stop' at the stopping state
- to finish up a debugging session as user expect.
- * [ADD] Custom variable `geben-dbgp-feature-alist'.
- * [UPD] Now GEBEN send `feature_set' commands with the variable
- `geben-dbgp-feature-alist' in the initial state.
- * [ADD] Custom variable `geben-dbgp-command-line'.
-
-2008-10-04 reedom <reedom_@users.sourceforge.net>
-
- * geben.el: [CHG] Removed dependency on CEDET. With this changing
- many functions were removed/renamed/added
- * geben.el: [CHG] Moved all of GEBEN implementation to geben.el.
-
-2007-07-04 thoney_f(reedom) <reedom_@users.sourceforge.net>
-
- * geben-dbgp.el: [FIX] geben-response-eval didn't decode `PHP object'.
- * geben-dbgp.el: [FIX] An overlay-arrow-position leaved after finishing
- a debug session.
-
-2006-12-26 thoney_f(reedom) <reedom_@users.sourceforge.net>
-
- * Released version 0.01, a sample implementation.
-
diff --git a/scripts/emacs/geben-0.26/LICENSE b/scripts/emacs/geben-0.26/LICENSE
deleted file mode 100644
index b1e3f5a2638797271cbc9b91b856c05ed6942c8f..0000000000000000000000000000000000000000
--- a/scripts/emacs/geben-0.26/LICENSE
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/scripts/emacs/geben-1.1.0/ChangeLog b/scripts/emacs/geben-1.1.0/ChangeLog
new file mode 100644
index 0000000000000000000000000000000000000000..efc0c8b67ab86a84daf61b6f4e117752a834d0d7
--- /dev/null
+++ b/scripts/emacs/geben-1.1.0/ChangeLog
@@ -0,0 +1,291 @@
+2016-08-14 Matthew Carter <m@ahungry.com>
+
+ * [ADD] New tag release 1.1.0
+ * [FIX] Remove reference to obsolete mailing list
+ * [FIX] Use user-emacs-directory over assumed ~/.emacs.d for
+ default when #'expand-file-name call fails
+
+ * Merged contributions from Syohei YOSHIDA <syohex@gmail.com>
+ - [FIX] cl-lib.el over cl.el cleanup
+ - [FIX] Load cl.el at compile time for using lexical let
+
+ * Merged contributions from ksjogo <jogo@kronberger-spiele.de>
+ - [ADD] New defcustom geben-show-redirect-buffers
+ - [ADD] User filtering for fileuris via defcustom
+ geben-dbgp-session-user-filter-uri-regexp
+ - [FIX] Report user filter reason when using previous addition
+ - [ADD] Geben full frame mode via geben-full-frame-mode setting
+ - [ADD] Rudimentary markdown for README file
+
+ * Merged contributions from tijsmallaerts <tijs.mallaerts@gmail.com>
+ - [ADD] Option to control scroll margin via defcustom geben-scroll-margin
+ - [ADD] Predefined breakpoints can now be set outside of the
+ interactive session using geben-session-enter-hook, and setting
+ the defcustom geben-predefined-breakpoints to t
+
+2016-06-14 Matthew Carter <m@ahungry.com>
+
+ * [CHG] Change defstruct call to cl-defstruct.
+
+2016-05-08 Matthew Carter <m@ahungry.com>
+
+ * [CHG] Change flet call to cl-flet.
+
+2016-05-08 Matthew Carter <m@ahungry.com>
+
+ * [CHG] Change defmacro* call to cl-defmacro.
+
+2016-04-30 Matthew Carter <m@ahungry.com>
+
+ * [CHG] Took over maintenance of project.
+ Modernize codebase/remove deprecated Emacs calls.
+ Relicense from GPLv2 to GPLv3.
+
+2016-02-12 Ignacio Torres Masdeu <i@itorres.net>
+
+ * [FIX] Mangle defadvice that interfered with the use of
+ open-network-stream globaly.
+
+2010-03-29 reedom <fujinaka.tohru@gmail.com>
+
+ * [ADD] New command `geben-find-file', bound to 'C-c f' in geben-mode.
+ * [ADD] New custom variable `geben-get-tramp-spec-for'.
+ * [CHG] If there only single session alive, `geben-end' ends the session
+ without port inquiry.
+
+2009-11-19 reedom <fujinaka.tohru@gmail.com>
+
+ * [ADD] An additional parameter `session-port' to `geben-proxy', to tell the
+ proxy to use that port for for incoming debugging session.
+ * [ADD] The 5th element to `geben-dbgp-default-proxy', for the same purpose
+ of above.
+
+2009-05-09 reedom <fujinaka.tohru@gmail.com>
+
+ * [ADD] New command `geben-run-to-cursor', bound to 'c' in geben-mode.
+ * [FIX] With Komodo's Perl Debugging Extension, GEBEN possibly caused
+ an internal error when user attempted to set a lineno breakpoint
+ at a blank line.
+
+2009-05-08 reedom <fujinaka.tohru@gmail.com>
+
+ * [ADD] New variable `geben-version'.
+ * [ADD] New command `geben-clear-breakpoints', bound to 'U' in geben-mode.
+ * [ADD] New custom variable `geben-query-on-clear-breakpoints'.
+ * [ADD] New custom variable `geben-pause-at-entry-line'.
+ * [ADD] New command `geben-toggle-pause-at-entry-line-flag'.
+ * [CHG] Key bindings of `geben-set-redirect' is assigned to `>'.
+ * [CHG] Key bindings of `geben-show-backtrace is also assigned to `t'.
+ * [FIX] Even if you unset a breakpoint successfully in the current
+ session, it was not removed from the persist storage.
+
+2009-04-30 reedom <fujinaka.tohru@gmail.com>
+
+ * [ADD] Add a new command `geben-eval-current-word'.
+
+2009-02-25 reedom <fujinaka.tohru@gmail.com>
+
+ * [FIX] With HTTP server running on Windows GEBEN failed to
+ create script file copies.
+ * [FIX] Now `eval' command works against PHP(Xdebug) same as
+ before.
+
+2009-02-07 reedom <fujinaka.tohru@gmail.com>
+
+ * [FIX] Suppressed unwanted focus changing: when the context
+ variable buffer was visible in any window, the focus was
+ moved from the debugging buffer to the context variable
+ buffer after proceeding any continuous command.
+
+2009-01-22 reedom <fujinaka.tohru@gmail.com>
+
+ * [FIX] Bug in Makefile: cannot byte-compile geben.el if the
+ working directory is not one of the Emacs' default
+ directories.
+
+2009-01-10 reedom <fujinaka.tohru@gmail.com>
+
+ * [FIX] Implemented `geben-quit-window'
+ * [FIX] Type mismatch error was occurred in breakpoint list mode
+ when any breakpoint deletion was executed.
+
+2009-01-08 reedom <fujinaka.tohru@gmail.com>
+
+ * [CHG] Redesigned.
+ * [CHG] Make not to require an external DBGp client program.
+
+2008-11-06 reedom <fujinaka.tohru@gmail.com>
+
+ * [FIX] When setting breakpoint which needed fileuri against
+ remote script file interactively, GEBEN asked with
+ invalid fileuri as a default.
+ * [FIX] Once debugger engine passed invalid fileuri, which
+ have http:// scheme instead of file://, GEBEN made
+ Emacs raise exceptions at exitting Emacs.
+
+2008-11-04 reedom <fujinaka.tohru@gmail.com>
+
+ * [ADD] Added Makefile.
+ * [ADD] New commands `geben-mode-help' and similar to display
+ description and key bindings of GEBEN's each mode.
+ * [CHG] Face definition: `geben-backtrace-fileuri'
+ * [CHG] Face definition: `geben-breakpoint-face'
+
+2008-11-01 reedom <fujinaka.tohru@gmail.com>
+
+ * [CHG] Dropped Emacs 21.4 due to use tree-widget.el for the
+ context buffer.
+ * [ADD] New command `geben-display-context and related commands.
+
+2008-10-29 reedom <fujinaka.tohru@gmail.com>
+
+ * [CHG] Renamed `ogeben-debug-target-remotep'
+ to `geben-always-use-mirror-file-p'.
+ * [CHG] Renamed `geben-close-remote-file-after-finish'
+ to `geben-close-mirror-file-after-finish'.
+
+2008-10-27 reedom <fujinaka.tohru@gmail.com>
+
+ * [FIX] Location path for remotely fetched source files.
+
+2008-10-25 reedom <fujinaka.tohru@gmail.com>
+
+ * [CHG] Rearranged function/variable appearance order
+ * [FIX] hit-value of breakpoints were ignored.
+ * [FIX] In the breakpoint list buffer it was not able for
+ breakpoints except line type to went to setting
+ line.
+ * [FIX] Breakpoint marker handling was not enough for
+ breakpoints except line type.
+
+2008-10-24 reedom <fujinaka.tohru@gmail.com>
+
+ * [FIX] Improved session finishing handling.
+ * [FIX] When reopen a debuggee script file which has
+ any line breakpoints, GEBEN had failed to restore
+ overlays.
+ * [CHG] Wrote some breakpoints related code to overcome
+ the difference between DBGp server implementation.
+
+2008-10-23 reedom <fujinaka.tohru@gmail.com>
+
+ * [ADD] Support for Komodo Debugger Extentions are added.
+
+2008-10-22 reedom <reedom_@users.sourceforge.net>
+
+ * [ADD] Supports a kind of breakpoint features found in
+ DBGp specification.
+ * [ADD] New command `geben-breakpoint-menu' and related
+ commands to set a kind of breakpoint.
+ Assigned to `B' key in geben-mode.
+ * [ADD] New command `geben-breakpoint-list' and related
+ commands to display defined breakpoint list.
+ Assigned to `C-c b' key in geben-mode.
+ * [ADD] New face `geben-breakpoint-fileuri'.
+ * [ADD] New face `geben-breakpoint-lineno'.
+ * [ADD] New face `geben-breakpoint-function'.
+ * [ADD] Custom variable `geben-dbgp-feature-list'.
+ * [DEL] Custom variable `geben-dbgp-feature-alist' is
+ now obsolete.
+
+2008-10-15 reedom <reedom_@users.sourceforge.net>
+
+ * [FIX] Runtime errors on Emacs 21.4.
+
+2008-10-13 reedom <reedom_@users.sourceforge.net>
+
+ * [CHG] Improved redirection buffer scrolling behavior.
+
+
+2008-10-13 reedom <reedom_@users.sourceforge.net>
+
+ * [ADD] New command 'geben-where'.
+ Assigned to `w' key in geben-mode.
+ * [ADD] New face `geben-backtrace-fileuri'.
+ * [ADD] New face `geben-backtrace-lineno'.
+ * [CHG] Renamed DBGp client's buffer name to `*GEBEN process*.
+ * [FIX] Macro version of `geben-dbgp-redirect-buffer-visiblep'
+ causes runtime error on Emacs 22.1.1.
+
+2008-10-11 reedom <reedom_@users.sourceforge.net>
+
+ * [ADD] STDOUT and STDERR redirection features.
+ * [ADD] New command `geben-set-redirect'.
+ Assigned to `t' key in geben-mode.
+ * [ADD] Custom variable `geben-dbgp-redirect-stdout'.
+ * [ADD] Custom variable `geben-dbgp-redirect-stderr'.
+ * [ADD] Custom variable `geben-dbgp-redirect-combine'.
+ * [ADD] Custom variable `geben-dbgp-redirect-coding-system'.
+ * [ADD] Custom variable `geben-dbgp-redirect-buffer-init-hook'.
+
+2008-10-10 reedom <reedom_@users.sourceforge.net>
+
+ * [ADD] Backtrace display feature.
+ * [ADD] New command `geben-backtrace'.
+ Assigned to `d' key in geben-mode.
+ * [ADD] Custom variable `geben-display-window-function'.
+ * [FIX] `defface' caused an error on Emacs 21.4 because of using
+ the newly added attribute `min-color'.
+
+2008-10-09 reedom <reedom_@users.sourceforge.net>
+
+ * [ADD] Variable `geben-dbgp-current-stack'.
+
+2008-10-08 reedom <reedom_@users.sourceforge.net>
+
+ * [FIX] Fixed increasing breakpoints as often as entering
+ debugging session.
+ * [UPD] Now GEBEN sets/unsets breakpoint in off session state.
+ * [FIX] Make GEBEN do not send commands while off session state.
+ * [ADD] New argument QUIT to `geben' command. It can be specified
+ by the prefix arg, as typing like `M-x C-u geben'.
+ It asks executed GEBEN to quit.
+
+2008-10-08 reedom <reedom_@users.sourceforge.net>
+
+ * [FIX] Macro version of `geben-what-line' didn't run on Meadow 3.00.
+ * [FIX] Byte compiled geben.el could raise undefined symbol error.
+
+2008-10-07 reedom <reedom_@users.sourceforge.net>
+
+ * [ADD] Custom face `geben-breakpoint-face'.
+ * [ADD] Suppress inquiry of DBGp client termination at exiting emacs.
+
+2008-10-06 reedom <reedom_@users.sourceforge.net>
+
+ * [UPD] Now GEBEN manages buffer modification around where line-no
+ breakpoint set. If there was line insertion before
+ breakpoint, GEBEN moves the following line-no breakpoints
+ downwards. Highlight effect(overlay) will be managed as it
+ should be.
+ * [ADD] Custom variable `geben-temporary-file-directory'.
+ * [ADD] Custom variable `geben-close-remote-file-after-finish'.
+ * [ADD] Custom variable `geben-show-breakpoints-debugging-only'.
+
+2008-10-05 reedom <reedom_@users.sourceforge.net>
+
+ * [FIX] Make GEBEN to call `step_into' at the end of the
+ initial state to place debugger's cursor at the
+ entry point of the debuggee script.
+ * [FIX] Make GEBEN to call `stop' at the stopping state
+ to finish up a debugging session as user expect.
+ * [ADD] Custom variable `geben-dbgp-feature-alist'.
+ * [UPD] Now GEBEN send `feature_set' commands with the variable
+ `geben-dbgp-feature-alist' in the initial state.
+ * [ADD] Custom variable `geben-dbgp-command-line'.
+
+2008-10-04 reedom <reedom_@users.sourceforge.net>
+
+ * geben.el: [CHG] Removed dependency on CEDET. With this changing
+ many functions were removed/renamed/added
+ * geben.el: [CHG] Moved all of GEBEN implementation to geben.el.
+
+2007-07-04 thoney_f(reedom) <reedom_@users.sourceforge.net>
+
+ * geben-dbgp.el: [FIX] geben-response-eval didn't decode `PHP object'.
+ * geben-dbgp.el: [FIX] An overlay-arrow-position leaved after finishing
+ a debug session.
+
+2006-12-26 thoney_f(reedom) <reedom_@users.sourceforge.net>
+
+ * Released version 0.01, a sample implementation.
diff --git a/scripts/emacs/geben-1.1.0/LICENSE b/scripts/emacs/geben-1.1.0/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..94a9ed024d3859793618152ea559a168bbcbb5e2
--- /dev/null
+++ b/scripts/emacs/geben-1.1.0/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/scripts/emacs/geben-0.26/Makefile b/scripts/emacs/geben-1.1.0/Makefile
similarity index 100%
rename from scripts/emacs/geben-0.26/Makefile
rename to scripts/emacs/geben-1.1.0/Makefile
diff --git a/scripts/emacs/geben-0.26/NEWS b/scripts/emacs/geben-1.1.0/NEWS
similarity index 91%
rename from scripts/emacs/geben-0.26/NEWS
rename to scripts/emacs/geben-1.1.0/NEWS
index 9d001207a96222e7351d54879f12286ecaca0500..f1ca9a1e4757efdc48737856b8c47914d8c42dda 100644
--- a/scripts/emacs/geben-0.26/NEWS
+++ b/scripts/emacs/geben-1.1.0/NEWS
@@ -1,3 +1,27 @@
+Version 1.1.0 (2016-08-14)
+
+ * See CHANGELOG for this date (lots of contributions from people)
+
+Version 1.0.3 (2016-06-14)
+
+ * Fix cl.el call
+ - Changed defstruct to cl-defstruct.
+
+Version 1.0.2 (2016-05-08)
+
+ * Fix cl.el call
+ - Changed flet to cl-flet.
+
+Version 1.0.1 (2016-05-08)
+
+ * Fix cl.el call
+ - Changed defmacro* to cl-defmacro.
+
+Version 1.0.0 (2016-04-30)
+
+ * Modernized codebase:
+ - Removed deprecated calls to ``cl'' library.
+
Version 0.26 (20010-03-29)
* new command:
@@ -57,7 +81,7 @@ Version 0.21 (2009-01-10)
Version 0.20 (2009-01-08)
- Redesigned.
+ Redesigned.
From this release GEBEN does not require an external DBGp client
program.
@@ -79,7 +103,7 @@ Version 0.19 (2008-11-06)
Version 0.18 (2008-11-04)
From this release GEBEN has shifted from beta stage.
-
+
Incompatible changes:
* GEBEN dropped Emacs 21.4 support.
Now GEBEN requires Emacs 22.1 and later.
@@ -110,7 +134,7 @@ Version 0.16 (2008-10-25)
* fixed: improved session finishing handling.
* fixed: when reopen a debuggee script file which has any line
breakpoints, GEBEN had failed to restore overlays.
-
+
Version 0.15 (2008-10-22)
Visible changes:
@@ -168,7 +192,7 @@ Version 0.11 (2008-10-08)
Version 0.10 (2008-10-07)
Incompatible changes:
- * Removed dependencies on `CEDET' package.
+ * Removed dependencies on `CEDET' package.
Visible changes:
* fixed: Improved line-no breakpoint handling.
@@ -181,7 +205,7 @@ Version 0.10 (2008-10-07)
- geben-show-breakpoints-debugging-only
* custom face added:
- geben-breakpoint-face
-
+
Version 0.01 (2006-12-26)
* Sample implementation.
diff --git a/scripts/emacs/geben-0.26/README b/scripts/emacs/geben-1.1.0/README.md
similarity index 69%
rename from scripts/emacs/geben-0.26/README
rename to scripts/emacs/geben-1.1.0/README.md
index ad295dd89a0bf22ae2a839e273692411df4963d7..5490385199f93d27bd632bfd5a0bec4cd25117cd 100644
--- a/scripts/emacs/geben-0.26/README
+++ b/scripts/emacs/geben-1.1.0/README.md
@@ -1,4 +1,4 @@
-GEBEN-0.26 (Beta)
+GEBEN-1.1.0
-----------------
GEBEN is a software package that interfaces Emacs to DBGp protocol
@@ -29,7 +29,7 @@ REQUIREMENTS
- etc.
[client side]
- - Emacs22.1 or later
+ - Emacs 24 or later
BIG CHANGES
@@ -67,26 +67,7 @@ INSTALLATION
[client side]
-1. Unpack GEBEN source code package and change directory to the
- unpacked directory.
-
-<With GNU make command>
-a. run `make'(or `gmake', depends on your environment).
-b. If you are an administrator, Run: sudo make install
-b' Or Run: SITELISP=$HOME/path/to/install make install
-
-<Without GNU make command>
-a. Byte compile 'dbgp.el'.
-b. Byte compile `geben.el'.
-c. Copy `dbgp.elc', `geben.elc' and entire `tree-widget' directory to
- any directory where Emacs can find.(Or add the path to `load-path'
- list)
-
-<common>
-2. Insert autoload hooks into your .Emacs file.
- -> (autoload 'geben "geben" "PHP Debugger on Emacs" t)
-3. Restart Emacs.
-
+- M-x package-install geben [](https://melpa.org/#/geben)
DEBUGGING
---------
@@ -110,25 +91,26 @@ Here is an illustration on PHP debugging.
5. Now the buffer is under the minor-mode 'geben-mode'.
You can control the debugger with several keys.
- spc step into/step over
- i step into
- o step over
- r step out
- g run
- c run to cursor
- b set a breakpoint at a line
- B set a breakpoint interactively
- u unset a breakpoint at a line
- U clear all breakpoints
- \C-c b display breakpoint list
- > set redirection mode
- \C-u t change redirection mode
- d display backtrace
- t display backtrace
- v display context variables
- \C-c f visit script file
- w where
- q stop
+ - spc step into/step over
+ - i step into
+ - o step over
+ - r step out
+ - g run
+ - c run to cursor
+ - e eval php expression
+ - b set a breakpoint at a line (see: defcustom geben-predefined-breakpoints)
+ - B set a breakpoint interactively
+ - u unset a breakpoint at a line
+ - U clear all breakpoints
+ - \C-c b display breakpoint list
+ - > set redirection mode
+ - \C-u t change redirection mode
+ - d display backtrace
+ - t display backtrace
+ - v display context variables
+ - \C-c f visit script file
+ - w where
+ - q stop
When you hit any unbound key of `geben-mode', GEBEN will ask you to
edit the original script file. Say yes and GEBEN will attempts to
@@ -161,29 +143,14 @@ Known Issues
- If Xdebug is not loaded not as `zend_extension', some feature do
not work as expectedly (e.g. step_into).
-
+
SUPPORT
-------
-We all time need your supports - bug reports, feature requests,
-code/documents/design contributions, and donations.
-To submit one or more of them, please visit our web site.
-
- http://code.google.com/p/geben-on-emacs/
+We always need your support - bug reports, feature requests,
+and code/documents/design contributions.
-Also there are mailinglists.
-
-For usage questions:
- http://groups.google.com/group/geben-users
-
-For package contributions:
- http://groups.google.com/group/geben-dev
-
-Your posts will make GEBEN development progress.
-
-Thank you.
-
---
+To submit one or more of them, please visit our web site.
-reedom <fujinaka.tohru@gmail.com>
+ https://github.com/ahungry/geben
diff --git a/scripts/emacs/geben-0.26/dbgp.el b/scripts/emacs/geben-1.1.0/dbgp.el
similarity index 86%
rename from scripts/emacs/geben-0.26/dbgp.el
rename to scripts/emacs/geben-1.1.0/dbgp.el
index ccc69b5e6ac08202a5fa9af84ce306cbefaecea3..b55eecd10d21f1a788094bb21a4a020f876defdf 100644
--- a/scripts/emacs/geben-0.26/dbgp.el
+++ b/scripts/emacs/geben-1.1.0/dbgp.el
@@ -1,46 +1,46 @@
;;; dbgp.el --- DBGp protocol interface
-;; $Id: dbgp.el 116 2010-03-29 12:35:47Z fujinaka.tohru $
-;;
+
+;; Copyright (C) 2005-2010 reedom <fujinaka.tohru@gmail.com>
+;; Copyright (C) 2016 Matthew Carter
+
;; Filename: dbgp.el
-;; Author: reedom <fujinaka.tohru@gmail.com>
-;; Maintainer: reedom <fujinaka.tohru@gmail.com>
-;; Version: 0.26
-;; URL: http://code.google.com/p/geben-on-emacs/
+;; Author: Matthew Carter <m@ahungry.com>
+;; Code derived from Original Author: reedom <fujinaka.tohru@gmail.com>
+;; Maintainer: Matthew Carter <m@ahungry.com>
+;; URL: https://github.com/ahungry/geben
+;; Version: 1.0.0
;; Keywords: DBGp, debugger, PHP, Xdebug, Perl, Python, Ruby, Tcl, Komodo
-;; Compatibility: Emacs 22.1
-;;
+;; Compatibility: Emacs 24+
+;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
+
;; This file is not part of GNU Emacs
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or
+
+;;; License:
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;;
+;;
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
;;; Commentary:
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+
;;; Code:
(eval-when-compile
(when (or (not (boundp 'emacs-version))
- (string< emacs-version "22.1"))
- (error (concat "geben.el: This package requires Emacs 22.1 or later."))))
+ (string< emacs-version "24"))
+ (error (concat "geben.el: This package requires Emacs 24 or later."))))
(eval-and-compile
- (require 'cl)
+ (require 'cl-lib)
(require 'xml))
(require 'comint)
@@ -49,26 +49,6 @@
;; customization
;;--------------------------------------------------------------
-;; For compatibility between versions of custom
-(eval-and-compile
- (condition-case ()
- (require 'custom)
- (error nil))
- (if (and (featurep 'custom) (fboundp 'custom-declare-variable)
- ;; Some XEmacsen w/ custom don't have :set keyword.
- ;; This protects them against custom.
- (fboundp 'custom-initialize-set))
- nil ;; We've got what we needed
- ;; We have the old custom-library, hack around it!
- (if (boundp 'defgroup)
- nil
- (defmacro defgroup (&rest args)
- nil))
- (if (boundp 'defcustom)
- nil
- (defmacro defcustom (var value doc &rest args)
- `(defvar (,var) (,value) (,doc))))))
-
;; customize group
(defgroup dbgp nil
@@ -86,7 +66,7 @@
:group 'dbgp)
(defcustom dbgp-local-address "127.0.0.1"
- "Local host address. It is used for DBGp proxy.
+ "Local host address. It is used for DBGp proxy.
This value is passed to DBGp proxy at connection negotiation.
When the proxy receive a new debugging session, the proxy tries
to connect to DBGp listener of this address."
@@ -109,15 +89,18 @@ to connect to DBGp listener of this address."
;;--------------------------------------------------------------
(defsubst dbgp-plist-get (proc prop)
+ "Return from process PROC the value of property PROP."
(plist-get (process-plist proc) prop))
(defsubst dbgp-plist-put (proc prop val)
+ "In process PROC change PROP to VAL."
(let ((plist (process-plist proc)))
(if plist
(plist-put plist prop val)
(set-process-plist proc (list prop val)))))
(defsubst dbgp-xml-get-error-node (xml)
+ "Return the first node of XML whose child-name is 'error."
(car
(xml-get-children xml 'error)))
@@ -141,11 +124,11 @@ to connect to DBGp listener of this address."
)
(defsubst dbgp-ip-get (proc)
- (first (process-contact proc)))
-
+ (cl-first (process-contact proc)))
+
(defsubst dbgp-port-get (proc)
- (second (process-contact proc)))
-
+ (cl-second (process-contact proc)))
+
(defsubst dbgp-proxy-p (proc)
(and (dbgp-plist-get proc :proxy)
t))
@@ -182,11 +165,11 @@ to connect to DBGp listener of this address."
;;
;; -- DBGp listener custom properties --
;;
-;; :session-init default function for a new DBGp session
+;; :session-init default function for a new DBGp session
;; process to initialize a new session.
-;; :session-filter default function for a new DBGp session
+;; :session-filter default function for a new DBGp session
;; process to filter protocol messages.
-;; :session-sentinel default function for a new DBGp session
+;; :session-sentinel default function for a new DBGp session
;; called when the session is disconnected.
(defvar dbgp-listeners nil
@@ -197,7 +180,7 @@ for DBGp protocol connection.
The process listens at a specific network address to a specific
port for a new session connection(from debugger engine) coming.
When a new connection has accepted, the DBGp listener creates
-a new DBGp session process. Then the new process takes over
+a new DBGp session process. Then the new process takes over
the connection and the DBGp listener process starts listening
for another connection.
@@ -212,8 +195,7 @@ for another connection.
:proxy if the listener is created for a proxy
connection, this value has a plist of
(:addr :port :idekey :multi-session).
- Otherwise the value is nil.
-")
+ Otherwise the value is nil.")
(defvar dbgp-sessions nil
"List of DBGp session processes.
@@ -229,8 +211,7 @@ The session process is alive until the session is disconnected.
-- DBGp session process custom properties --
:listener The listener process which creates this
- session process.
-")
+ session process.")
(defvar dbgp-listener-port-history nil)
(defvar dbgp-proxy-address-history nil)
@@ -254,11 +235,10 @@ The third arg HISTORY, if non-nil, specifies a history list
See `read-from-minibuffer' for details of HISTORY argument.
Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used
for history commands, and as the value to return if the user enters
- the empty string.
-"
+ the empty string."
(let (str
(temp-history (and history
- (copy-list (symbol-value history)))))
+ (cl-copy-list (symbol-value history)))))
(while
(progn
(setq str (read-string prompt initial-input 'temp-history default-value))
@@ -270,7 +250,7 @@ Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used
(and history
(set history (cons str (remove str (symbol-value history)))))
str))
-
+
(defun dbgp-read-integer (prompt &optional default history)
"Read a numeric value in the minibuffer, prompting with PROMPT.
DEFAULT specifies a default value to return if the user just types RET.
@@ -297,14 +277,14 @@ See `read-from-minibuffer' for details of HISTORY argument."
(and history
(set history (cons n (remq n (symbol-value history)))))
n))
-
+
;;--------------------------------------------------------------
;; DBGp listener start/stop
;;--------------------------------------------------------------
(defsubst dbgp-listener-find (port)
- (find-if (lambda (listener)
- (eq port (second (process-contact listener))))
+ (cl-find-if (lambda (listener)
+ (eq port (cl-second (process-contact listener))))
dbgp-listeners))
;;;###autoload
@@ -332,13 +312,14 @@ See `read-from-minibuffer' for details of HISTORY argument."
:session-init 'dbgp-default-session-init
:session-filter 'dbgp-default-session-filter
:session-sentinel 'dbgp-default-session-sentinel)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message (cdr result)))
result))
;;;###autoload
(defun dbgp-exec (port &rest session-params)
- "Start a new DBGp listener listening to PORT."
+ "Start a new DBGp listener listening to PORT.
+Set the process up with SESSION-PARAMS."
(if (dbgp-listener-alive-p port)
(cons (dbgp-listener-find port)
(format "The DBGp listener for %d has already been started." port))
@@ -362,13 +343,14 @@ See `read-from-minibuffer' for details of HISTORY argument."
(format "The DBGp listener for %d is started." port)))))
(defun dbgp-stop (port &optional include-proxy)
- "Stop the DBGp listener listening to PORT."
+ "Stop the DBGp listener listening to PORT.
+INCLUDE-PROXY may not do anything."
(interactive
(let ((ports (remq nil
(mapcar (lambda (listener)
(and (or current-prefix-arg
(not (dbgp-proxy-p listener)))
- (number-to-string (second (process-contact listener)))))
+ (number-to-string (cl-second (process-contact listener)))))
dbgp-listeners))))
(list
;; ask user for the target idekey.
@@ -378,9 +360,9 @@ See `read-from-minibuffer' for details of HISTORY argument."
current-prefix-arg)))
(let ((listener (dbgp-listener-find port)))
(dbgp-listener-kill port)
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message (if listener
- "The DBGp listener for port %d is terminated."
+ "The DBGp listener for port %d is terminated."
"DBGp listener for port %d does not exist.")
port))
(and listener t)))
@@ -399,7 +381,9 @@ See `read-from-minibuffer' for details of HISTORY argument."
"Register a new DBGp listener to an external DBGp proxy.
The proxy should be found at PROXY-IP-OR-ADDR / PROXY-PORT.
This creates a new DBGp listener and register it to the proxy
-associating with the IDEKEY."
+associating with the IDEKEY.
+MULTI-SESSION-P indicates if multiple sessions are running or not.
+SESSION-PORT is either the integer port number, or t."
(interactive (list
(let ((default (or (car dbgp-proxy-address-history) "localhost")))
(dbgp-read-string (format "Proxy address (default %s): " default)
@@ -423,7 +407,7 @@ associating with the IDEKEY."
:session-init 'dbgp-default-session-init
:session-filter 'dbgp-default-session-filter
:session-sentinel 'dbgp-default-session-sentinel)))
- (and (interactive-p)
+ (and (called-interactively-p 'interacive)
(consp result)
(message (cdr result)))
result))
@@ -433,10 +417,13 @@ associating with the IDEKEY."
"Register a new DBGp listener to an external DBGp proxy.
The proxy should be found at IP-OR-ADDR / PORT.
This create a new DBGp listener and register it to the proxy
-associating with the IDEKEY."
- (block dbgp-proxy-register-exec
+associating with the IDEKEY.
+MULTI-SESSION-P indicates if multiple sessions are running or not.
+SESSION-PORT is either the integer port number, or t.
+SESSION-PARAMS are added to the listener process."
+ (cl-block dbgp-proxy-register-exec
;; check whether the proxy listener already exists
- (let ((listener (find-if (lambda (listener)
+ (let ((listener (cl-find-if (lambda (listener)
(let ((proxy (dbgp-proxy-get listener)))
(and proxy
(equal ip-or-addr (plist-get proxy :addr))
@@ -444,8 +431,8 @@ associating with the IDEKEY."
(equal idekey (plist-get proxy :idekey)))))
dbgp-listeners)))
(if listener
- (return-from dbgp-proxy-register-exec
- (cons listener
+ (cl-return-from dbgp-proxy-register-exec
+ (cons listener
(format "The DBGp proxy listener has already been started. idekey: %s" idekey)))))
;; send commands to the external proxy instance
@@ -458,7 +445,7 @@ associating with the IDEKEY."
:noquery t
:filter 'dbgp-comint-setup
:sentinel 'dbgp-listener-sentinel))
- (listener-port (second (process-contact listener-proc)))
+ (listener-port (cl-second (process-contact listener-proc)))
(result (dbgp-proxy-send-command ip-or-addr port
(format "proxyinit -a %s:%s -k %s -m %d"
dbgp-local-address listener-port idekey
@@ -476,7 +463,7 @@ associating with the IDEKEY."
;; connection failed or the proxy respond an error.
;; give up.
(dbgp-process-kill listener-proc)
- (return-from dbgp-proxy-register-exec
+ (cl-return-from dbgp-proxy-register-exec
(if (not (consp result))
(cons result
(cond
@@ -506,7 +493,9 @@ associating with the IDEKEY."
;;;###autoload
(defun dbgp-proxy-unregister (idekey &optional proxy-ip-or-addr proxy-port)
"Unregister the DBGp listener associated with IDEKEY from a DBGp proxy.
-After unregistration, it kills the listener instance."
+After unregistration, it kills the listener instance.
+PROXY-IP-OR-ADDR is the ip or host address of the proxy instance.
+PROXY-PORT is the port number."
(interactive
(let (proxies idekeys idekey)
;; collect idekeys.
@@ -523,7 +512,7 @@ After unregistration, it kills the listener instance."
(and (eq 1 (length idekeys))
(car idekeys))))
;; filter proxies and leave ones having the selected ideky.
- (setq proxies (remove-if (lambda (proxy)
+ (setq proxies (cl-remove-if (lambda (proxy)
(not (equal idekey (plist-get (dbgp-proxy-get proxy) :idekey))))
proxies))
(let ((proxy (if (= 1 (length proxies))
@@ -536,7 +525,7 @@ After unregistration, it kills the listener instance."
(format "%s:%s" (plist-get prop :addr) (plist-get prop :port))))
proxies))
(addr (completing-read "Proxy candidates: " addrs nil t (car addrs)))
- (pos (position addr addrs)))
+ (pos (cl-position addr addrs)))
(and pos
(nth pos proxies))))))
(list idekey
@@ -574,11 +563,11 @@ After unregistration, it kills the listener instance."
"DBGp proxy responds no message.")
((eq :invalid-xml result)
"DBGp proxy responds with invalid XML.")))))
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(cdr status)
(message (cdr status)))
status))
-
+
;;;###autoload
(defun dbgp-proxy-unregister-exec (proxy)
"Unregister PROXY from a DBGp proxy.
@@ -594,7 +583,7 @@ After unregistration, it kills the listener instance."
(or (equal "1" (xml-get-attribute result 'success))
(dbgp-xml-get-error-message result))
result))))
-
+
(defun dbgp-sessions-kill-all ()
(interactive)
(mapc 'delete-process dbgp-sessions)
@@ -608,7 +597,8 @@ After unregistration, it kills the listener instance."
"Send DBGp proxy command string to an external DBGp proxy.
ADDR and PORT is the address of the target proxy.
This function returns an xml list if the command succeeds,
-or a symbol: `:proxy-not-found', `:no-response', or `:invalid-xml'."
+or a symbol: `:proxy-not-found', `:no-response', or `:invalid-xml'.
+STRING is a string, the command sent into the process."
(with-temp-buffer
(let ((proc (ignore-errors
(make-network-process :name "DBGp proxy negotiator"
@@ -630,11 +620,11 @@ or a symbol: `:proxy-not-found', `:no-response', or `:invalid-xml'."
:invalid-xml))))))
(defun dbgp-listener-alive-p (port)
- "Return t if any listener for POST is alive."
+ "Return t if any listener for PORT is alive."
(let ((listener (dbgp-listener-find port)))
(and listener
(eq 'listen (process-status listener)))))
-
+
;;--------------------------------------------------------------
;; DBGp listener process log and sentinel
;;--------------------------------------------------------------
@@ -663,21 +653,24 @@ It is saved for when this flag is not set.")
(defvar dbgp-filter-input-list nil)
(defvar dbgp-buffer-process nil
- "")
+ "The DBGp buffer process.")
(put 'dbgp-buffer-process 'permanent-local t)
-(defadvice open-network-stream (around debugclient-pass-process-to-comint)
- "[comint hack] Pass the spawned DBGp client process to comint."
- (let* ((buffer (ad-get-arg 1))
- (proc (buffer-local-value 'dbgp-buffer-process buffer)))
- (set-process-buffer proc buffer)
- (setq ad-return-value proc)))
+
+;; (defadvice open-network-stream (around debugclient-pass-process-to-comint last)
+;; "[comint hack] Pass the spawned DBGp client process to comint."
+;; (let* ((buffer (ad-get-arg 1))
+;; (proc (buffer-local-value 'dbgp-buffer-process buffer)))
+;; (if proc (progn (set-process-buffer proc buffer)
+;; (setq ad-return-value proc)))))
+
(defun dbgp-comint-setup (proc string)
"Setup a new comint buffer for a newly created session process PROC.
This is the first filter function for a new session process created by a
-listener process. After the setup is done, `dbgp-session-filter' function
-takes over the filter."
+listener process. After the setup is done, `dbgp-session-filter' function
+takes over the filter.
+STRING would be the command, but doesn't appear to be used."
(if (not (dbgp-session-accept-p proc))
;; multi session is disabled
(when (memq (process-status proc) '(run connect open))
@@ -696,9 +689,9 @@ takes over the filter."
(let* ((listener (dbgp-listener-get proc))
(buffer-name (format "DBGp <%s:%s>"
- (first (process-contact proc))
- (second (process-contact listener))))
- (buf (or (find-if (lambda (buf)
+ (cl-first (process-contact proc))
+ (cl-second (process-contact listener))))
+ (buf (or (cl-find-if (lambda (buf)
;; find reusable buffer
(let ((proc (get-buffer-process buf)))
(and (buffer-local-value 'dbgp-buffer-process buf)
@@ -717,10 +710,12 @@ takes over the filter."
(set (make-local-variable 'dbgp-filter-input-list) nil)
(set (make-local-variable 'dbgp-filter-pending-text) nil))
;; setup comint buffer
+ (ad-enable-advice 'open-network-stream 'around 'debugclient-pass-process-to-comint)
(ad-activate 'open-network-stream)
(unwind-protect
(make-comint-in-buffer "DBGp-Client" buf (cons t t))
- (ad-deactivate 'open-network-stream))
+ (ad-deactivate 'open-network-stream)
+ (ad-disable-advice 'open-network-stream 'around 'debugclient-pass-process-to-comint))
;; update PROC properties
(set-process-filter proc #'dbgp-session-filter)
(set-process-sentinel proc #'dbgp-session-sentinel)
@@ -743,7 +738,8 @@ takes over the filter."
(funcall accept-p proc))))
(defun dbgp-session-send-string (proc string &optional echo-p)
- "Send a DBGp protocol STRING to PROC."
+ "Send to process PROC a DBGp protocol STRING.
+If ECHO-P is t, echo the input as well."
(if echo-p
(dbgp-session-echo-input proc string))
(comint-send-string proc (concat string "\0")))
@@ -769,16 +765,16 @@ takes over the filter."
(with-selected-window process-window
(goto-char (point-max)))
(goto-char (point-max))))))))
-
+
(defun dbgp-session-filter (proc string)
- ;; Here's where the actual buffer insertion is done
+ "Given process PROC and string STRING, this is where the actual buffer insertion is done."
(let ((buf (process-buffer proc))
(listener (dbgp-listener-get proc))
(session-filter (dbgp-plist-get proc :session-filter))
output process-window chunks)
- (block dbgp-session-filter
+ (cl-block dbgp-session-filter
(unless (buffer-live-p buf)
- (return-from dbgp-session-filter))
+ (cl-return-from dbgp-session-filter))
(with-current-buffer buf
(when dbgp-filter-defer-flag
@@ -788,8 +784,8 @@ takes over the filter."
dbgp-filter-pending-text (if dbgp-filter-pending-text
(concat dbgp-filter-pending-text string)
string))
- (return-from dbgp-session-filter))
-
+ (cl-return-from dbgp-session-filter))
+
;; If we have to ask a question during the processing,
;; defer any additional text that comes from the debugger
;; during that time.
@@ -812,7 +808,7 @@ takes over the filter."
dbgp-delete-prompt-marker)
(comint-update-fence)
(set-marker dbgp-delete-prompt-marker nil))))
-
+
;; Save the process output, checking for source file markers.
(and chunks
(setq output
@@ -856,13 +852,13 @@ takes over the filter."
chunks)
(while (< i send)
(if (< 0 (elt string i))
- (incf i)
+ (cl-incf i)
(setq tlen (string-to-number (substring string lbeg i)))
(setq tbeg (1+ i))
(setq i (+ tbeg tlen))
(when (< i send)
(setq chunks (cons (substring string tbeg i) chunks))
- (incf i)
+ (cl-incf i)
(setq lbeg i))))
;; Remove chunk from `dbgp-filter-pending-text'.
(setq dbgp-filter-pending-text
@@ -935,4 +931,18 @@ takes over the filter."
(when (buffer-live-p (process-buffer proc))
(dbgp-session-echo-input proc output))))
-(provide 'dbgp)
\ No newline at end of file
+
+(defadvice open-network-stream (around debugclient-pass-process-to-comint )
+ "[comint hack] Pass the spawned DBGp client process to comint."
+ (let* ((buffer (ad-get-arg 1))
+ (proc (buffer-local-value 'dbgp-buffer-process buffer)))
+ (set-process-buffer proc buffer)
+ (setq ad-return-value proc) ))
+
+;;(ad-unadvise 'open-network-stream)
+;;(ad-deactivate 'open-network-stream )
+(ad-disable-advice 'open-network-stream 'around 'debugclient-pass-process-to-comint)
+
+(provide 'dbgp)
+
+;;; dbgp.el ends here
diff --git a/scripts/emacs/geben-0.26/etc/README b/scripts/emacs/geben-1.1.0/etc/README
similarity index 100%
rename from scripts/emacs/geben-0.26/etc/README
rename to scripts/emacs/geben-1.1.0/etc/README
diff --git a/scripts/emacs/geben-0.26/etc/wisent-php-tags.el b/scripts/emacs/geben-1.1.0/etc/wisent-php-tags.el
similarity index 100%
rename from scripts/emacs/geben-0.26/etc/wisent-php-tags.el
rename to scripts/emacs/geben-1.1.0/etc/wisent-php-tags.el
diff --git a/scripts/emacs/geben-0.26/etc/wisent-php-tags.wy b/scripts/emacs/geben-1.1.0/etc/wisent-php-tags.wy
similarity index 100%
rename from scripts/emacs/geben-0.26/etc/wisent-php-tags.wy
rename to scripts/emacs/geben-1.1.0/etc/wisent-php-tags.wy
diff --git a/scripts/emacs/geben-0.26/geben.el b/scripts/emacs/geben-1.1.0/geben.el
similarity index 90%
rename from scripts/emacs/geben-0.26/geben.el
rename to scripts/emacs/geben-1.1.0/geben.el
index 6a3f3189a96adc978dc693fc98ce0dfd4f558194..af95714798df9da03e10ffd6650aae1313e386cd 100644
--- a/scripts/emacs/geben-0.26/geben.el
+++ b/scripts/emacs/geben-1.1.0/geben.el
@@ -1,105 +1,84 @@
;;; geben.el --- DBGp protocol frontend, a script debugger
-;; $Id: geben.el 118 2010-03-30 10:26:39Z fujinaka.tohru $
-;;
+
+;; Copyright (C) 2005-2010 reedom <fujinaka.tohru@gmail.com>
+;; Copyright (C) 2016 Matthew Carter
+
;; Filename: geben.el
-;; Author: reedom <fujinaka.tohru@gmail.com>
-;; Maintainer: reedom <fujinaka.tohru@gmail.com>
-;; Version: 0.26
-;; URL: http://code.google.com/p/geben-on-emacs/
+;; Author: Matthew Carter <m@ahungry.com>
+;; Code derived from Original Author: reedom <fujinaka.tohru@gmail.com>
+;; Maintainer: Matthew Carter <m@ahungry.com>
+;; URL: https://github.com/ahungry/geben
+;; Version: 1.0.2
;; Keywords: DBGp, debugger, PHP, Xdebug, Perl, Python, Ruby, Tcl, Komodo
-;; Compatibility: Emacs 22.1
-;;
+;; Compatibility: Emacs 24+
+;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
+
;; This file is not part of GNU Emacs
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or
+
+;;; License:
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;;
+;;
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
;;; Commentary:
-;;
+
;; GEBEN is a software package that interfaces Emacs to DBGp protocol
-;; with which you can debug running scripts interactive. At this present
-;; DBGp protocol are supported in several script languages with help of
-;; custom extensions.
-;;
+;; with which you can debug running scripts interactively. At this
+;; present time, DBGp protocols are supported in several script
+;; languages with help of custom extensions.
+
;;; Usage
-;;
+
;; 1. Insert autoload hooks into your .Emacs file.
;; -> (autoload 'geben "geben" "DBGp protocol frontend, a script debugger" t)
-;; 2. Start GEBEN. By default, M-x geben will start it.
+;; 2. Start GEBEN. By default, M-x geben will start it.
;; GEBEN starts to listening to DBGp protocol session connection.
;; 3. Run debuggee script.
;; When the connection is established, GEBEN loads the entry script
;; file in geben-mode.
-;; 4. Start debugging. To see geben-mode key bindings, type ?.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+;; 4. Start debugging. To see geben-mode key bindings, type ?.
+
;;; Requirements:
-;;
+
;; [Server side]
;; - PHP with Xdebug 2.0.3
;; http://xdebug.org/
;; - Perl, Python, Ruby, Tcl with Komodo Debugger Extension
;; http://aspn.activestate.com/ASPN/Downloads/Komodo/RemoteDebugging
-;;
+
;; [Client side]
-;; - Emacs 22.1 and later
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+;; - Emacs 24 and later
+
;;; Code:
(eval-when-compile
(when (or (not (boundp 'emacs-version))
- (string< emacs-version "22.1"))
- (error (concat "geben.el: This package requires Emacs 22.1 or later."))))
+ (string< emacs-version "24"))
+ (error (concat "geben.el: This package requires Emacs 24 or later.")))
+ (require 'cl))
(eval-and-compile
- (require 'cl)
+ (require 'cl-lib)
(require 'xml)
(require 'tree-widget)
(require 'dbgp))
-(defvar geben-version "0.24")
+(defvar geben-version "1.0.3")
;;--------------------------------------------------------------
;; customization
;;--------------------------------------------------------------
-;; For compatibility between versions of custom
-(eval-and-compile
- (condition-case ()
- (require 'custom)
- (error nil))
- (if (and (featurep 'custom) (fboundp 'custom-declare-variable)
- ;; Some XEmacsen w/ custom don't have :set keyword.
- ;; This protects them against custom.
- (fboundp 'custom-initialize-set))
- nil ;; We've got what we needed
- ;; We have the old custom-library, hack around it!
- (if (boundp 'defgroup)
- nil
- (defmacro defgroup (&rest args)
- nil))
- (if (boundp 'defcustom)
- nil
- (defmacro defcustom (var value doc &rest args)
- `(defvar (,var) (,value) (,doc))))))
-
;; customize group
(defgroup geben nil
@@ -121,12 +100,17 @@ Typically `pop-to-buffer' or `switch-to-buffer'."
:group 'geben
:type 'function)
+(defcustom geben-show-redirect-buffers t
+ "Shall stdout/stderr buffers be shown automatically."
+ :group 'geben
+ :type 'boolean)
+
(defsubst geben-dbgp-dynamic-property-bufferp (buf)
(with-current-buffer buf
(symbol-value 'geben-dynamic-property-buffer-p)))
(defun geben-dbgp-display-window (buf)
- "Display a buffer anywhere in a window, depends on the circumstance."
+ "Display a buffer BUF anywhere in a window, depends on the circumstance."
(cond
((get-buffer-window buf)
(select-window (get-buffer-window buf))
@@ -137,16 +121,16 @@ Typically `pop-to-buffer' or `switch-to-buffer'."
(t
(let ((candidates (make-vector 3 nil))
(dynamic-p (geben-dbgp-dynamic-property-bufferp buf)))
- (block finder
- (walk-windows (lambda (window)
- (if (geben-dbgp-dynamic-property-bufferp (window-buffer window))
- (if dynamic-p
- (unless (aref candidates 1)
- (aset candidates 1 window)))
- (if (eq (selected-window) window)
- (aset candidates 2 window)
- (aset candidates 0 window)
- (return-from finder))))))
+ (cl-block finder
+ (walk-windows (lambda (window)
+ (if (geben-dbgp-dynamic-property-bufferp (window-buffer window))
+ (if dynamic-p
+ (unless (aref candidates 1)
+ (aset candidates 1 window)))
+ (if (eq (selected-window) window)
+ (aset candidates 2 window)
+ (aset candidates 0 window)
+ (cl-return-from finder))))))
(select-window (or (aref candidates 0)
(aref candidates 1)
(aref candidates 2)
@@ -161,23 +145,25 @@ Typically `pop-to-buffer' or `switch-to-buffer'."
(defun geben-dbgp-dynamic-property-buffer-visiblep ()
"Check whether any window displays any property buffer."
- (block walk-loop
- (walk-windows (lambda (window)
- (if (geben-dbgp-dynamic-property-bufferp (window-buffer window))
- (return-from walk-loop t))))))
+ (cl-block walk-loop
+ (walk-windows (lambda (window)
+ (if (geben-dbgp-dynamic-property-bufferp (window-buffer window))
+ (cl-return-from walk-loop t))))))
;;==============================================================
;; utilities
;;==============================================================
+(defun geben-rec (x acc)
+ "Helper function for recursively flattening a list, where X is the list and ACC is the accumulator."
+ (cond ((null x) acc)
+ ((atom x) (cons x acc))
+ (t (geben-rec (car x) (geben-rec (cdr x) acc)))))
+
(defsubst geben-flatten (x)
"Make cons X to a flat list."
- (flet ((rec (x acc)
- (cond ((null x) acc)
- ((atom x) (cons x acc))
- (t (rec (car x) (rec (cdr x) acc))))))
- (rec x nil)))
+ (geben-rec x nil))
(defsubst geben-what-line (&optional pos)
"Get the number of the line in which POS is located.
@@ -217,13 +203,13 @@ If POS is omitted, then the current position is used."
(defmacro geben-lexical-bind (bindings &rest body)
(declare (indent 1)
(debug (sexp &rest form)))
- (cl-macroexpand-all
+ (macroexpand-all
(nconc
(list 'lexical-let (mapcar (lambda (arg)
(list arg arg))
bindings))
body)))
-
+
(defun geben-remove-directory-tree (basedir)
(ignore-errors
(mapc (lambda (path)
@@ -246,7 +232,7 @@ If POS is omitted, then the current position is used."
(member ip (mapcar (lambda (addr)
(format-network-address (cdr addr) t))
(network-interface-list)))))))
-
+
;;--------------------------------------------------------------
;; cross emacs overlay definitions
;;--------------------------------------------------------------
@@ -258,7 +244,8 @@ If POS is omitted, then the current position is used."
(defalias 'overlay-livep 'overlay-buffer)))
(defun geben-overlay-make-line (lineno &optional buf)
- "Create a whole line overlay."
+ "Create a whole line overlay on LINENO line.
+Optionally, in buffer BUF."
(with-current-buffer (or buf (current-buffer))
(save-excursion
(widen)
@@ -274,17 +261,17 @@ If POS is omitted, then the current position is used."
;; DBGp related utilities
;;==============================================================
-(defmacro* geben-dbgp-sequence (cmd &rest callback)
+(cl-defmacro geben-dbgp-sequence (cmd &rest callback)
(declare (indent 1)
(debug (form &rest form)))
(list 'progn
(list 'geben-plist-append cmd
:callback (car callback))))
-(defmacro* geben-dbgp-sequence-bind (bindings cmd callback)
+(cl-defmacro geben-dbgp-sequence-bind (bindings cmd callback)
(declare (indent 1)
(debug (sexp form lambda-expr)))
- (cl-macroexpand-all
+ (macroexpand-all
(list 'progn
(list 'geben-plist-append cmd
:callback (if bindings
@@ -292,7 +279,8 @@ If POS is omitted, then the current position is used."
callback)))))
(defun geben-dbgp-decode-string (string data-encoding coding-system)
- "Decode encoded STRING."
+ "Decode encoded STRING.
+Use the DATA-ENCODING appropriate to the CODING-SYSTEM."
(when string
(let ((s string))
(when (consp s)
@@ -307,7 +295,7 @@ If POS is omitted, then the current position is used."
s)))))
-(defcustom geben-temporary-file-directory (expand-file-name "geben" "~/.emacs.d")
+(defcustom geben-temporary-file-directory (expand-file-name "geben" user-emacs-directory)
"*Base directory path where GEBEN creates temporary files and directories."
:group 'geben
:type 'directory)
@@ -373,7 +361,7 @@ at the entry line of the script."
:group 'geben
:type 'boolean)
-(defstruct (geben-session
+(cl-defstruct (geben-session
(:constructor nil)
(:constructor geben-session-make))
"Represent a DBGp protocol connection session."
@@ -395,11 +383,11 @@ at the entry line of the script."
(cursor (list :overlay nil :position nil))
tempdir
)
-
+
(defmacro geben-with-current-session (binding &rest body)
(declare (indent 1)
(debug (symbolp &rest form)))
- (cl-macroexpand-all
+ (macroexpand-all
`(let ((,binding geben-current-session))
(when ,binding
,@body))))
@@ -407,7 +395,7 @@ at the entry line of the script."
;; initialize
(defsubst geben-session-init (session init-msg)
- "Initialize a session of a process PROC."
+ "Initialize a SESSION of a process PROC, with the INIT-MSG."
(geben-session-tempdir-setup session)
(setf (geben-session-initmsg session) init-msg)
(setf (geben-session-xdebug-p session)
@@ -422,6 +410,7 @@ at the entry line of the script."
(run-hook-with-args 'geben-session-enter-hook session))
(defun geben-session-storage-create (session)
+ "Create the necessary storage for the SESSION."
(let* ((initmsg (geben-session-initmsg session))
(process (geben-session-process session))
(listener (dbgp-plist-get process :listener))
@@ -430,7 +419,7 @@ at the entry line of the script."
:addr (xml-get-attribute initmsg 'hostname)
:idekey (xml-get-attribute initmsg 'idekey))
(list :proxy nil
- :port (second (process-contact listener))))))
+ :port (cl-second (process-contact listener))))))
(nconc storage (list :language (geben-session-language session)
:fileuri (xml-get-attribute initmsg 'fileuri)))
(add-to-list 'geben-storages storage)
@@ -447,28 +436,29 @@ at the entry line of the script."
(process (geben-session-process session))
(listener (dbgp-plist-get process :listener))
(proxy-p (dbgp-proxy-p listener))
- (port (second (process-contact listener))))
- (find-if (lambda (storage)
- (and (eq (not proxy-p)
- (not (plist-get storage :proxy)))
- (eq (geben-session-language session)
- (plist-get storage :language))
- (equal fileuri (plist-get storage :fileuri))
- (if proxy-p
- (and (equal addr (plist-get storage :addr))
- (equal idekey (plist-get storage :idekey)))
- (eq port (plist-get storage :port)))))
- geben-storages)))
+ (port (cl-second (process-contact listener))))
+ (cl-find-if (lambda (storage)
+ (and (eq (not proxy-p)
+ (not (plist-get storage :proxy)))
+ (eq (geben-session-language session)
+ (plist-get storage :language))
+ (equal fileuri (plist-get storage :fileuri))
+ (if proxy-p
+ (and (equal addr (plist-get storage :addr))
+ (equal idekey (plist-get storage :idekey)))
+ (eq port (plist-get storage :port)))))
+ geben-storages)))
(defsubst geben-session-release (session)
- "Initialize a session of a process PROC."
+ "Initialize a SESSION of a process PROC."
(setf (geben-session-process session) nil)
(setf (geben-session-cursor session) nil)
(geben-session-tempdir-remove session)
(geben-storage-save)
(run-hook-with-args 'geben-session-exit-hook session))
-
+
(defsubst geben-session-active-p (session)
+ "Evaluate the active state of SESSION. If active, will return t, otherwise nil."
(let ((proc (geben-session-process session)))
(and (processp proc)
(eq 'open (process-status proc)))))
@@ -476,14 +466,15 @@ at the entry line of the script."
;; tid
(defsubst geben-session-next-tid (session)
- "Get transaction id for next command."
+ "Get transaction id for next command in SESSION."
(prog1
(geben-session-tid session)
- (incf (geben-session-tid session))))
+ (cl-incf (geben-session-tid session))))
;; buffer
(defsubst geben-session-buffer-name (session format-string)
+ "Return the buffer name for SESSION, formatted according to FORMAT-STRING."
(let* ((proc (geben-session-process session))
(idekey (plist-get (dbgp-proxy-get proc) :idekey)))
(format format-string
@@ -512,10 +503,10 @@ at the entry line of the script."
;; temporary directory
(defun geben-session-tempdir-setup (session)
- "Setup temporary directory."
+ "Setup temporary directory for SESSION."
(let* ((proc (geben-session-process session))
(gebendir (file-truename geben-temporary-file-directory))
- (leafdir (format "%d" (second (process-contact proc))))
+ (leafdir (format "%d" (cl-second (process-contact proc))))
(tempdir (expand-file-name leafdir gebendir)))
(unless (file-directory-p gebendir)
(make-directory gebendir t)
@@ -523,7 +514,7 @@ at the entry line of the script."
(setf (geben-session-tempdir session) tempdir)))
(defun geben-session-tempdir-remove (session)
- "Remove temporary directory."
+ "Remove temporary directory for SESSION."
(let ((tempdir (geben-session-tempdir session)))
(when (file-directory-p tempdir)
(geben-remove-directory-tree tempdir))))
@@ -531,13 +522,13 @@ at the entry line of the script."
;; misc
(defsubst geben-session-ip-get (session)
- "Get ip address of the host server."
+ "Get ip address of the host server in SESSION."
(let* ((proc (geben-session-process session))
(listener (dbgp-listener-get proc)))
(format-network-address (dbgp-ip-get proc) t)))
(defun geben-session-remote-p (session)
- "Get ip address of the host server."
+ "Get ip address of the host server IN SESSION."
(geben-remote-p (geben-session-ip-get session)))
@@ -567,13 +558,13 @@ at the entry line of the script."
,key))
(defsubst geben-cmd-param-get (cmd flag)
- "Get FLAG's parameter used in CMD.
+ "For CMD, get FLAG's parameter used.
For a DBGp command \`stack_get -i 1 -d 2\',
`(geben-cmd-param-get cmd \"-d\")\' gets \"2\"."
(cdr-safe (assoc flag (plist-get cmd :param))))
(defun geben-cmd-expand (cmd)
- "Build a send command string for DBGp protocol."
+ "Build a send command CMD string for DBGp protocol."
(mapconcat #'(lambda (x)
(cond ((stringp x) x)
((integerp x) (int-to-string x))
@@ -585,9 +576,10 @@ For a DBGp command \`stack_get -i 1 -d 2\',
(plist-get cmd :tid)
(plist-get cmd :param)))
" "))
-
+
(defsubst geben-session-cmd-make (session operand params)
- "Create a new command object."
+ "Create a new command object for SESSION.
+Assign OPERAND to :operand, and PARAMS to :param in the plist."
(list :session session
:tid (geben-session-next-tid session)
:operand operand
@@ -600,7 +592,7 @@ For a DBGp command \`stack_get -i 1 -d 2\',
(setf (geben-session-cmd session) (list cmd)))))
(defun geben-session-cmd-remove (session tid)
- "Get a command object from the command hash table specified by TID."
+ "Get a command object from the command hash table for SESSION specified by TID."
(let ((cmds (geben-session-cmd session)))
(if (eq tid (plist-get (car cmds) :tid))
(prog1
@@ -608,10 +600,10 @@ For a DBGp command \`stack_get -i 1 -d 2\',
(setf (geben-session-cmd session) (cdr cmds)))
(let (match-cmd)
(setf (geben-session-cmd session)
- (remove-if (lambda (cmd)
- (and (eq tid (plist-get cmd :tid))
- (setq match-cmd cmd)))
- cmds))
+ (cl-remove-if (lambda (cmd)
+ (and (eq tid (plist-get cmd :tid))
+ (setq match-cmd cmd)))
+ cmds))
match-cmd))))
@@ -626,7 +618,7 @@ For a DBGp command \`stack_get -i 1 -d 2\',
(string-to-number tid))))
(defun geben-dbgp-entry (session msg)
- "Analyze MSG and dispatch to a specific handler."
+ "Within SESSION, analyze MSG and dispatch to a specific handler."
;; remain session status ('connect, 'init, 'break, 'stopping, 'stopped)
(let ((handler (intern-soft (concat "geben-dbgp-handle-"
(symbol-name (xml-node-name msg)))))
@@ -639,12 +631,12 @@ For a DBGp command \`stack_get -i 1 -d 2\',
(defvar geben-dbgp-init-hook nil)
(defun geben-dbgp-handle-init (session msg)
- "Handle a init message."
+ "Within SESSION, handle a init message MSG."
(geben-session-init session msg)
(run-hook-with-args 'geben-dbgp-init-hook session))
(defun geben-dbgp-handle-response (session msg)
- "Handle a response message."
+ "Within SESSION, handle a response message MSG."
(let* ((tid (geben-dbgp-tid-read msg))
(cmd (geben-session-cmd-remove session tid))
(err (dbgp-xml-get-error-node msg)))
@@ -666,7 +658,7 @@ For a DBGp command \`stack_get -i 1 -d 2\',
(plist-get cmd :callback))))
(defun geben-dbgp-handle-status (session msg)
- "Handle status code in a response message."
+ "Within SESSION, handle status code in a response message MSG."
(let ((status (xml-get-attribute msg 'status)))
(cond
((equal status "stopping")
@@ -682,14 +674,15 @@ For a DBGp command \`stack_get -i 1 -d 2\',
(dbgp-session-send-string (geben-session-process session) string t)))
(defun geben-send-raw-command (session fmt &rest arg)
- "Send a command string to a debugger engine.
+ "Send a command string to a debugger engine for SESSION.
The command string will be built up with FMT and ARG with a help of
the string formatter function `format'."
(let ((cmd (apply #'format fmt arg)))
(geben-dbgp-send-string session cmd)))
(defun geben-dbgp-send-command (session operand &rest params)
- "Send a command to a debugger engine.
+ "Send a command to a debugger engine for SESSION.
+OPERAND and PARAMS will be passed along to 'geben-session-cmd-make.
Return a cmd list."
(if (geben-session-active-p session)
(let ((cmd (geben-session-cmd-make session operand params)))
@@ -714,27 +707,27 @@ Return a cmd list."
;; step_into
(defun geben-dbgp-command-step-into (session)
- "Send \`step_into\' command."
+ "Send \`step_into\' command to the SESSION."
(geben-dbgp-send-command session "step_into"))
(defun geben-dbgp-response-step-into (session cmd msg)
- "A response message handler for \`step_into\' command."
+ "For SESSION, send a CMD response MSG handler for \`step_into\'."
(run-hook-with-args 'geben-dbgp-continuous-command-hook session))
;; step_over
(defun geben-dbgp-command-step-over (session)
- "Send \`step_over\' command."
+ "Send \`step_over\' command to the SESSION."
(geben-dbgp-send-command session "step_over"))
(defun geben-dbgp-response-step-over (session cmd msg)
- "A response message handler for \`step_over\' command."
+ "For SESSION, send a CMD response MSG handler for \`step_over\'."
(run-hook-with-args 'geben-dbgp-continuous-command-hook session))
;; step_out
(defun geben-dbgp-command-step-out (session)
- "Send \`step_out\' command."
+ "Send \`step_out\' command to the SESSION."
(geben-dbgp-send-command session "step_out"))
(defun geben-dbgp-response-step-out (session cmd msg)
@@ -768,7 +761,7 @@ Return a cmd list."
(defun geben-dbgp-response-eval (session cmd msg)
"A response message handler for \`eval\' command."
- (message "result: %S"
+ (message "result: %S"
(geben-dbgp-decode-value (car-safe (xml-get-children msg 'property)))))
(defun geben-dbgp-decode-value (prop)
@@ -786,7 +779,7 @@ Return a cmd list."
nil)
(t
(let ((value (car (last prop))))
- (assert (stringp value))
+ (cl-assert (stringp value))
(when (string= "base64" (xml-get-attribute prop 'encoding))
(setq value (base64-decode-string value)))
(if (string= "string" type)
@@ -868,7 +861,7 @@ A source object forms a property list with three properties
;; for bug of Xdebug 2.0.3 and below:
(replace-regexp-in-string "%28[0-9]+%29%20:%20runtime-created%20function$" ""
fileuri))
-
+
(defun geben-source-fileuri (session local-path)
"Guess a file uri string which counters to LOCAL-PATH."
(let* ((tempdir (geben-session-tempdir session))
@@ -911,7 +904,7 @@ A source object forms a property list with three properties
path))))
(defun geben-source-default-file-name (session)
- (case (geben-session-language session)
+ (cl-case (geben-session-language session)
(:php "index.php")
(:python "index.py")
(:perl "index.pl")
@@ -920,11 +913,11 @@ A source object forms a property list with three properties
(defun geben-source-find-session (temp-path)
"Find a session which may have a file at TEMP-PATH in its temporary directory tree."
- (find-if (lambda (session)
- (let ((tempdir (geben-session-tempdir session)))
- (ignore-errors
- (string= tempdir (substring temp-path 0 (length tempdir))))))
- geben-sessions))
+ (cl-find-if (lambda (session)
+ (let ((tempdir (geben-session-tempdir session)))
+ (ignore-errors
+ (string= tempdir (substring temp-path 0 (length tempdir))))))
+ geben-sessions))
(defun geben-source-visit (local-path)
"Visit to a local source code file."
@@ -950,7 +943,7 @@ A source object forms a property list with three properties
(let* ((storage (geben-session-storage session))
(list (plist-get storage :source)))
(if (and (string-match "^file:/" fileuri)
- (not (find list fileuri :test #'equal)))
+ (not (cl-find list fileuri :test #'equal)))
(if list
(nconc list (list fileuri))
(plist-put storage :source (list fileuri))))))
@@ -995,10 +988,10 @@ A source object forms a property list with three properties
(defsubst geben-session-source-fileuri (session local-path)
"Find a known fileuri that counters to LOCAL-PATH."
- (block geben-session-souce-fileuri
+ (cl-block geben-session-souce-fileuri
(maphash (lambda (fileuri path)
(and (equal local-path (plist-get path :local-path))
- (return-from geben-session-souce-fileuri fileuri)))
+ (cl-return-from geben-session-souce-fileuri fileuri)))
(geben-session-source session))))
(defsubst geben-session-source-content-coding-system (session content)
@@ -1040,7 +1033,7 @@ FILEURI is a uri of the target file of a debuggee site."
(let* ((fileuri (geben-cmd-param-get cmd "-f"))
(local-path (geben-source-local-path session fileuri)))
(when local-path
- (geben-session-source-add session fileuri local-path (base64-decode-string (third msg)))
+ (geben-session-source-add session fileuri local-path (base64-decode-string (cl-third msg)))
(geben-source-visit local-path))))
(defun geben-dbgp-source-fetch (session fileuri)
@@ -1100,7 +1093,7 @@ Or return specific TRAMP spec. (e.g. \"/user@example.com:\""
(find-file-default (if path-prefix
(concat path-prefix local-path)
(format "/%s:%s" ip local-path))))
- (while (not (tramp-handle-file-regular-p
+ (while (not (tramp-handle-file-regular-p
(setq find-file-default (read-file-name "Find remote file: "
(file-name-directory find-file-default)
find-file-default t
@@ -1203,7 +1196,7 @@ will be displayed in a window."
;; breakpoints
;;==============================================================
-(defstruct (geben-breakpoint
+(cl-defstruct (geben-breakpoint
(:constructor nil)
(:constructor geben-breakpoint-make))
"Breakpoint setting.
@@ -1243,7 +1236,7 @@ debugging is finished."
(defun geben-bp-make (session type &rest params)
"Create a new line breakpoint object."
- (assert (geben-session-p session))
+ (cl-assert (geben-session-p session))
(let ((bp (append (list :type type) params)))
;; force :lineno and :hit-value value to be integer.
(mapc (lambda (prop)
@@ -1294,7 +1287,7 @@ debugging is finished."
(defun geben-session-breakpoint-storage-add (session bp)
(let* ((storage (geben-session-storage session))
(list (plist-get storage :bp)))
- (unless (find bp list :test #'geben-bp=)
+ (unless (cl-find bp list :test #'geben-bp=)
(let ((bp-copy (copy-sequence bp)))
(plist-put bp-copy :overlay nil)
(if list
@@ -1304,8 +1297,8 @@ debugging is finished."
(defun geben-session-breakpoint-storage-remove (session bp)
(let* ((storage (geben-session-storage session))
(list (plist-get storage :bp)))
- (when (find bp list :test #'geben-bp=)
- (plist-put storage :bp (delete* bp list :test #'geben-bp=)))))
+ (when (cl-find bp list :test #'geben-bp=)
+ (plist-put storage :bp (cl-delete bp list :test #'geben-bp=)))))
(defun geben-session-breakpoint-storage-restore (session)
(let ((storage (geben-session-storage session))
@@ -1328,28 +1321,28 @@ debugging is finished."
(defun geben-session-breakpoint-remove (session id-or-obj)
"Remove breakpoints having specific breakpoint id or same meaning objects."
(setf (geben-breakpoint-list (geben-session-breakpoint session))
- (remove-if (if (stringp id-or-obj)
- (lambda (bp)
- (when (string= (plist-get bp :id) id-or-obj)
- (geben-session-breakpoint-storage-remove session bp)
- (geben-bp-finalize bp)))
- (lambda (bp)
- (when (geben-bp= id-or-obj bp)
- (geben-session-breakpoint-storage-remove session bp)
- (geben-bp-finalize bp))))
- (geben-breakpoint-list (geben-session-breakpoint session)))))
+ (cl-remove-if (if (stringp id-or-obj)
+ (lambda (bp)
+ (when (string= (plist-get bp :id) id-or-obj)
+ (geben-session-breakpoint-storage-remove session bp)
+ (geben-bp-finalize bp)))
+ (lambda (bp)
+ (when (geben-bp= id-or-obj bp)
+ (geben-session-breakpoint-storage-remove session bp)
+ (geben-bp-finalize bp))))
+ (geben-breakpoint-list (geben-session-breakpoint session)))))
(defun geben-session-breakpoint-find (session id-or-obj)
"Find a breakpoint.
id-or-obj should be either a breakpoint id or a breakpoint object."
- (find-if
+ (cl-find-if
(if (stringp id-or-obj)
(lambda (bp)
(string= (plist-get bp :id) id-or-obj))
(lambda (bp)
(geben-bp= id-or-obj bp)))
(geben-breakpoint-list (geben-session-breakpoint session))))
-
+
;; dbgp
(defun geben-dbgp-breakpoint-restore (session)
@@ -1393,9 +1386,9 @@ id-or-obj should be either a breakpoint id or a breakpoint object."
(when err
(geben-session-breakpoint-remove session bid))))
(setf (geben-breakpoint-list (geben-session-breakpoint session))
- (delete-if (lambda (bp1)
- (geben-bp= bp bp1))
- (geben-breakpoint-list (geben-session-breakpoint session))))))))
+ (cl-delete-if (lambda (bp1)
+ (geben-bp= bp bp1))
+ (geben-breakpoint-list (geben-session-breakpoint session))))))))
(defun geben-breakpoint-clear (session)
"Clear all breakpoints."
@@ -1404,12 +1397,12 @@ id-or-obj should be either a breakpoint id or a breakpoint object."
(defun geben-breakpoint-find-at-pos (session buf pos)
(with-current-buffer buf
- (remove-if 'null
- (mapcar (lambda (overlay)
- (let ((bp (overlay-get overlay 'bp)))
- (and (eq :line (plist-get bp :type))
- bp)))
- (overlays-at pos)))))
+ (cl-remove-if 'null
+ (mapcar (lambda (overlay)
+ (let ((bp (overlay-get overlay 'bp)))
+ (and (eq :line (plist-get bp :type))
+ bp)))
+ (overlays-at pos)))))
;; breakpoint list
@@ -1444,7 +1437,7 @@ id-or-obj should be either a breakpoint id or a breakpoint object."
(plist-get type-rank (plist-get b :type))))
(if (not (zerop cmp))
(< cmp 0)
- (case (plist-get a :type)
+ (cl-case (plist-get a :type)
(:line
(setq ax (plist-get a :fileuri))
(setq bx (plist-get b :fileuri))
@@ -1501,7 +1494,7 @@ id-or-obj should be either a breakpoint id or a breakpoint object."
(define-key map "?" 'geben-breakpoint-list-mode-help)
map)
"Keymap for `geben-breakpoint-list-mode'")
-
+
(defun geben-breakpoint-list-mode (session)
"Major mode for GEBEN's breakpoint list.
The buffer commands are:
@@ -1657,12 +1650,12 @@ Key mapping and other information is described its help page."
(if (or (not (listp breakpoints))
(zerop (length breakpoints)))
(insert "No breakpoints.\n")
- (setq breakpoints (sort (copy-list breakpoints)
+ (setq breakpoints (sort (cl-copy-list breakpoints)
#'geben-breakpoint-sort-pred))
(mapc (lambda (bp)
(insert " ")
(insert (format "%-11s"
- (or (case (plist-get bp :type)
+ (or (cl-case (plist-get bp :type)
(:line "Line")
(:exception "Exception")
(:call "Call")
@@ -1752,7 +1745,7 @@ With this callback GEBEN tracks displacements of line breakpoints."
(while (and (looking-at "[ \t]*$")
(< lineno lineno-to))
(forward-line)
- (incf lineno))
+ (cl-incf lineno))
(if (< lineno-from lineno)
(plist-put (overlay-get overlay 'bp) :lineno lineno))
(goto-line lineno)
@@ -1935,7 +1928,7 @@ the file."
(defun geben-dbgp-breakpoint-list-refresh (session)
(geben-breakpoint-list-refresh))
-
+
;;==============================================================
@@ -1959,23 +1952,23 @@ the file."
'((t :inherit 'font-lock-type-face))
"Face used to highlight type name."
:group 'geben-highlighting-faces)
-
+
(defface geben-context-class-face
'((t :inherit 'font-lock-constant-face))
"Face used to highlight type name."
:group 'geben-highlighting-faces)
-
+
(defface geben-context-string-face
'((t :inherit 'font-lock-string-face))
"Face used to highlight string value."
:group 'geben-highlighting-faces)
-
+
(defface geben-context-constant-face
'((t :inherit 'font-lock-constant-face))
"Face used to highlight numeric value."
:group 'geben-highlighting-faces)
-(defstruct (geben-context
+(cl-defstruct (geben-context
(:constructor nil)
(:constructor geben-context-make))
names ; context names alist(KEY: context name, VALUE: context id)
@@ -2078,7 +2071,7 @@ the file."
(defsubst geben-context-property-name (property)
"Get name attribute value from PROPERTY."
(geben-context-property-attribute property 'name))
-
+
(defsubst geben-context-property-fullname (property)
"Get fullname attribute value from PROPERTY."
(geben-context-property-attribute property 'fullname))
@@ -2191,7 +2184,7 @@ Child nodes can be short for :property property of TREE."
(value (geben-context-property-value property))
tag)
(let ((formatter (plist-get typeinfo :name-formatter)))
- (setq tag
+ (setq tag
(if formatter
(funcall formatter property)
(propertize (geben-context-property-name property)
@@ -2215,7 +2208,7 @@ Child nodes can be short for :property property of TREE."
:expander 'geben-context-property-tree-expand
:expander-p 'geben-context-property-tree-expand-p)
(list 'item :tag (concat " " tag)))))
-
+
(defun geben-context-property-tree-context-id (tree)
"Get context id to which TREE belongs."
(when tree
@@ -2348,7 +2341,7 @@ After fetching it calls CALLBACK function."
(or force
(geben-session-context-buffer-visible-p session)))
(geben-context-list-display session depth (not force))))
-
+
(defun geben-context-list-display (session depth &optional no-select)
"Display context variables in the context buffer."
(unless (geben-session-active-p session)
@@ -2632,7 +2625,7 @@ The buffer commands are:
(defconst geben-redirect-stderr-buffer-name "*GEBEN<%s> stderr*"
"Name for the debuggee script's STDERR redirection buffer.")
-(defstruct (geben-redirect
+(cl-defstruct (geben-redirect
(:constructor nil)
(:constructor geben-redirect-make))
(stdout :redirect)
@@ -2667,7 +2660,7 @@ The buffer commands are:
(setq buffer-undo-list t)
(run-hook-with-args 'geben-dbgp-redirect-buffer-init-hook (current-buffer)))
(current-buffer))))))
-
+
(defun geben-session-redirect-buffer-name (session type)
"Select buffer name for a redirection type."
(let ((redirect (geben-session-redirect session)))
@@ -2675,7 +2668,7 @@ The buffer commands are:
(geben-redirect-stdout redirect))
(and (eq type :stderr)
(geben-redirect-stderr redirect)))
- (geben-session-buffer-name session
+ (geben-session-buffer-name session
(cond
((geben-redirect-combine redirect)
geben-redirect-combine-buffer-name)
@@ -2703,7 +2696,7 @@ The buffer commands are:
(defun geben-dbgp-handle-stream (session msg)
"Handle a stream message."
- (let ((type (case (intern-soft (xml-get-attribute msg 'type))
+ (let ((type (cl-case (intern-soft (xml-get-attribute msg 'type))
('stdout :stdout)
('stderr :stderr)))
(encoding (xml-get-attribute msg 'encoding))
@@ -2726,7 +2719,8 @@ The buffer commands are:
(geben-redirect-coding-system (geben-session-redirect session)))))
(goto-char (or save-pos
(point-max))))
- (geben-dbgp-display-window buf))))
+ (when geben-show-redirect-buffers
+ (geben-dbgp-display-window buf)))))
(defun geben-dbgp-command-stdout (session mode)
"Send `stdout' command."
@@ -2737,7 +2731,7 @@ The buffer commands are:
(defun geben-dbgp-response-stdout (session cmd msg)
"A response message handler for `stdout' command."
(setf (geben-redirect-stdout (geben-session-redirect session))
- (case (geben-cmd-param-get cmd "-c")
+ (cl-case (geben-cmd-param-get cmd "-c")
(0 nil)
(1 :redirect)
(2 :intercept))))
@@ -2751,7 +2745,7 @@ The buffer commands are:
(defun geben-dbgp-response-stderr (session cmd msg)
"A response message handler for `stderr' command."
(setf (geben-redirect-stderr (geben-session-redirect session))
- (case (geben-cmd-param-get cmd "-c")
+ (cl-case (geben-cmd-param-get cmd "-c")
(0 nil)
(1 :redirect)
(2 :intercept))))
@@ -2775,7 +2769,7 @@ The buffer commands are:
(message "Waiting for debug server to connect at port %s." port)))
(error
(beep)
- (read-char (format "[port %s] %s" port (second error-sexp))
+ (read-char (format "[port %s] %s" port (cl-second error-sexp))
nil 3))))
(defun geben-dbgp-start-proxy (ip-or-addr port idekey ;;multi-session-p
@@ -2796,7 +2790,7 @@ The buffer commands are:
(error
(beep)
(read-char (format "[proxy %s:%s-%s] %s"
- ip-or-addr port idekey (second error-sexp))
+ ip-or-addr port idekey (cl-second error-sexp))
nil 3))))
(defun geben-dbgp-session-accept-p (proc)
@@ -2805,24 +2799,44 @@ The buffer commands are:
;; a. capable for multi sessions.
;; b. not used yet; it's the first session for the connection-point.
(let ((accept-p
- (if (dbgp-proxy-p proc)
- (let ((proxy (dbgp-plist-get proc :proxy)))
- (or (plist-get proxy :multi-session)
- (not (some (lambda (session)
- (eq proxy (dbgp-plist-get proc :proxy)))
- geben-sessions))))
- (let ((port (dbgp-port-get (dbgp-listener-get proc))))
- (not (some (lambda (session)
- (let ((oproc (geben-session-process session)))
- (and oproc
- (not (dbgp-proxy-p oproc))
- (eq port (dbgp-port-get (dbgp-listener-get oproc))))))
- geben-sessions))))))
+ ;;string is set init dbgp-comint-setup
+ (if (dbgp-proxy-p proc)
+ (let ((proxy (dbgp-plist-get proc :proxy)))
+ (or (plist-get proxy :multi-session)
+ (not (cl-some (lambda (session)
+ (eq proxy (dbgp-plist-get proc :proxy)))
+ geben-sessions))))
+ (let ((port (dbgp-port-get (dbgp-listener-get proc))))
+ (not (cl-some (lambda (session)
+ (let ((oproc (geben-session-process session)))
+ (and oproc
+ (not (dbgp-proxy-p oproc))
+ (eq port (dbgp-port-get (dbgp-listener-get oproc))))))
+ geben-sessions)))))
+ (user-filtered-reason (geben-dbgp-session-user-filter proc string)))
(unless accept-p
(message "GEBEN: Rejected new connection from %s (Already in debugging)"
- (car (process-contact proc))))
- accept-p))
-
+ (car (process-contact proc))))
+ (when user-filtered-reason
+ (message "GEBEN: Rejected new connection from %s due to %s"
+ (car (process-contact proc)) user-filtered-reason))
+ (and accept-p (not user-filtered-reason))))
+
+(defcustom geben-dbgp-session-user-filter-uri-regexp nil
+ "Ignore all debug requests with matched uris"
+ :group 'geben
+ :type '(repeat string))
+
+(defun geben-dbgp-session-user-filter (proc string)
+ "Do not accept a session if its fileuri can be matched against "
+ (let* ((xml (car (with-temp-buffer
+ (insert string)
+ (xml-parse-region (point-min) (point-max)))))
+ (fileuri (xml-get-attribute-or-nil xml 'fileuri)))
+ (when (cl-some (lambda (reg)
+ (string-match reg fileuri)) geben-dbgp-session-user-filter-uri-regexp)
+ fileuri)))
+
(defun geben-dbgp-session-init (proc)
"Initialize SESSION environment."
(let ((session (geben-session-make :process proc)))
@@ -2831,7 +2845,7 @@ The buffer commands are:
(with-current-buffer (process-buffer proc)
(set (make-local-variable 'geben-current-session) session)
(rename-buffer (geben-session-buffer-name session geben-process-buffer-name) t))))
-
+
(defun geben-dbgp-session-filter (proc string)
"Process DBGp response STRING.
Parse STRING, find xml chunks, convert them to xmlized lisp objects
@@ -2945,27 +2959,27 @@ of the function is passed to feature_set DBGp command."
(let ((method (car entry))
(name (symbol-name (nth 1 entry)))
(param (nth 2 entry)))
- (case method
- (:set
- (let ((value (cond
- ((null param) nil)
- ((symbolp param)
- (if (fboundp param)
- (funcall param)
- (if (boundp param)
- (symbol-value param)
- (symbol-name param))))
- (t param))))
- (geben-dbgp-command-feature-set session name value)))
- (:get
- (condition-case error-sexp
- (if (and (symbolp param)
- (fboundp param))
- (geben-dbgp-sequence
- (geben-dbgp-command-feature-get session name)
- param))
- (error
- (warn "`geben-dbgp-feature-alist' has invalid entry: %S" entry)))))))))
+ (cl-case method
+ (:set
+ (let ((value (cond
+ ((null param) nil)
+ ((symbolp param)
+ (if (fboundp param)
+ (funcall param)
+ (if (boundp param)
+ (symbol-value param)
+ (symbol-name param))))
+ (t param))))
+ (geben-dbgp-command-feature-set session name value)))
+ (:get
+ (condition-case error-sexp
+ (if (and (symbolp param)
+ (fboundp param))
+ (geben-dbgp-sequence
+ (geben-dbgp-command-feature-get session name)
+ param))
+ (error
+ (warn "`geben-dbgp-feature-alist' has invalid entry: %S" entry)))))))))
;; feature
@@ -3001,6 +3015,11 @@ If non-nil, GEBEN will query the user before removing all breakpoints."
:group 'geben
:type 'boolean)
+(defcustom geben-scroll-margin nil
+ "Controls the scroll margin of the geben mode."
+ :group 'geben
+ :type '(choice integer (const nil)))
+
(defvar geben-mode-map nil)
(unless geben-mode-map
(setq geben-mode-map (make-sparse-keymap "geben"))
@@ -3085,9 +3104,12 @@ The geben-mode buffer commands:
(set (make-local-variable 'command-error-function) #'geben-mode-read-only-handler)
(let ((win (get-buffer-window (current-buffer))))
(if win
- (set-window-buffer win (current-buffer)))))
-
+ (set-window-buffer win (current-buffer))))
+ (when geben-scroll-margin
+ (setq-local scroll-margin geben-scroll-margin)))
+
(add-hook 'geben-source-visit-hook 'geben-enter-geben-mode)
+(add-hook 'geben-session-enter-hook 'geben-set-predefined-breakpoints t)
(defun geben-mode-read-only-handler (data context caller)
(if (eq 'buffer-read-only (car data))
@@ -3113,7 +3135,7 @@ The geben-mode buffer commands:
(interactive)
(geben-with-current-session session
(if (geben-session-stack session)
- (let* ((stack (second (car (geben-session-stack session))))
+ (let* ((stack (cl-second (car (geben-session-stack session))))
(fileuri (geben-source-fileuri-regularize (cdr (assq 'filename stack))))
(lineno (cdr (assq 'lineno stack))))
(geben-session-cursor-update session fileuri lineno))
@@ -3124,7 +3146,7 @@ The geben-mode buffer commands:
(interactive)
(quit-window)
(geben-where))
-
+
(defun geben-mode-help ()
"Display description and key bindings of `geben-mode'."
(interactive)
@@ -3139,11 +3161,11 @@ This value remains the last step command type either
"Do either `geben-step-into' or `geben-step-over' what the last time called.
Default is `geben-step-into'."
(interactive)
- (case geben-step-type
+ (cl-case geben-step-type
(:step-over (geben-step-over))
(:step-into (geben-step-into))
(t (geben-step-into))))
-
+
(defun geben-step-into ()
"Step into the definition of the function or method about to be called.
If there is a function call involved it will break on the first
@@ -3234,9 +3256,9 @@ hit-value interactively.
(lambda (x)
(cdr x))
candidates " "))))
- (x (find-if (lambda (x)
- (eq c (elt (cdr x) 0)))
- candidates))
+ (x (cl-find-if (lambda (x)
+ (eq c (elt (cdr x) 0)))
+ candidates))
(fn (and x
(intern-soft (concat "geben-set-breakpoint-"
(substring (symbol-name (car x)) 1))))))
@@ -3315,7 +3337,7 @@ hit-value interactively."
;; at this present some debugger engines' implementations is buggy:
;; some requires fileuri and some don't accept it.
(let ((local-path (file-truename (buffer-file-name (current-buffer)))))
- (read-string "fileuri: "
+ (read-string "fileuri: "
(or (geben-session-source-fileuri session local-path)
(geben-source-fileuri session local-path))
'geben-set-breakpoint-fileuri-history))))
@@ -3348,7 +3370,7 @@ hit-value interactively."
;; at this present some debugger engines' implementations are buggy:
;; some requires fileuri and some don't accept it.
(let ((local-path (file-truename (buffer-file-name (current-buffer)))))
- (read-string "fileuri: "
+ (read-string "fileuri: "
(or (geben-session-source-fileuri session local-path)
(geben-source-fileuri session local-path))
'geben-set-breakpoint-fileuri-history))))
@@ -3377,7 +3399,7 @@ hit-value interactively."
(geben-set-breakpoint-common session hit-value
(geben-bp-make session :exception
:exception name))))
-
+
(defun geben-set-breakpoint-conditional (expr fileuri &optional lineno hit-value)
"Set a breakpoint to break at when the expression EXPR is true in the file FILEURI.
Optionally, with a numeric argument you can specify `hit-value'
@@ -3399,7 +3421,7 @@ hit-value interactively."
(setq lineno (read-string "Line number to evaluate (blank means entire file): "
(number-to-string (geben-what-line))))
(setq hit-value current-prefix-arg))
-
+
(geben-set-breakpoint-common session hit-value
(geben-bp-make session :conditional
:expression expr
@@ -3444,7 +3466,8 @@ removing all breakpoints."
(when (or (not geben-query-on-clear-breakpoints)
(let ((prompt "Clear all breakpoints? (y/N): "))
(memq (read-char prompt) '(?Y ?y))))
- (geben-breakpoint-clear session))))
+ (geben-breakpoint-clear session)
+ (geben-clear-predefined-breakpoints))))
(defun geben-show-breakpoint-list ()
"Display breakpoint list.
@@ -3453,6 +3476,44 @@ Key mapping and other information is described its help page."
(interactive)
(geben-breakpoint-list-refresh t))
+(defcustom geben-predefined-breakpoints nil
+ "Controls the association list of predefined breakpoints.
+The key of each association specifies the file name of the
+breakpoint and the value speficies the line number."
+ :group 'geben
+ :type '(alist :key-type string :value-type integer))
+
+(defun geben-set-predefined-breakpoints (session)
+ "Set the predefined breakpoints as SESSION breakpoints."
+ (when geben-predefined-breakpoints
+ (dolist (bp geben-predefined-breakpoints)
+ (let ((local-path (car bp))
+ (line-number (cdr bp)))
+ (geben-set-breakpoint-common session nil
+ (geben-bp-make
+ session :line
+ :fileuri (or (geben-session-source-fileuri session local-path)
+ (geben-session-source-fileuri session (file-truename local-path))
+ (geben-source-fileuri session local-path))
+ :lineno line-number
+ :local-path local-path
+ :overlay t
+ :run-once nil))))))
+
+;;;###autoload
+(defun geben-add-current-line-to-predefined-breakpoints ()
+ "Add the current line to the predefined breakpoints."
+ (interactive)
+ (let ((path (buffer-file-name))
+ (line (line-number-at-pos)))
+ (add-to-list 'geben-predefined-breakpoints `(,path . ,line))
+ (message "%s line %s %s" path line "added to predefined breakpoints")))
+
+(defun geben-clear-predefined-breakpoints ()
+ "Clear all predefined breakpoints."
+ (interactive)
+ (setq geben-predefined-breakpoints nil))
+
(defvar geben-eval-history nil)
(defun geben-eval-expression (expr)
@@ -3501,7 +3562,7 @@ This command enables you to redirect the debuggee script's output to GEBEN.
You can select redirection target from \`stdout', \`stderr' and both of them.
Prefixed with \\[universal-argument], you can also select redirection mode
from \`redirect', \`intercept' and \`disabled'."
- (interactive (list (case (read-char "Redirect: o)STDOUT e)STRERR b)Both")
+ (interactive (list (cl-case (read-char "Redirect: o)STDOUT e)STRERR b)Both")
(?o :stdout)
(?e :stderr)
(?b :both))
@@ -3509,7 +3570,7 @@ from \`redirect', \`intercept' and \`disabled'."
(unless target
(error "Cancelled"))
(let ((mode (if arg
- (case (read-char "Mode: r)Redirect i)Intercept d)Disable")
+ (cl-case (read-char "Mode: r)Redirect i)Intercept d)Disable")
(?r :redirect)
(?i :intercept)
(?d :disable))
@@ -3545,7 +3606,7 @@ from \`redirect', \`intercept' and \`disabled'."
t)))
(when file-path
(geben-open-file (geben-source-fileuri session file-path))))))
-
+
(defcustom geben-dbgp-default-port 9000
"Default port number to listen a new DBGp connection."
@@ -3598,7 +3659,7 @@ In the debugging session the source code buffers are under the
minor mode `geben-mode'. Key mapping and other information is
described its help page."
(interactive "p")
- (case args
+ (cl-case args
(1
(geben-dbgp-start geben-dbgp-default-port))
(4
@@ -3620,7 +3681,7 @@ described its help page."
(let ((ports (remq nil
(mapcar (lambda (listener)
(and (not (dbgp-proxy-p listener))
- (number-to-string (second (process-contact listener)))))
+ (number-to-string (cl-second (process-contact listener)))))
dbgp-listeners))))
(list
(if (= 1 (length ports))
@@ -3634,7 +3695,7 @@ described its help page."
(dbgp-listener-kill port)
(and (interactive-p)
(message (if listener
- "The DBGp listener for port %d is terminated."
+ "The DBGp listener for port %d is terminated."
"DBGp listener for port %d does not exist.")
port))
(and listener t)))
@@ -3676,4 +3737,25 @@ associating with the IDEKEY."
(defalias 'geben-proxy-end #'dbgp-proxy-unregister)
+;; geben full-frame mode
+
+(defun geben-full-frame-save (session)
+ (window-configuration-to-register 'geben-full-frame-register)
+ (delete-other-windows))
+
+(defun geben-full-frame-restore (session)
+ (jump-to-register 'geben-full-frame-register t))
+
+;;;###autoload
+(define-minor-mode geben-full-frame-mode "" :global t
+ (if geben-full-frame-mode
+ (progn
+ (add-hook 'geben-session-enter-hook 'geben-full-frame-save)
+ (add-hook 'geben-session-exit-hook 'geben-full-frame-restore))
+ (progn
+ (remove-hook 'geben-session-enter-hook 'geben-full-frame-save)
+ (remove-hook 'geben-session-exit-hook 'geben-full-frame-restore))))
+
(provide 'geben)
+
+;;; geben.el ends here
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/close.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/close.png
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/close.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/close.png
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/empty.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/empty.png
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/empty.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/empty.png
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/end-guide.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/end-guide.png
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/end-guide.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/end-guide.png
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/guide.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/guide.png
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/guide.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/guide.png
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/handle.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/handle.png
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/handle.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/handle.png
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/leaf.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/leaf.png
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/leaf.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/leaf.png
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/no-guide.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/no-guide.png
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/no-guide.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/no-guide.png
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/no-handle.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/no-handle.png
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/no-handle.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/no-handle.png
diff --git a/scripts/emacs/geben-0.26/tree-widget/geben/open.png b/scripts/emacs/geben-1.1.0/tree-widget/geben/open.png
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/emacs/geben-0.26/tree-widget/geben/open.png
rename to scripts/emacs/geben-1.1.0/tree-widget/geben/open.png
diff --git a/scripts/emacs/phafi-autoload.el b/scripts/emacs/phafi-autoload.el
index e60ddd57ee4819c0376b87a8d7e60c829fee0ec0..c4c068665c34e33217dc8fb0c6a12224038019ea 100644
--- a/scripts/emacs/phafi-autoload.el
+++ b/scripts/emacs/phafi-autoload.el
@@ -31,7 +31,7 @@
(phafi-autoload-load "php-mode-1.13.2")
(phafi-autoload-load "magit-1.2.1")
-(phafi-autoload-load "geben-0.26")
+(phafi-autoload-load "geben-1.1.0")
(phafi-autoload-load "nxhtml-2.08-100425")
(phafi-autoload-load "popup-0.5")
(phafi-autoload-load "auto-complete-1.4")
diff --git a/scripts/emacs/phafi-mode.el b/scripts/emacs/phafi-mode.el
index bbda7c8080e4d22c31b781824592e77d7a34783a..fffee7378d308e2bb58ebc5f8b1af6a48e30fbd5 100644
--- a/scripts/emacs/phafi-mode.el
+++ b/scripts/emacs/phafi-mode.el
@@ -656,7 +656,8 @@
"update variables set valeur='admin' where clef='admin_login';"
"update variables set valeur='admin' where clef='admin_pwd';"
"update mysql.proc set definer='root@localhost';"
- "update bib_admin_var set valeur='1' where clef='ENABLE_COLLABORATIVE_BROWSING';"
+ "update bib_admin_var set valeur='0' where clef='ENABLE_COLLABORATIVE_BROWSING';"
+ "update bib_admin_var set valeur='no' where clef='STATUS_REPORT_PUSH_URL';"
"drop trigger datemaj_notices_update;")
mysql-connection-info)
diff --git a/tests/application/modules/admin/controllers/NewsletterControllerTest.php b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
index 18dc06443d698becc8c5731a8dceee00cde2d2ce..d0f0e68d1808dc717ddd61a033811d4345816a6d 100644
--- a/tests/application/modules/admin/controllers/NewsletterControllerTest.php
+++ b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
@@ -60,14 +60,20 @@ class Admin_NewsletterControllerConfigActionTest extends Admin_NewsletterControl
/** @test */
- public function NewsletterIdProfilVarShouldBeDisplayed() {
+ public function newsletterIdProfilVarShouldBeDisplayed() {
$this->assertXPathContentContains('//tr//td','NEWSLETTER_ID_PROFIL');
}
/** @test */
- public function NewsletterUnsubscribeVarShouldBeDisplayed() {
- $this->assertXPathContentContains('//tr//td','NEWSLETTER_UNSUBSCRIBE_TEXT');
+ public function newsletterUnsubscribeVarShouldBeDisplayed() {
+ $this->assertXPathContentContains('//tr//td[1]','NEWSLETTER_UNSUBSCRIBE_TEXT');
+ }
+
+
+ /** @test */
+ public function newsletterUnsubscribeTextVarShouldContainsLinkToUnsubscribe() {
+ $this->assertXPathContentContains('//tr//td[2]','Lien pour se désinscrire de cette');
}
}
diff --git a/tests/application/modules/opac/controllers/AbonneControllerFicheTest.php b/tests/application/modules/opac/controllers/AbonneControllerFicheTest.php
index 884005e5a32694d2ff1898341958783faec30a9e..79bc263ca6f9be0b64570e7241fd22a39e4f4c3a 100644
--- a/tests/application/modules/opac/controllers/AbonneControllerFicheTest.php
+++ b/tests/application/modules/opac/controllers/AbonneControllerFicheTest.php
@@ -24,6 +24,10 @@ abstract class AbstractAbonneControllerFicheTest extends AbstractControllerTestC
public function setUp() {
parent::setUp();
+
+ $this->fixture('Class_Bib', ['id' => 1]);
+ $this->fixture('Class_Bib', ['id' => 2]);
+
$this->marcus = $this->fixture('Class_Users',
['id' => 10,
'login' => 'MC',
@@ -149,27 +153,30 @@ class AbonneControllerFicheNobodyLoggedTest extends AbstractAbonneControllerFich
-class AbonneControllerFicheAsAdminDisableSuggestTest extends AbstractAbonneControllerFicheTest {
+class AbonneControllerFicheAsAdminDisableSuggestAndBookmarkableLibrariesTest extends AbstractAbonneControllerFicheTest {
public function setUp() {
parent::setUp();
- $this->fixture('Class_AdminVar',
- ['id' => 'DISABLE_SUGGESTIONS',
- 'valeur' => '1']);
- $this->marcus->beAdminPortail();
+ Class_AdminVar::set('DISABLE_SUGGESTIONS', 1);
+ Class_AdminVar::set('ENABLE_BOOKMARKABLE_LIBRARIES', 0);
$this->dispatch('/abonne/fiche', true);
}
/** @test */
public function linkToSuggestionAchatShouldNotBePresent() {
- $this->assertNotXPathContentContains('//a[contains(@href, "/abonne/suggestion-achat")]',
- 'Suggérer un achat', $this->_response->getBody());
+ $this->assertNotXPath('//a[contains(@href, "/abonne/suggestion-achat")]');
+ }
+
+ /** @test */
+ public function linkToSettingsShouldNotBePresent() {
+ $this->assertNotXPath('//a[contains(@href, "/abonne/settings")]');
}
}
-class AbonneControllerFicheActionWithLoggedUserTest extends AbstractControllerTestCase {
+
+class AbonneControllerFicheActionWithLoggedUserTest extends AbstractAbonneControllerFicheTest {
public function setUp() {
parent::setUp();
$this->dispatch('/abonne/fiche', true);
@@ -178,12 +185,12 @@ class AbonneControllerFicheActionWithLoggedUserTest extends AbstractControllerTe
/** @test */
public function settingsLinkShouldBePopup() {
- $this->assertXPath('//div//a[2][@data-popup="true"]', $this->_response->getBody());
+ $this->assertXPath('//div//a[contains(@href, "/abonne/settings")][@data-popup="true"]', $this->_response->getBody());
}
/** @test */
- public function settingsLinkWithImageShouldBePopup() {
- $this->assertXPath('//div//a[@data-popup="true"]/img[contains(@src, "abonnes/settings")]');
+ public function settingsLinkShouldContainsImage() {
+ $this->assertXPath('//div//a[contains(@href, "/abonne/settings")]/img[contains(@src, "abonnes/settings")]');
}
}
diff --git a/tests/application/modules/opac/controllers/AbonneControllerPretsTest.php b/tests/application/modules/opac/controllers/AbonneControllerPretsTest.php
index 0a27292581cb6787bb5723ed565744abb1eedb81..cc75859b8a93c7b85f7ed6f0a137744a353df4a8 100644
--- a/tests/application/modules/opac/controllers/AbonneControllerPretsTest.php
+++ b/tests/application/modules/opac/controllers/AbonneControllerPretsTest.php
@@ -124,6 +124,7 @@ abstract class AbonneControllerPretsListThreePretsTestCase extends AbstractAbonn
'notice' => $this->fixture('Class_Notice',
['id' => 889,
'titre_principal' => 'Potter',
+ 'type_doc' => 1,
'unimarc' => '00577nam0 2200181 450 001001500000010001800015100004100033101000800074200010700082210003000189215001100219461002000230606002900250676000800279700004500287801005600332940000700388 frOr1314913787 a9781408812792 a20140320 0103 aEng 1 aHarry Potter and the deathly hallows dHarry Potter et les reliques de la mort fJoanne Kathleen Rowling aLondres cBloomsbury d2010 a831 p. 1 tHarry Potter v7 aAnglais (langue) 2Rameau a420 1 aRowling bJoanne Kathleen f1965-.... 4070 aFR bBibliothèque de l\'agglomération de Saint-Omer apm '])]);
$alice = new Class_WebService_SIGB_Emprunt('13', new Class_WebService_SIGB_Exemplaire(456));
@@ -141,6 +142,7 @@ abstract class AbonneControllerPretsListThreePretsTestCase extends AbstractAbonn
'notice' => $this->fixture('Class_Notice',
['id' => 827,
'titre_principal' => 'Alice',
+ 'type_doc' => 1,
'unimarc' => '01175cam0 22002771 450 001001500000010003700015100004100052101000800093102000700101105001800108106000600126200009300132210002400225211001300249215006400262300002400326307002900350330027300379345001800652461005600670700001800726701003000744801003300774856008300807940000700890 frOr0354235228 a978-2-35592-635-8 bbr. d7,65 EUR a20140225d2014 | |0fre|0103||||ba afre aFR a 0||y| ar 1 aAlice au royaume de Trèfle eCheshire cat Waltz h5 fQuinRose gdessin Mamenosuke Fujimaru aParis cKi-oon d2014 1 a20140227 a1 vol. (164 p.) cillustrations en noir et blanc d18 x 13 cm aTraduit du japonais aSens de lecture japonais aPerdue dans la forêt aux portes, Alice tombe nez à nez avec Ace. Devenue malgré elle la confidente du chevalier, elle ne sait comment repousser ses avances. Lorsque le chat du Cheshire, qui a assisté à la scène, intervient, la rencontre tourne à l\'affrontement. b9782355926358 1 tAlice au royaume de Trèfle : Cheshire cat Waltz v5 1 aQuinRose 4070 1 aFujimaru bMamenosuke 4440 aFR bElectre c20140225 gAFNOR uhttp://www.electre.com//GetBlob.ashx?Ean=9782355926358,0-1913692&Size=Original aLR '])]);
$emprunteur = new Class_WebService_SIGB_Emprunteur('1234', 'Florence');
@@ -151,6 +153,7 @@ abstract class AbonneControllerPretsListThreePretsTestCase extends AbstractAbonn
'subscriber_id' => $this->florence->getIdabon(),
'ongoing' => true,
'expected_return_date' => '2022-05-02T18:14:14+02:00',
+ 'loan_date' => '2016-06-13T15:10:02+02:00',
'album' => $this->fixture('Class_Album',
['id' => 4,
'notice_id' => 5,
@@ -164,6 +167,7 @@ abstract class AbonneControllerPretsListThreePretsTestCase extends AbstractAbonn
'user_id' => $this->florence->getId(),
'ongoing' => true,
'expected_return_date' => '2020-01-01T18:14:14+02:00',
+ 'loan_date' => '2016-06-13T15:10:02+02:00',
'album' => $this->fixture('Class_Album',
['id' => 5,
'notice_id' => 6,
@@ -327,8 +331,10 @@ class AbonneControllerPretsListThreePretsTest extends AbonneControllerPretsListT
/** @test */
- public function potterLoanShouldBePresent() {
- $this->assertXPathContentContains("//tbody/tr[2]//td", 'Potter', $this->_response->getBody());
+ public function potterLoanShouldContainsTypeDocBook() {
+ $this->assertXPathContentContains('//tbody/tr[2]//td[preceding-sibling::td[text()="Livres"]]',
+ 'Harry Potter and the deathly hallows',
+ $this->_response->getBody());
}
@@ -380,21 +386,28 @@ class AbonneControllerPretsListThreePretsTest extends AbonneControllerPretsListT
/** @test */
public function pinocchioPnbLoanShouldBePresent() {
$this->assertXPathContentContains('//tbody//a[contains(@href, "viewnotice/id/5")]',
- 'Pinocchio');
+ 'Pinocchio',
+ $this->_response->getBody());
+ }
+
+
+ /** @test */
+ public function pnbLoansTableShouldNotDisplayTypeDoc() {
+ $this->assertXPath('//table//th[text()="Titre"][preceding-sibling::th[1][not(text()="Support")]]');
}
/** @test */
public function pinocchioPnbLoanReturnDateShouldBe2022() {
$this->assertXPathContentContains('//tbody//td[@class="date_retour"]',
- '2022-05-02T18:14:14+02:00');
+ '02/05/2022');
}
/** @test */
public function peterPanPnbLoanReturnDateShouldBe2020() {
$this->assertXPathContentContains('//tbody//td[@class="date_retour"]',
- '2020-01-01T18:14:14+02:00');
+ '01/01/2020');
}
}
@@ -456,7 +469,8 @@ class AbonneControllerPretsListReservationTest extends AbstractAbonneControllerP
$this->fixture('Class_Notice',
['id' => 820,
- 'titre_principal' => 'Potter']);
+ 'titre_principal' => 'Potter',
+ 'type_doc' => Class_TypeDoc::DVD]);
$this->fixture('Class_Notice',
['id' => 824,
@@ -541,6 +555,11 @@ class AbonneControllerPretsListReservationTest extends AbstractAbonneControllerP
}
+ /** @test */
+ public function typeDogShouldBeDVD() {
+ $this->assertXPathContentContains('//tbody/tr[1]//td', 'DVD');
+ }
+
/** @test */
public function etatShouldBeReservationEmise() {
$this->assertXPathContentContains('//tbody/tr[1]//td', 'Réservation émise');
diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php
index 8d0327cc4e3dddc2af9ee23fb624e40d67802931..ff3bcd0a0693b6f2505fa133096b48baa3986b49 100644
--- a/tests/application/modules/opac/controllers/RechercheControllerTest.php
+++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php
@@ -72,6 +72,10 @@ abstract class RechercheControllerNoticeTestCase extends AbstractControllerTestC
Class_Notice::beVolatile();
Class_Exemplaire::beVolatile();
+ $this->fixture('Class_Bib', ['id' => 1, 'libelle' => 'Romains']);
+ $this->fixture('Class_Bib', ['id' => 2, 'nom_court' => 'Pringy']);
+
+
$this->notice = Class_Notice::newInstanceWithId(345,
['annee' => 2002,
'editeur' => 'Gallimard',
@@ -1273,6 +1277,30 @@ abstract class RechercheControllerSimpleActionTestCase extends RechercheControll
+class RechercheControllerWithBookmarkableLibrariesDisabledTest extends RechercheControllerNoticeTestCase {
+ public function setUp() {
+ parent::setUp();
+ Class_AdminVar::set('ENABLE_BOOKMARKABLE_LIBRARIES', 0);
+ }
+
+
+ /** @test */
+ public function librariesBookmarksShouldNotBePresent() {
+ $this->dispatch('/recherche/simple/expressionRecherche/pomme/',true);
+ $this->assertNotXPath('//div[contains(@class, "bookmarks_outer")]');
+ }
+
+
+ /** @test */
+ public function withNoSessionManageYourBookmarksShouldNotBePresent() {
+ ZendAfi_Auth::getInstance()->clearIdentity();
+ $this->dispatch('/recherche/simple/expressionRecherche/pomme/',true);
+ $this->assertNotXPathContentContains('//div//p', 'Vous devez être connecté pour gérer vos favoris');
+ }
+}
+
+
+
class RechercheControllerSimpleActionWithDefaultConfigTest extends RechercheControllerSimpleActionTestCase {
public function setUp() {
parent::setUp();
@@ -2798,6 +2826,7 @@ class RechercheControllerSimpleActionWithCvsActivatedTest extends RechercheContr
$this->assertXPathContentContains('//div[@class="conteneur_simple"]//div[contains(@class,"cvs_container")]//h1', 'CVS Ressources', $this->_response->getBody());
}
+
/** @test **/
public function cvsBoiteClassShouldHavePosition1() {
$this->assertXPath('//div[@class="conteneur_simple"]//div[@class="cvs_container position_1"]', $this->_response->getBody());
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseEndProcessTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseEndProcessTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d3d375eb2f9794f55f8770cc23ffc2e2727f8bc8
--- /dev/null
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseEndProcessTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class PhaseEndProcessTest extends Class_Cosmogramme_Integration_PhaseTestCase {
+ protected $_http_client;
+
+ protected function _getPreviousPhase() {
+ return (new Class_Cosmogramme_Integration_Phase(21))->beCron();
+ }
+
+
+ public function setUp() {
+ parent::setUp();
+
+ $this->_http_client = $this->mock()
+ ->whenCalled('postData')
+ ->answers('');
+
+ Class_Systeme_Report_Publication::setDefaultHttpClient($this->_http_client);
+ $this->fixture('Class_Profil', ['id' => 1, 'libelle' => 'My Bokeh']);
+ }
+
+
+ public function tearDown() {
+ Class_Systeme_Report_Publication::resetHttpClient();
+ parent::tearDown();
+ }
+
+
+ /** @test */
+ public function reportShouldBePushedToPola() {
+ $this->_phase = $this->_buildPhase('EndProcess')->run();
+ $this->assertEquals('http://pola.afi-sa.net/smile.php',
+ $this->_http_client->getFirstAttributeForLastCallOn('postData'));
+ }
+
+
+ /** @test */
+ public function logShouldContainsReportPublished() {
+ $this->_phase = $this->_buildPhase('EndProcess')->run();
+ $this->assertLogContains('Publication du rapport système');
+ }
+
+
+ /** @test */
+ public function pushedRequestToPolaShouldIncludeReport() {
+ $this->_phase = $this->_buildPhase('EndProcess')->run();
+ $report = $this->_http_client->getAttributesForLastCallOn('postData')[1]['report'];
+ $this->assertEquals('My Bokeh', json_decode($report, true)['portal']['label']);
+ }
+
+
+ /** @test */
+ public function withNoPushUrlShouldNotPushReport() {
+ Class_AdminVar::set('STATUS_REPORT_PUSH_URL', '0');
+ $this->_phase = $this->_buildPhase('EndProcess')->run();
+ $this->assertFalse($this->_http_client->methodHasBeenCalled('postData'));
+ }
+
+
+ /** @test */
+ public function withInvalidPushUrlShouldNotPushReport() {
+ Class_AdminVar::set('STATUS_REPORT_PUSH_URL', 'no');
+ $this->_phase = $this->_buildPhase('EndProcess')->run();
+ $this->assertFalse($this->_http_client->methodHasBeenCalled('postData'));
+ }
+
+
+ /** @test */
+ public function withInvalidPushUrlLogShouldNotContainsReportPublished() {
+ Class_AdminVar::set('STATUS_REPORT_PUSH_URL', 'no');
+ $this->_phase = $this->_buildPhase('EndProcess')->run();
+ $this->assertNotLogContains('Publication du rapport système');
+ }
+
+
+ /** @test */
+ public function withExceptionShouldNotPushReport() {
+ $this->_http_client
+ ->whenCalled('postData')
+ ->willDo(function() { throw new RunTimeException('no more paper'); });
+
+ $this->_phase = $this->_buildPhase('EndProcess')->run();
+ $this->assertLogContains('Echec de la publication du rapport sur http://pola.afi-sa.net/smile.php (no more paper)');
+ }
+}
+?>
\ No newline at end of file
diff --git a/tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php b/tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php
index 79c815e03f47ae55a599dc3c83ef79d9ce91cb27..07d6aa04f33318a58e43e8eeb64029a840c14f46 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php
@@ -1,4 +1,4 @@
-<?php
+~<?php
/**
* Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
*
@@ -20,6 +20,8 @@
*/
abstract class PhasePrepareIntegrationsWithOAITestCase extends Class_Cosmogramme_Integration_PhaseTestCase {
+ protected $_http_client;
+
public function setUp() {
parent::setUp();
@@ -52,6 +54,16 @@ abstract class PhasePrepareIntegrationsWithOAITestCase extends Class_Cosmogramme
->answers(true)
->beStrict();
+ $this->_http_client = $this->mock()
+ ->whenCalled('postData')
+ ->answers('');
+
+ Class_AdminVar::set('STATUS_REPORT_PUSH_URL',
+ 'http://pola.roid.fr');
+
+ Class_Systeme_Report_Publication::setDefaultHttpClient($this->_http_client);
+ $this->fixture('Class_Profil', ['id' => 1, 'libelle' => 'My Bokeh']);
+
Class_Cosmogramme_Integration_PhasePrepareIntegrations::setFileSystem($file_system);
Class_Cosmogramme_Integration_PhasePrepareIntegrations::setTimeSource(new TimeSourceForTest('2015-03-26 14:00:00'));
@@ -59,6 +71,12 @@ abstract class PhasePrepareIntegrationsWithOAITestCase extends Class_Cosmogramme
}
+ public function tearDown() {
+ Class_Systeme_Report_Publication::resetHttpClient();
+ parent::tearDown();
+ }
+
+
protected function _prepareFixtures() {
$this->fixture('Class_CosmoVar',
['id' => 'ID_upload', 'valeur' => 1178]);
@@ -213,6 +231,20 @@ class PhasePrepareIntegrationsWithOAITest extends PhasePrepareIntegrationsWithOA
Class_CosmoVar::setValueOf('integration_path', '');
$this->_phase = $this->_buildPhase('PrepareIntegrations')->run();
}
+
+
+ /** @test */
+ public function reportShouldBePushedToPola() {
+ $this->assertEquals('http://pola.roid.fr',
+ $this->_http_client->getFirstAttributeForLastCallOn('postData'));
+ }
+
+
+ /** @test */
+ public function pushedRequestToPolaShouldIncludeReport() {
+ $report = $this->_http_client->getAttributesForLastCallOn('postData')[1]['report'];
+ $this->assertEquals('My Bokeh', json_decode($report, true)['portal']['label']);
+ }
}
diff --git a/tests/library/ZendAfi/View/Helper/ListeNotices/VERSIONS_HOTLINE/52819 b/tests/library/ZendAfi/View/Helper/ListeNotices/VERSIONS_HOTLINE/52819
deleted file mode 100644
index c15823e7030714b37acc3b9c3bd2ba8230f9d5cf..0000000000000000000000000000000000000000
--- a/tests/library/ZendAfi/View/Helper/ListeNotices/VERSIONS_HOTLINE/52819
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #52819 : Administration : ajout d'une variable pour gérer l'affichage de la disponibilité dans le résultat de recherche calculé avec la facette "En rayon".
\ No newline at end of file
diff --git a/tests/library/ZendAfi/View/Helper/Status/HtmlTest.php b/tests/library/ZendAfi/View/Helper/Status/HtmlTest.php
index 8f906a85ccda41724e0b8252f1ebc55f2147c905..04a18315027eb4d81f33962e18b61b3aa544c682 100644
--- a/tests/library/ZendAfi/View/Helper/Status/HtmlTest.php
+++ b/tests/library/ZendAfi/View/Helper/Status/HtmlTest.php
@@ -27,6 +27,7 @@ class ZendAfi_View_Helper_Status_HtmlTest extends ZendAfi_View_Helper_Status_Tes
public function setUp() {
parent::setUp();
+ Class_AdminVar::set('BUID', '2345abc');
$this->_html = utf8_decode($this->_helper->status_Html());
}
@@ -53,6 +54,14 @@ class ZendAfi_View_Helper_Status_HtmlTest extends ZendAfi_View_Helper_Status_Tes
}
+ /** @test */
+ public function uniqueIdentifierShouldBe2345abc() {
+ $this->assertXPathContentContains($this->_html,
+ '//section/dl/dd[preceding-sibling::dt[text()="Identifiant unique"]]',
+ '2345abc');
+ }
+
+
/** @test */
public function portalUrlShouldBeLibraryAnnecyDotFr() {
$this->assertXPathContentContains($this->_html,
diff --git a/tests/library/ZendAfi/View/Helper/Status/JsonTest.php b/tests/library/ZendAfi/View/Helper/Status/JsonTest.php
index 3297ae7d558af001572331f5c7727d5836bdd9eb..793530891873be1bbfaf5c55817f6efbd52423cd 100644
--- a/tests/library/ZendAfi/View/Helper/Status/JsonTest.php
+++ b/tests/library/ZendAfi/View/Helper/Status/JsonTest.php
@@ -44,12 +44,34 @@ class ZendAfi_View_Helper_Status_JsonTest extends ZendAfi_View_Helper_Status_Tes
}
+ /** @test */
+ public function portalTagsShouldContainsTestingIgnoreInProdAndDedicatedServer() {
+ $this->assertEquals(['TESTING', 'IGNORE', 'IN_PROD', 'DEDICATED_SERVER'],
+ $this->_report['portal']['tags']);
+ }
+
+
/** @test */
public function headersVersionShouldBeCurrentVersion() {
$this->assertEquals(BOKEH_RELEASE_NUMBER, $this->_report['headers']['version']);
}
+ /** @test */
+ public function headersBUIDShouldBeGenerated() {
+ $this->assertNotEmpty($this->_report['headers']['buid']);
+ $this->assertEquals(Class_AdminVar::get('BUID'),
+ $this->_report['headers']['buid']);
+ }
+
+
+ /** @test */
+ public function headersShouldContainsDatabaseName() {
+ $this->assertEquals(Zend_Db_Table::getDefaultAdapter()->getConfig()['dbname'],
+ $this->_report['headers']['database']);
+ }
+
+
/** @test */
public function portalLabelShouldBeC2APortal() {
$this->assertEquals('C2A portal', $this->_report['portal']['label']);
diff --git a/tests/library/ZendAfi/View/Helper/Status/TestCase.php b/tests/library/ZendAfi/View/Helper/Status/TestCase.php
index 3905d8f7745d8011921ec81c09fe00a92467d50f..eb1f5ab1ce3289c10627afd7015c6ae01e6b6b5c 100644
--- a/tests/library/ZendAfi/View/Helper/Status/TestCase.php
+++ b/tests/library/ZendAfi/View/Helper/Status/TestCase.php
@@ -142,6 +142,12 @@ abstract class ZendAfi_View_Helper_Status_TestCase extends ViewHelperTestCase {
}
+ protected function _setupReportTags() {
+ defineConstant('STATUS_REPORT_TAGS', '@,TESTING IGNORE"');
+ Class_AdminVar::set('STATUS_REPORT_TAGS', 'IN_PROD; DEDICATED_SERVER,');
+ }
+
+
protected function _setupBokeh() {
Class_AdminVar::set('NOM_DOMAINE', 'library.annecy.fr');
$this
@@ -150,7 +156,8 @@ abstract class ZendAfi_View_Helper_Status_TestCase extends ViewHelperTestCase {
->_setupRecords()
->_setupUsers()
->_setupILS()
- ->_setupDigitalResources();
+ ->_setupDigitalResources()
+ ->_setupReportTags();
}
protected function _setupVars() {