Skip to content
Permalink
Browse files

API update and cleanup

* API new option to request multiple properties
* Simple Devices: dimmers linked action update
* Some files removed (themes)
  • Loading branch information...
sergejey committed Apr 19, 2019
1 parent 4f1fdb8 commit 508e5fee42119a0c5a971059a7e656425f050525
Showing with 30 additions and 4,151 deletions.
  1. +25 −0 api.php
  2. BIN img/modules/optimizer.png
  3. +0 −404 lib/mqtt/phpMQTT.php
  4. +5 −0 modules/devices/SDimmers_statusUpdated.php
  5. +0 −82 templates/design_sample.html
  6. +0 −3 templates/null.html
  7. +0 −119 themes/alert.css
  8. BIN themes/alert/bottom.gif
  9. BIN themes/alert/bottom_left.gif
  10. BIN themes/alert/bottom_right.gif
  11. BIN themes/alert/left.gif
  12. BIN themes/alert/overlay.png
  13. BIN themes/alert/progress.gif
  14. BIN themes/alert/right.gif
  15. BIN themes/alert/top.gif
  16. BIN themes/alert/top_left.gif
  17. BIN themes/alert/top_right.gif
  18. +0 −88 themes/alert_lite.css
  19. +0 −150 themes/alphacube.css
  20. BIN themes/alphacube/bottom-left-c.gif
  21. BIN themes/alphacube/bottom-middle.gif
  22. BIN themes/alphacube/bottom-right-c.gif
  23. BIN themes/alphacube/button-close-focus.gif
  24. BIN themes/alphacube/button-max-focus.gif
  25. BIN themes/alphacube/button-min-focus.gif
  26. BIN themes/alphacube/frame-left.gif
  27. BIN themes/alphacube/frame-right.gif
  28. BIN themes/alphacube/left-top.gif
  29. BIN themes/alphacube/right-top.gif
  30. BIN themes/alphacube/top-middle.gif
  31. +0 −51 themes/behavior.htc
  32. +0 −121 themes/darkX.css
  33. BIN themes/darkX/button-close-focused.png
  34. BIN themes/darkX/button-maximize-focused.png
  35. BIN themes/darkX/button-minimize-focused.png
  36. BIN themes/darkX/frame-bottom-left-focused.png
  37. BIN themes/darkX/frame-bottom-mid-focused.png
  38. BIN themes/darkX/frame-bottom-right-focused.png
  39. BIN themes/darkX/frame-left-focused.png
  40. BIN themes/darkX/frame-right-focused.png
  41. BIN themes/darkX/titlebar-left-focused.png
  42. BIN themes/darkX/titlebar-mid-focused.png
  43. BIN themes/darkX/titlebar-right-focused.png
  44. +0 −25 themes/debug.css
  45. +0 −155 themes/default.css
  46. BIN themes/default/bottom_left.gif
  47. BIN themes/default/bottom_mid.gif
  48. BIN themes/default/bottom_right.gif
  49. BIN themes/default/bottom_right_resize.gif
  50. BIN themes/default/center_left.gif
  51. BIN themes/default/center_right.gif
  52. BIN themes/default/clear.gif
  53. BIN themes/default/close.gif
  54. BIN themes/default/inspect.gif
  55. BIN themes/default/maximize.gif
  56. BIN themes/default/minimize.gif
  57. BIN themes/default/overlay.png
  58. BIN themes/default/resize.gif
  59. BIN themes/default/sizer.gif
  60. BIN themes/default/top_left.gif
  61. BIN themes/default/top_mid.gif
  62. BIN themes/default/top_right.gif
  63. BIN themes/iefix/blank.gif
  64. +0 −3 themes/iefix/iepngfix.css
  65. +0 −54 themes/iefix/iepngfix.htc
  66. BIN themes/jqt/img/back_button.png
  67. BIN themes/jqt/img/back_button_clicked.png
  68. BIN themes/jqt/img/button.png
  69. BIN themes/jqt/img/button_clicked.png
  70. BIN themes/jqt/img/chevron.png
  71. BIN themes/jqt/img/chevron_circle.png
  72. BIN themes/jqt/img/grayButton.png
  73. BIN themes/jqt/img/loading.gif
  74. BIN themes/jqt/img/on_off.png
  75. BIN themes/jqt/img/rowhead.png
  76. BIN themes/jqt/img/toggle.png
  77. BIN themes/jqt/img/toggleOn.png
  78. BIN themes/jqt/img/toolbar.png
  79. BIN themes/jqt/img/whiteButton.png
  80. +0 −559 themes/jqt/theme.css
  81. +0 −1 themes/jqt/theme.min.css
  82. +0 −544 themes/jqt/theme_one_item.css
  83. +0 −960 themes/lighting.css
  84. BIN themes/lighting/background_buttons.gif
  85. BIN themes/lighting/bottom-left-blue.png
  86. BIN themes/lighting/bottom-left-darkblue.png
  87. BIN themes/lighting/bottom-left-green.png
  88. BIN themes/lighting/bottom-left-grey.png
  89. BIN themes/lighting/bottom-middle-blue.png
  90. BIN themes/lighting/bottom-middle-darkblue.png
  91. BIN themes/lighting/bottom-middle-green.png
  92. BIN themes/lighting/bottom-middle-grey.png
  93. BIN themes/lighting/bottom-right-blue.png
  94. BIN themes/lighting/bottom-right-darkblue.png
  95. BIN themes/lighting/bottom-right-green.png
  96. BIN themes/lighting/bottom-right-grey.png
  97. BIN themes/lighting/button-close-blue.png
  98. BIN themes/lighting/button-close-darkblue.png
  99. BIN themes/lighting/button-close-green.png
  100. BIN themes/lighting/button-close-grey.png
  101. BIN themes/lighting/button-maximize-blue.png
  102. BIN themes/lighting/button-maximize-darkblue.png
  103. BIN themes/lighting/button-maximize-green.png
  104. BIN themes/lighting/button-maximize-grey.png
  105. BIN themes/lighting/button-minimize-blue.png
  106. BIN themes/lighting/button-minimize-darkblue.png
  107. BIN themes/lighting/button-minimize-green.png
  108. BIN themes/lighting/button-minimize-grey.png
  109. BIN themes/lighting/left-blue.png
  110. BIN themes/lighting/left-darkblue.png
  111. BIN themes/lighting/left-green.png
  112. BIN themes/lighting/left-grey.png
  113. +0 −67 themes/lighting/pngbehavior.htc
  114. BIN themes/lighting/right-blue.png
  115. BIN themes/lighting/right-darkblue.png
  116. BIN themes/lighting/right-green.png
  117. BIN themes/lighting/right-grey.png
  118. BIN themes/lighting/spinner.gif
  119. BIN themes/lighting/top-left-blue.png
  120. BIN themes/lighting/top-left-darkblue.png
  121. BIN themes/lighting/top-left-green.png
  122. BIN themes/lighting/top-left-grey.png
  123. BIN themes/lighting/top-middle-blue.png
  124. BIN themes/lighting/top-middle-darkblue.png
  125. BIN themes/lighting/top-middle-green.png
  126. BIN themes/lighting/top-middle-grey.png
  127. BIN themes/lighting/top-right-blue.png
  128. BIN themes/lighting/top-right-darkblue.png
  129. BIN themes/lighting/top-right-green.png
  130. BIN themes/lighting/top-right-grey.png
  131. +0 −333 themes/mac_os_x.css
  132. BIN themes/mac_os_x/B.png
  133. BIN themes/mac_os_x/BL.png
  134. BIN themes/mac_os_x/BL_Main.png
  135. BIN themes/mac_os_x/BR.png
  136. BIN themes/mac_os_x/BR_Main.png
  137. BIN themes/mac_os_x/B_Main.png
  138. BIN themes/mac_os_x/L.png
  139. BIN themes/mac_os_x/L_Main.png
  140. BIN themes/mac_os_x/R.png
  141. BIN themes/mac_os_x/R_Main.png
  142. BIN themes/mac_os_x/T.png
  143. BIN themes/mac_os_x/TL.png
  144. BIN themes/mac_os_x/TL_Main.png
  145. BIN themes/mac_os_x/TR.png
  146. BIN themes/mac_os_x/TR_Main.png
  147. BIN themes/mac_os_x/T_Main.png
  148. BIN themes/mac_os_x/close.gif
  149. BIN themes/mac_os_x/maximize.gif
  150. BIN themes/mac_os_x/minimize.gif
  151. +0 −160 themes/mac_os_x_dialog.css
  152. BIN themes/mac_os_x_dialog/B.png
  153. BIN themes/mac_os_x_dialog/BL.png
  154. BIN themes/mac_os_x_dialog/BR.png
  155. BIN themes/mac_os_x_dialog/L.png
  156. BIN themes/mac_os_x_dialog/R.png
  157. BIN themes/mac_os_x_dialog/T.png
  158. BIN themes/mac_os_x_dialog/TL.png
  159. BIN themes/mac_os_x_dialog/TR.png
  160. BIN themes/mac_os_x_dialog/bg.gif
  161. BIN themes/mac_os_x_dialog/close.gif
  162. BIN themes/mac_os_x_dialog/maximize.gif
  163. BIN themes/mac_os_x_dialog/minimize.gif
  164. +0 −164 themes/nuncio.css
  165. BIN themes/nuncio/bottom_left.png
  166. BIN themes/nuncio/bottom_mid.png
  167. BIN themes/nuncio/bottom_right.png
  168. BIN themes/nuncio/center_left.png
  169. BIN themes/nuncio/center_right.png
  170. BIN themes/nuncio/close.png
  171. BIN themes/nuncio/minimize.png
  172. BIN themes/nuncio/overlay.png
  173. BIN themes/nuncio/top_left.png
  174. BIN themes/nuncio/top_mid.png
  175. BIN themes/nuncio/top_right.png
  176. +0 −108 themes/spread.css
  177. BIN themes/spread/.gif
  178. BIN themes/spread/bottom-left-c.gif
  179. BIN themes/spread/bottom-middle.gif
  180. BIN themes/spread/bottom-right-c.gif
  181. BIN themes/spread/button-close-focus.gif
  182. BIN themes/spread/button-max-focus.gif
  183. BIN themes/spread/button-min-focus.gif
  184. BIN themes/spread/frame-left.gif
  185. BIN themes/spread/frame-right.gif
  186. BIN themes/spread/left-top.gif
  187. BIN themes/spread/right-top.gif
  188. BIN themes/spread/top-middle.gif
25 api.php
@@ -198,6 +198,31 @@
$objects=SQLSelect("SELECT ID, TITLE FROM objects ORDER BY TITLE");
}
$result['objects'] = $objects;
} elseif (strtolower($request[0]) == 'data' && !isset($request[1]) && is_array($input['properties']) && $method=='POST') {
$properties=$input['properties'];
foreach($properties as $property) {
$tmp = explode('.', $property);
if (isset($tmp[1])) {
$result['data'][$property]=getGlobal($property);
} else {
$object=getObject($property);
if (is_object($object)) {
include_once(DIR_MODULES . 'classes/classes.class.php');
$cl = new classes();
$props = $cl->getParentProperties($object->class_id, '', 1);
$my_props = SQLSelect("SELECT ID,TITLE FROM properties WHERE OBJECT_ID='" . $object->id . "'");
if (IsSet($my_props[0])) {
foreach ($my_props as $p) {
$props[] = $p;
}
}
foreach ($props as $k => $v) {
$result['data'][$property.'.'.$v['TITLE']] = $object->getProperty($v['TITLE']);
}
}
}
}
//dprint($input);
} elseif (strtolower($request[0]) == 'data' && isset($request[1])) {
$tmp = explode('.', $request[1]);
if ($method == 'GET') {
Binary file not shown.
Oops, something went wrong.

0 comments on commit 508e5fe

Please sign in to comment.
You can’t perform that action at this time.