Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
loic committed Jan 5, 2015
1 parent f4f8c3a commit 8e1b3e9
Show file tree
Hide file tree
Showing 9 changed files with 387 additions and 387 deletions.
2 changes: 1 addition & 1 deletion 3rparty/readme
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Ce dossier doit contenir toutes les librairies externes utilisées par votre plugin.
Ce dossier doit contenir toutes les librairies externes utilisées par votre plugin.
68 changes: 34 additions & 34 deletions core/ajax/template.ajax.php
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<?php

/* This file is part of Jeedom.
*
* Jeedom 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.
*
* Jeedom 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 Jeedom. If not, see <http://www.gnu.org/licenses/>.
*/

try {
require_once dirname(__FILE__) . '/../../../../core/php/core.inc.php';
include_file('core', 'authentification', 'php');

if (!isConnect('admin')) {
throw new Exception(__('401 - Accès non autorisé', __FILE__));
}



throw new Exception(__('Aucune méthode correspondante à : ', __FILE__) . init('action'));
/* * *********Catch exeption*************** */
} catch (Exception $e) {
ajax::error(displayExeption($e), $e->getCode());
}
?>
<?php

/* This file is part of Jeedom.
*
* Jeedom 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.
*
* Jeedom 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 Jeedom. If not, see <http://www.gnu.org/licenses/>.
*/

try {
require_once dirname(__FILE__) . '/../../../../core/php/core.inc.php';
include_file('core', 'authentification', 'php');

if (!isConnect('admin')) {
throw new Exception(__('401 - Accès non autorisé', __FILE__));
}



throw new Exception(__('Aucune méthode correspondante à : ', __FILE__) . init('action'));
/* * *********Catch exeption*************** */
} catch (Exception $e) {
ajax::error(displayExeption($e), $e->getCode());
}
?>
240 changes: 120 additions & 120 deletions core/class/template.class.php
Original file line number Diff line number Diff line change
@@ -1,120 +1,120 @@
<?php

/* This file is part of Jeedom.
*
* Jeedom 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.
*
* Jeedom 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 Jeedom. If not, see <http://www.gnu.org/licenses/>.
*/

/* * ***************************Includes********************************* */
require_once dirname(__FILE__) . '/../../../../core/php/core.inc.php';

class template extends eqLogic {
/* * *************************Attributs****************************** */



/* * ***********************Methode static*************************** */

/*
* Fonction exécutée automatiquement toutes les minutes par Jeedom
public static function cron() {
}
*/


/*
* Fonction exécutée automatiquement toutes les heures par Jeedom
public static function cronHourly() {
}
*/

/*
* Fonction exécutée automatiquement tous les jours par Jeedom
public static function cronDayly() {
}
*/



/* * *********************Méthodes d'instance************************* */

public function preInsert() {

}

public function postInsert() {

}

public function preSave() {

}

public function postSave() {

}

public function preUpdate() {

}

public function postUpdate() {

}

public function preRemove() {

}

public function postRemove() {

}

/*
* Non obligatoire mais permet de modifier l'affichage du widget si vous en avez besoin
public function toHtml($_version = 'dashboard') {
}
*/

/* * **********************Getteur Setteur*************************** */
}

class weatherCmd extends cmd {
/* * *************************Attributs****************************** */


/* * ***********************Methode static*************************** */


/* * *********************Methode d'instance************************* */

/*
* Non obligatoire permet de demander de ne pas supprimer les commandes même si elles ne sont pas dans la nouvelle configuration de l'équipement envoyé en JS
public function dontRemoveCmd() {
return true;
}
*/

public function execute($_options = array()) {

}

/* * **********************Getteur Setteur*************************** */
}

?>
<?php

/* This file is part of Jeedom.
*
* Jeedom 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.
*
* Jeedom 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 Jeedom. If not, see <http://www.gnu.org/licenses/>.
*/

/* * ***************************Includes********************************* */
require_once dirname(__FILE__) . '/../../../../core/php/core.inc.php';

class template extends eqLogic {
/* * *************************Attributs****************************** */



/* * ***********************Methode static*************************** */

/*
* Fonction exécutée automatiquement toutes les minutes par Jeedom
public static function cron() {
}
*/


/*
* Fonction exécutée automatiquement toutes les heures par Jeedom
public static function cronHourly() {
}
*/

/*
* Fonction exécutée automatiquement tous les jours par Jeedom
public static function cronDayly() {
}
*/



/* * *********************Méthodes d'instance************************* */

public function preInsert() {

}

public function postInsert() {

}

public function preSave() {

}

public function postSave() {

}

public function preUpdate() {

}

public function postUpdate() {

}

public function preRemove() {

}

public function postRemove() {

}

/*
* Non obligatoire mais permet de modifier l'affichage du widget si vous en avez besoin
public function toHtml($_version = 'dashboard') {
}
*/

/* * **********************Getteur Setteur*************************** */
}

class weatherCmd extends cmd {
/* * *************************Attributs****************************** */


/* * ***********************Methode static*************************** */


/* * *********************Methode d'instance************************* */

/*
* Non obligatoire permet de demander de ne pas supprimer les commandes même si elles ne sont pas dans la nouvelle configuration de l'équipement envoyé en JS
public function dontRemoveCmd() {
return true;
}
*/

public function execute($_options = array()) {

}

/* * **********************Getteur Setteur*************************** */
}

?>
52 changes: 26 additions & 26 deletions core/php/template.inc.php
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<?php

/* This file is part of Jeedom.
*
* Jeedom 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.
*
* Jeedom 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 Jeedom. If not, see <http://www.gnu.org/licenses/>.
*/

require_once dirname(__FILE__) . '/../../../../core/php/core.inc.php';
/*
* Non obligatoire mais peut être utilisé si vous voulez charger en même temps que votre
* plugin des librairies externes (ne pas oublier d'adapter plugin_info/info.xml).
*
*
*/
?>
<?php

/* This file is part of Jeedom.
*
* Jeedom 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.
*
* Jeedom 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 Jeedom. If not, see <http://www.gnu.org/licenses/>.
*/

require_once dirname(__FILE__) . '/../../../../core/php/core.inc.php';
/*
* Non obligatoire mais peut être utilisé si vous voulez charger en même temps que votre
* plugin des librairies externes (ne pas oublier d'adapter plugin_info/info.xml).
*
*
*/
?>
Loading

0 comments on commit 8e1b3e9

Please sign in to comment.