Xibo

Merge lp:~dangarner/xibo/bug-392846 into lp:xibo/1.0

  1. bug-392846
  2. Merge into halley
Proposed by Dan Garner
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dangarner/xibo/bug-392846
Merge into: lp:xibo/1.0
Diff against target: 164 lines (+75/-77)
1 file modified
server/lib/pages/content.class.php (+75/-77)
To merge this branch: bzr merge lp:~dangarner/xibo/bug-392846
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+15089@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'server/lib/pages/content.class.php'
2--- server/lib/pages/content.class.php 2009-02-23 11:31:04 +0000
3+++ server/lib/pages/content.class.php 2009-11-20 13:00:35 +0000
4@@ -93,85 +93,83 @@
5 */
6 function LibraryFilter()
7 {
8- $db =& $this->db;
9-
10- $mediatype = ""; //1
11- $name = ""; //2
12- $usertype = 0; //3
13- $playlistid = ""; //4
14-
15- if (isset($_SESSION['content']['mediatype'])) $mediatype = $_SESSION['content']['mediatype'];
16- if (isset($_SESSION['content']['name'])) $name = $_SESSION['content']['name'];
17- if (isset($_SESSION['content']['usertype'])) $usertype = $_SESSION['content']['usertype'];
18- if (isset($_SESSION['content']['playlistid'])) $playlistid = $_SESSION['content']['playlistid'];
19-
20- //shared list
21- $shared = "All";
22- if (isset($_SESSION['content']['shared'])) $shared = $_SESSION['content']['shared'];
23- $shared_list = dropdownlist("SELECT 'all','All' UNION SELECT permissionID, permission FROM permission", "shared", $shared);
24-
25- $filter_userid = "";
26- if (isset($_SESSION['content']['filter_userid'])) $filter_userid = $_SESSION['content']['filter_userid'];
27-
28- $user_list = listcontent("all|All,".userlist("SELECT DISTINCT userid FROM layout"),"filter_userid", $filter_userid);
29-
30- //retired list
31- $retired = "0";
32- if(isset($_SESSION['playlist']['filter_retired'])) $retired = $_SESSION['playlist']['retired'];
33- $retired_list = listcontent("all|All,1|Yes,0|No","filter_retired",$retired);
34-
35- //type list query to get all playlists that are in the database which have NOT been assigned to the display
36- $sql = "SELECT 'all', 'all' ";
37- $sql .= "UNION ";
38- $sql .= "SELECT type, type ";
39- $sql .= "FROM media ";
40- $sql .= "GROUP BY type ";
41-
42- $type_list = dropdownlist($sql,"mediatype",$mediatype);
43-
44- $filterForm = <<<END
45- <div class="FilterDiv" id="LibraryFilter">
46- <form>
47- <input type="hidden" name="p" value="content">
48- <input type="hidden" name="q" value="LibraryGrid">
49- <input type="hidden" name="pages" id="pages">
50-
51- <table id="content_filterform" class="filterform">
52- <tr>
53- <td>Name</td>
54- <td><input type='text' name='2' id='2' value="$name" /></td>
55- <td>Type</td>
56- <td>$type_list</td>
57- <td>Retired</td>
58- <td>$retired_list</td>
59- </tr>
60- <tr>
61- <td>Owner</td>
62- <td>$user_list</td>
63- <td></td>
64- <td></td>
65- <td>Shared</td>
66- <td>$shared_list</td>
67-
68- </tr>
69- </table>
70- </form>
71- </div>
72+ $db =& $this->db;
73+
74+ $mediatype = ""; //1
75+ $usertype = 0; //3
76+ $playlistid = ""; //4
77+
78+ if (isset($_SESSION['content']['mediatype'])) $mediatype = $_SESSION['content']['mediatype'];
79+ if (isset($_SESSION['content']['usertype'])) $usertype = $_SESSION['content']['usertype'];
80+ if (isset($_SESSION['content']['playlistid'])) $playlistid = $_SESSION['content']['playlistid'];
81+
82+ //shared list
83+ $shared = "All";
84+ if (isset($_SESSION['content']['shared'])) $shared = $_SESSION['content']['shared'];
85+ $shared_list = dropdownlist("SELECT 'all','All' UNION SELECT permissionID, permission FROM permission", "shared", $shared);
86+
87+ $filter_userid = "";
88+ if (isset($_SESSION['content']['filter_userid'])) $filter_userid = $_SESSION['content']['filter_userid'];
89+
90+ $user_list = listcontent("all|All,".userlist("SELECT DISTINCT userid FROM layout"),"filter_userid", $filter_userid);
91+
92+ //retired list
93+ $retired = "0";
94+ if(isset($_SESSION['playlist']['filter_retired'])) $retired = $_SESSION['playlist']['retired'];
95+ $retired_list = listcontent("all|All,1|Yes,0|No","filter_retired",$retired);
96+
97+ //type list query to get all playlists that are in the database which have NOT been assigned to the display
98+ $sql = "SELECT 'all', 'all' ";
99+ $sql .= "UNION ";
100+ $sql .= "SELECT type, type ";
101+ $sql .= "FROM media ";
102+ $sql .= "GROUP BY type ";
103+
104+ $type_list = dropdownlist($sql,"mediatype",$mediatype);
105+
106+ $filterForm = <<<END
107+ <div class="FilterDiv" id="LibraryFilter">
108+ <form>
109+ <input type="hidden" name="p" value="content">
110+ <input type="hidden" name="q" value="LibraryGrid">
111+ <input type="hidden" name="pages" id="pages">
112+
113+ <table id="content_filterform" class="filterform">
114+ <tr>
115+ <td>Name</td>
116+ <td><input type='text' name='2' id='2' /></td>
117+ <td>Type</td>
118+ <td>$type_list</td>
119+ <td>Retired</td>
120+ <td>$retired_list</td>
121+ </tr>
122+ <tr>
123+ <td>Owner</td>
124+ <td>$user_list</td>
125+ <td></td>
126+ <td></td>
127+ <td>Shared</td>
128+ <td>$shared_list</td>
129+
130+ </tr>
131+ </table>
132+ </form>
133+ </div>
134 END;
135-
136- $id = uniqid();
137-
138- $xiboGrid = <<<HTML
139- <div class="XiboGrid" id="$id">
140- <div class="XiboFilter">
141- $filterForm
142- </div>
143- <div class="XiboData">
144-
145- </div>
146- </div>
147+
148+ $id = uniqid();
149+
150+ $xiboGrid = <<<HTML
151+ <div class="XiboGrid" id="$id">
152+ <div class="XiboFilter">
153+ $filterForm
154+ </div>
155+ <div class="XiboData">
156+
157+ </div>
158+ </div>
159 HTML;
160- echo $xiboGrid;
161+ echo $xiboGrid;
162 }
163
164 /**

Subscribers

People subscribed via source and target branches