Enano CMS (1.1.x): comparison plugins/admin/PageGroups.php

equal deleted inserted replaced

-:d8156d18ac58
+:97ae8e9d5e29
 if ( $_POST['group_type'] == PAGE_GRP_NORMAL && empty($_POST['member_page_0']) )
 {
 echo '<div class="error-box">Please specify at least one page to place in this group.</div>';
 return;
 }
-if ( $_POST['group_type'] != PAGE_GRP_TAGGED && $_POST['group_type'] != PAGE_GRP_CATLINK && $_POST['group_type'] != PAGE_GRP_NORMAL )
+if ( $_POST['group_type'] == PAGE_GRP_REGEX && empty($_POST['regex']) )
+{
+echo '<div class="error-box">Please specify a regular expression to match page IDs against.</div>';
+return;
+}
+if ( $_POST['group_type'] != PAGE_GRP_TAGGED && $_POST['group_type'] != PAGE_GRP_CATLINK && $_POST['group_type'] != PAGE_GRP_NORMAL && $_POST['group_type'] != PAGE_GRP_REGEX )
 {
 echo '<div class="error-box">Umm, you sent an invalid group type. I\'d put a real error message here but this will only be shown if you try to hack the system.</div>';
 return;
 }
 // All checks passed, create the group
 $sql = 'INSERT INTO '.table_prefix.'page_group_members(pg_id,page_id,namespace) VALUES' . implode(',', $arr_sql) . ';';
 $q = $db->sql_query($sql);
 if ( !$q )
 $db->_die();
 break;
+case PAGE_GRP_REGEX:
+$name  = $db->escape($_POST['pg_name']);
+$regex = $db->escape($_POST['regex']);
+$sql = 'INSERT INTO '.table_prefix.'page_groups(pg_type,pg_name,pg_target) VALUES(' . PAGE_GRP_REGEX . ', \'' . $name . '\', \'' . $regex . '\');';
+$q = $db->sql_query($sql);
+if ( !$q )
+$db->_die();
+break;
 }
 echo '<div class="info-box">The page group "' . htmlspecialchars($_POST['pg_name']) . '" has been created.</div>';
 break;
 }
 // A little Javascript magic
 function pg_create_typeset(selector)
 {
 var pg_normal  = <?php echo PAGE_GRP_NORMAL; ?>;
 var pg_tagged  = <?php echo PAGE_GRP_TAGGED; ?>;
 var pg_catlink = <?php echo PAGE_GRP_CATLINK; ?>;
+var pg_regex   = <?php echo PAGE_GRP_REGEX; ?>;
 var selection = false;
 // Get selection
 for ( var i = 0; i < selector.childNodes.length; i++ )
 {
 var child = selector.childNodes[i];
 {
 alert('Cannot get field value');
 return true;
 }
 selection = parseInt(selection);
-if ( selection != pg_normal && selection != pg_tagged && selection != pg_catlink )
+if ( selection != pg_normal && selection != pg_tagged && selection != pg_catlink && selection != pg_regex )
 {
 alert('Invalid field value');
 return true;
 }
 document.getElementById('pg_create_tagged_2').style.display = 'none';
 document.getElementById('pg_create_title_normal').style.display = 'inline';
 document.getElementById('pg_create_normal_1').style.display = 'block';
 document.getElementById('pg_create_normal_2').style.display = 'block';
+document.getElementById('pg_create_title_regex').style.display = 'none';
+document.getElementById('pg_create_regex_1').style.display = 'none';
+document.getElementById('pg_create_regex_2').style.display = 'none';
 }
 else if ( selection == pg_catlink )
 {
 document.getElementById('pg_create_title_catlink').style.display = 'inline';
 document.getElementById('pg_create_catlink_1').style.display = 'block';
 document.getElementById('pg_create_tagged_2').style.display = 'none';
 document.getElementById('pg_create_title_normal').style.display = 'none';
 document.getElementById('pg_create_normal_1').style.display = 'none';
 document.getElementById('pg_create_normal_2').style.display = 'none';
+document.getElementById('pg_create_title_regex').style.display = 'none';
+document.getElementById('pg_create_regex_1').style.display = 'none';
+document.getElementById('pg_create_regex_2').style.display = 'none';
 }
 else if ( selection == pg_tagged )
 {
 document.getElementById('pg_create_title_catlink').style.display = 'none';
 document.getElementById('pg_create_catlink_1').style.display = 'none';
 document.getElementById('pg_create_tagged_2').style.display = 'block';
 document.getElementById('pg_create_title_normal').style.display = 'none';
 document.getElementById('pg_create_normal_1').style.display = 'none';
 document.getElementById('pg_create_normal_2').style.display = 'none';
+document.getElementById('pg_create_title_regex').style.display = 'none';
+document.getElementById('pg_create_regex_1').style.display = 'none';
+document.getElementById('pg_create_regex_2').style.display = 'none';
+}
+else if ( selection == pg_regex )
+{
+document.getElementById('pg_create_title_catlink').style.display = 'none';
+document.getElementById('pg_create_catlink_1').style.display = 'none';
+document.getElementById('pg_create_catlink_2').style.display = 'none';
+document.getElementById('pg_create_title_tagged').style.display = 'none';
+document.getElementById('pg_create_tagged_1').style.display = 'none';
+document.getElementById('pg_create_tagged_2').style.display = 'none';
+document.getElementById('pg_create_title_normal').style.display = 'none';
+document.getElementById('pg_create_normal_1').style.display = 'none';
+document.getElementById('pg_create_normal_2').style.display = 'none';
+document.getElementById('pg_create_title_regex').style.display = 'inline';
+document.getElementById('pg_create_regex_1').style.display = 'block';
+document.getElementById('pg_create_regex_2').style.display = 'block';
 }
 }
 // Set to pg_normal on page load
 document.getElementById('pg_create_catlink_2').style.display = 'none';
 document.getElementById('pg_create_title_tagged').style.display = 'none';
 document.getElementById('pg_create_tagged_1').style.display = 'none';
 document.getElementById('pg_create_tagged_2').style.display = 'none';
+document.getElementById('pg_create_title_regex').style.display = 'none';
+document.getElementById('pg_create_regex_1').style.display = 'none';
+document.getElementById('pg_create_regex_2').style.display = 'none';
 document.getElementById('pg_create_title_normal').style.display = 'inline';
 document.getElementById('pg_create_normal_1').style.display = 'block';
 document.getElementById('pg_create_normal_2').style.display = 'block';
 }
 <td class="row1">
 <select name="group_type" onchange="pg_create_typeset(this);">
 <option value="' . PAGE_GRP_NORMAL  . '" selected="selected">Static group of pages</option>
 <option value="' . PAGE_GRP_TAGGED  . '">Group of pages with one tag</option>
 <option value="' . PAGE_GRP_CATLINK . '">Link to category</option>
+<option value="' . PAGE_GRP_REGEX   . '">Perl-compatible regular expression (advanced)</option>
 </select>
 </td>
 </tr>';
 // Titles
 <span id="pg_create_title_tagged">
 Group of commonly tagged pages
 </span>
 <span id="pg_create_title_catlink">
 Mirror a category
+</span>
+<span id="pg_create_title_regex">
+Filter through a regular expression
 </span>
 </th>
 </tr>';
 echo '<tr>
 <small>Pages in subcategories are <u>not</u> included, however subcategory pages themselves are.</small>
 </div>
 <div id="pg_create_tagged_1">
 Include pages with this tag:
 </div>
+<div id="pg_create_regex_1">
+Regular expression:<br />
+<small>Be sure to include the starting and ending delimiters and any flags you might need.<br />
+These pages might help: <a href="http://us.php.net/manual/en/reference.pcre.pattern.modifiers.php">Pattern modifiers</a> &bull;
+<a href="http://us.php.net/manual/en/reference.pcre.pattern.syntax.php">Pattern syntax</a><br />
+Examples: <tt>/^(Special|Admin):/i</tt> &bull; <tt>/^Image:([0-9]+)$/</tt><br />
+Developers, remember that this will be matched against the full page identifier string. This means that <tt>/^About_Enano$/</tt>
+will NOT match the page Special:About_Enano.</small>
 </td>';
 echo '  <td class="row1">
 <div id="pg_create_normal_2" />
 <input type="text" style="margin-top: 3px;" name="member_page_0" id="pg_create_member_0" onkeyup="return ajaxPageNameComplete(this);" size="30" /><br />
 <div id="pg_create_tagged_2">
 <input type="text" name="member_tag" size="30" />
 </div>
 <div id="pg_create_catlink_2">
 ' . $catlist . '
+</div>
+<div id="pg_create_regex_2">
+<input type="text" name="regex" size="60" />
 </div>
 </td>
 </tr>';
 // Submit button
 $q = $db->sql_query('UPDATE '.table_prefix.'page_groups SET pg_target=\'' . $target . '\' WHERE pg_id=' . $edit_id . ';');
 if ( !$q )
 $db->_die();
 else
 echo '<div class="info-box">The affecting tag was updated.</div>';
+}
+}
+else if ( $_POST['pg_type'] == PAGE_GRP_REGEX )
+{
+$target = $_POST['pg_target'];
+if ( empty($target) )
+{
+echo '<div class="error-box">Please enter an expression to match against..</div>';
+}
+else
+{
+$target = $db->escape($target);
+$q = $db->sql_query('UPDATE '.table_prefix.'page_groups SET pg_target=\'' . $target . '\' WHERE pg_id=' . $edit_id . ';');
+if ( !$q )
+$db->_die();
+else
+echo '<div class="info-box">The expression to match against was updated.</div>';
 }
 }
 else if ( $_POST['pg_type'] == PAGE_GRP_CATLINK )
 {
 $target = $_POST['pg_target'];
 <td class="row1">
 <input type="text" name="pg_target" value="' . htmlspecialchars($row['pg_target']) . '" size="30" />
 </td>
 </tr>';
 break;
+case PAGE_GRP_REGEX:
+echo '<tr>
+<td class="row2">
+Regular expression to use:<br />
+<small>Be sure to include the starting and ending delimiters and any flags you might need.<br />
+These pages might help: <a href="http://us.php.net/manual/en/reference.pcre.pattern.modifiers.php">Pattern modifiers</a> &bull;
+<a href="http://us.php.net/manual/en/reference.pcre.pattern.syntax.php">Pattern syntax</a><br />
+Examples: <tt>/^(Special|Admin):/i</tt> &bull; <tt>/^Image:([0-9]+)$/</tt><br />
+Developers, remember that this will be matched against the full page identifier string. This means that <tt>/^About_Enano$/</tt>
+will NOT match the page Special:About_Enano.</small>
+</td>
+<td class="row1">
+<input type="text" name="pg_target" value="' . htmlspecialchars($row['pg_target']) . '" size="30" />
+</td>
+</tr>';
+break;
 case PAGE_GRP_CATLINK:
 // Build category list
 $q = $db->sql_query('SELECT name,urlname FROM '.table_prefix.'pages WHERE namespace=\'Category\';');
 if ( !$q )
 $type = 'Set of tagged pages';
 break;
 case PAGE_GRP_NORMAL:
 $type = 'Static set of pages';
 break;
+case PAGE_GRP_REGEX:
+$type = 'Regular expression match';
+break;
 }
 $target = '';
 if ( $row['pg_type'] == PAGE_GRP_TAGGED )
 {
 $target = 'Tag: ' . htmlspecialchars($row['pg_target']);
 }
 else if ( $row['pg_type'] == PAGE_GRP_CATLINK )
 {
 $target = 'Category: ' . htmlspecialchars(get_page_title($paths->nslist['Category'] . sanitize_page_id($row['pg_target'])));
+}
+else if ( $row['pg_type'] == PAGE_GRP_REGEX )
+{
+$target = 'Expression: <tt>' . htmlspecialchars($row['pg_target']) . '</tt>';
 }
 $btn_edit = '<input type="submit" name="action[edit][' . $row['pg_id'] . ']" value="Edit" />';
 $btn_del = '<input type="submit" name="action[del][' . $row['pg_id'] . ']" value="Delete" />';
 // stupid jEdit bug/hack
 $quot = '"';

changeset 229	97ae8e9d5e29
parent 228	b0a4d179be85
child 326	ab66d6d1f1f4